[PATCH] Merge debian perlbal-doc package into perlbal
Nick Andrew
Merge debian perlbal-doc package into perlbal
- Update the debian package version number to 1.70-1
- Incorporate all doc files into 'perlbal'
Signed-off-by: Nick Andrew <ni...@nick-andrew.net>
---
debian/changelog | 7 +++++++
debian/control | 15 ++-------------
debian/perlbal.docs | 1 +
3 files changed, 10 insertions(+), 13 deletions(-)
create mode 100644 debian/perlbal.docs
diff --git a/debian/changelog b/debian/changelog
index cada09d..d57340e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+perlbal (1.70-1) unstable; urgency=low
+
+ * New upstream release.
+ * Moved docs into perlbal package and removed perlbal-doc package
+
+ -- Andrew McClain <and...@fluther.com> Sat, 26 Jul 2008 17:46:23 -0700
+
perlbal (1.57-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 714711f..63070cd 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Section: web
Priority: extra
Architecture: all
Depends: ${perl:Depends}, libperlbal-perl
-Suggests: perlbal-doc
+Conflicts: perlbal-doc
+Replaces: perlbal-doc
Description: Perl-based reverse proxy load balancer and web server
Perlbal is a single-threaded event-based server supporting HTTP load
balancing, web serving, and a mix of the two. Perlbal can act as either a web
@@ -39,15 +40,3 @@ Description: Supporting perl libraries for perlbal
.
This package contains the module files (but not the daemon) for use with
perlbal, the reverse-proxy load balancer and webserver.
-
-Package: perlbal-doc
-Section: doc
-Priority: optional
-Architecture: all
-Description: Documentation for Perlbal
- Perlbal is a single-threaded event-based server supporting HTTP load
- balancing, web serving, and a mix of the two. Perlbal can act as either a web
- server or a reverse proxy.
- .
- This package contains documentation and implementation notes for use with
- perlbal, the reverse-proxy load balancer and webserver.
diff --git a/debian/perlbal.docs b/debian/perlbal.docs
new file mode 100644
index 0000000..30d29de
--- /dev/null
+++ b/debian/perlbal.docs
@@ -0,0 +1 @@
+doc/*
Nick Andrew
repo. I added Conflicts and Replaces lines into the perlbal package
so it will install correctly by removing any perlbal-doc package
which is installed. Version number in the changelog is "1.70-1"
for the time being.
When I commit in a day or two assuming nobody has any objections,
I'll also add Andrew's name into the commit log message - git separates
the concept of change author and change committer and SVN does not
(so I'll add his name into the comment part just in case).
Nick.
Andrew McClain
thread (http://groups.google.com/group/perlbal/browse_thread/thread/
379f468a73dbafe).
On Aug 3, 11:02 pm, Nick Andrew <n...@nick-andrew.net> wrote:
> Right, so here are Andrew's changes tested and ready to go into the
> repo. I added Conflicts and Replaces lines into the perlbal package
> so it will install correctly by removing any perlbal-doc package
> which is installed. Version number in the changelog is "1.70-1"
> for the time being.
>
> When I commit in a day or two assuming nobody has any objections,
> I'll also add Andrew's name into the commit log message - git separates
> the concept of change author and change committer and SVN does not
> (so I'll add his name into the comment part just in case).
>
> Nick.
>
> > From: Andrew McClain <and...@fluther.com>
>
> > Merge debian perlbal-doc package into perlbal
>
> > - Update the debian package version number to 1.70-1
> > - Incorporate all doc files into 'perlbal'
>