On Sat, Jul 16, 2005 at 01:27:09PM +0100, Roger Leigh wrote: > I have uploaded an NMU to DELAYED/2-day to fix this RC bug. The diff > for this upload follows. Please apply the diff and acknowledge it in > your next maintainer upload. > > The upload also fixes some other build failures with text2html, and > updates the Standards-Version to 3.6.2.
I have attached an updated copy of the diff. This changes the texi2html
line in debian/rules slightly (to use the -split option correctly).
Regards,
Roger
--
Roger Leigh
Printing on GNU/Linux? http://gimp-print.sourceforge.net/
Debian GNU/Linux http://www.debian.org/
GPG Public Key: 0x25BFB848. Please sign and encrypt your mail.
diff -urN am-utils-6.0.9.original/debian/changelog
am-utils-6.0.9/debian/changelog
--- am-utils-6.0.9.original/debian/changelog 2005-07-16 00:08:12.000000000
+0100
+++ am-utils-6.0.9/debian/changelog 2005-07-16 12:56:13.000000000 +0100
@@ -1,3 +1,15 @@
+am-utils (6.0.9-3.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix build failure with GCC 4.0, based on a patch by Andreas Jochens.
+ hlfsd/homedir.c: don't declare mboxfile[] as static, because it
+ was already declared extern in hlfsd/hlfsd.h. (closes: #285095)
+ * Updated to policy 3.6.2.
+ * debian/rules: Use the texi2html -output option to work with current
+ texi2html versions.
+
+ -- Roger Leigh <[EMAIL PROTECTED]> Sat, 16 Jul 2005 12:54:47 +0100
+
am-utils (6.0.9-3.2) unstable; urgency=low
* Non-maintainer upload
diff -urN am-utils-6.0.9.original/debian/control am-utils-6.0.9/debian/control
--- am-utils-6.0.9.original/debian/control 2005-07-16 00:08:12.000000000
+0100
+++ am-utils-6.0.9/debian/control 2005-07-16 12:54:45.000000000 +0100
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Philippe Troin <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 4.1.51), bison, flex, tetex-bin, texi2html,
texinfo, libgdbm-dev, libwrap-dev, libhesiod-dev
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2
Package: am-utils
Section: net
diff -urN am-utils-6.0.9.original/debian/rules am-utils-6.0.9/debian/rules
--- am-utils-6.0.9.original/debian/rules 2005-07-16 00:08:12.000000000
+0100
+++ am-utils-6.0.9/debian/rules 2005-07-17 11:38:01.000000000 +0100
@@ -50,8 +50,8 @@
--without-ldap
$(MAKE)
$(MAKE) -C doc ps
- mkdir debian/html
- cd debian/html && texi2html -split_chapter ../../doc/am-utils.texi
+ mkdir -p debian/html
+ texi2html -split=chapter -o debian/html doc/am-utils.texi
touch build-stamp
Binary files am-utils-6.0.9.original/doc/am-utils.dvi and
am-utils-6.0.9/doc/am-utils.dvi differ
diff -urN am-utils-6.0.9.original/hlfsd/homedir.c am-utils-6.0.9/hlfsd/homedir.c
--- am-utils-6.0.9.original/hlfsd/homedir.c 2002-12-28 14:49:22.000000000
+0000
+++ am-utils-6.0.9/hlfsd/homedir.c 2005-07-16 12:54:45.000000000 +0100
@@ -67,7 +67,6 @@
static uid2home_t *pwtab;
static void delay(uid2home_t *, int);
static void table_add(int, const char *, const char *);
-static char mboxfile[MAXPATHLEN];
static char *root_home; /* root's home directory */
/* GLOBAL FUNCTIONS */
@@ -76,6 +75,7 @@
/* GLOBALS VARIABLES */
username2uid_t *untab; /* user name table */
+char mboxfile[MAXPATHLEN];
/*
* Return the home directory pathname for the user with uid "userid".
signature.asc
Description: Digital signature
