tags 566765 + patch
thanks
Hoi p2,
I have prepared an NMU for hercules (version 3.06-1.3) which
fixes the FTBFS I seem to have accidentally introduced with
the 3.06-1.2 NMU (GNU autohell, you see).
As discussed at the BSP, this will be uploaded with urgency=high
and not to DELAYED/* since it fixes a security issue.
Groeten,
//mirabilos
--
Sometimes they [people] care too much: pretty printers [and syntax highligh-
ting, d.A.] mechanically produce pretty output that accentuates irrelevant
detail in the program, which is as sensible as putting all the prepositions
in English text in bold font. -- Rob Pike in "Notes on Programming in C"
diff -u hercules-3.06/configure.ac hercules-3.06/configure.ac
--- hercules-3.06/configure.ac
+++ hercules-3.06/configure.ac
@@ -81,7 +81,7 @@
AC_INIT(hercules.h) # (package, version, bugreport email,
etc)
AC_REVISION($Revision: 1.202 $) # (the version of this configure.ac)
-AC_CONFIG_AUX_DIR(autoconf) # (directory containing auxillary
build tools)
+AC_CONFIG_AUX_DIR(autoconf)
AM_INIT_AUTOMAKE(hercules,3.06) # (the version of our software package)
# Don't forget to change it in msvc.makefile.includes/VERSION.msvc, too!
AM_CONFIG_HEADER(config.h) # (the file the resulting configure
script will produce)
diff -u hercules-3.06/debian/changelog hercules-3.06/debian/changelog
--- hercules-3.06/debian/changelog
+++ hercules-3.06/debian/changelog
@@ -1,3 +1,20 @@
+hercules (3.06-1.3) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * debian/rules (clean): Remove autoconf/{libtool,ltdl}.m4 because
+ libtoolize installs them into m4/ instead, and this causes some
+ confusion to autoreconf that led to autoconf/mkinstalldirs being
+ missing sometimes.
+ debian/control: Depend on gettext.
+ debian/rules (configure-stamp): Do the same things manually that
+ invoking "gettextize -f" would, which we cannot call since it is
+ interactive, to upgrade {m4,po}/* to compatible versions.
+ (Closes: #566765)
+ * As discussed at the BSP, use urgency=high and non-DELAYED upload
+ because this fixes a security issue.
+
+ -- Thorsten Glaser <t...@mirbsd.de> Mon, 25 Jan 2010 14:03:29 +0000
+
hercules (3.06-1.2) unstable; urgency=low
* Non-maintainer upload.
diff -u hercules-3.06/debian/control hercules-3.06/debian/control
--- hercules-3.06/debian/control
+++ hercules-3.06/debian/control
@@ -9,6 +9,7 @@
libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libltdl-dev,
libtool,
+ gettext,
autoconf (>= 2.61~),
automake1.9,
autotools-dev
diff -u hercules-3.06/debian/rules hercules-3.06/debian/rules
--- hercules-3.06/debian/rules
+++ hercules-3.06/debian/rules
@@ -48,6 +48,14 @@
configure-stamp:
dh_testdir
+ # do the equivalent of the interactive "gettextize -f"
+ ln -sf /usr/share/gettext/config.rpath autoconf/config.rpath
+ for f in gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+ nls.m4 po.m4; do \
+ ln -sf /usr/share/aclocal/$$f m4/$$f; \
+ done
+ ln -sf /usr/share/gettext/po/Makefile.in.in po/Makefile.in.in
+
autoreconf -fvi -Im4 -Iautoconf
./configure $(CONFIGURE_ARGS)
@@ -79,7 +87,10 @@
autoconf/ltmain.sh autoconf/missing autoconf/mkinstalldirs \
m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 \
m4/'lt~obsolete.m4' aclocal.m4 config.h.in config.log \
- configure
+ configure autoconf/libtool.m4 autoconf/ltdl.m4 ABOUT-NLS \
+ autoconf/config.rpath m4/ChangeLog m4/gettext.m4 \
+ m4/iconv.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/nls.m4 \
+ m4/po.m4 po/ChangeLog po/Makefile.in.in po/Makevars.template
dh_clean
