[Erc-commit] [commit][emacs22] Merge for Romain's Debian package upload.

[mwolson]

commit 96cb94d38e952b21ff884acfca6d82e78ba864a5
Author: Michael Olson <address@hidden>
Date:   Tue Feb 14 05:07:26 2006 +0000

    Merge for Romain's Debian package upload.
    
    
    git-archimport-id: address@hidden/erc--cvs--0--patch-117

diff --git a/debian/changelog b/debian/changelog
index 96a4dd5..f0454f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+erc (5.1.1-3) unstable; urgency=low
+
+  * debian/rules (configure, configure-stamp, build, build-stamp):
+    Generate HTML and Info documentation.
+    (binary-erc): Install HTML and Info documentation.
+  * debian/maint/postinst: Install the Info documentation.
+  * debian/maint/prerm: Handle removing of Info documentation.
+
+ --
+
+erc (5.1.1-2) unstable; urgency=low
+
+  * debian/control: Add Build-Depends-Indep on texinfo and texi2html,
+    thanks to Andreas Jochens (closes: #351772).
+
+ -- Romain Francoise <address@hidden>  Wed,  8 Feb 2006 08:31:46 +0100
+
 erc (5.1.1-1) unstable; urgency=low
 
   * New upstream release.
@@ -12,11 +29,8 @@ erc (5.1.1-1) unstable; urgency=low
     width", thanks to Cyril Bouthors (Closes: #221223).  The desired
     behavior can be obtained by setting both `erc-fill-column' and
     `fill-column' to nil.
-  * debian/rules (configure, configure-stamp, build, build-stamp):
-    Generate HTML and Info documentation.
-    (binary-erc): Install HTML and Info documentation.
-  * debian/maint/postinst: Install the Info documentation.
-  * debian/maint/prerm: Handle removing of Info documentation.
+  * debian/rules (build, binary-erc): Build and install HTML
+    documentation.
 
  -- Michael W. Olson (GNU address) <address@hidden>  Sun,  5 Feb 2006 01:26:56 
-0500
 
diff --git a/debian/control b/debian/control
index 3b54a98..426291b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Michael W. Olson (GNU address) <address@hidden>
 Uploaders: Mario Lang <address@hidden>, Romain Francoise <address@hidden>
+Build-Depends-Indep: texinfo, texi2html
 Standards-Version: 3.6.2
 
 Package: erc