Permalink
Browse files

Merge debian perlbal-doc package into perlbal

-  Update the debian package version number to 1.70-1
-  Incorporate all doc files into 'perlbal'

Patch by Andrew McClain <andrew@fluther.com>

Signed-off-by: Nick Andrew <nick@nick-andrew.net>

git-svn-id: http://code.sixapart.com/svn/perlbal/trunk@786 6caf28e9-730f-0410-b62b-a31386fe13fb
  • Loading branch information...
1 parent 938465a commit 3c56dc3916268192a0b52bfcf12a9d1b7d63eed9 nickandrew committed Aug 6, 2008
Showing with 10 additions and 13 deletions.
  1. +7 −0 debian/changelog
  2. +2 −13 debian/control
  3. +1 −0 debian/perlbal.docs
View
@@ -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 <andrew@fluther.com> Sat, 26 Jul 2008 17:46:23 -0700
+
perlbal (1.57-1) unstable; urgency=low
* New upstream release.
View
@@ -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.
View
@@ -0,0 +1 @@
+doc/*

0 comments on commit 3c56dc3

Please sign in to comment.