Tags: patch User: [email protected] Usertags: natty ubuntu-patch
Hello, This is the patch I'm intending to get sponsored in Ubuntu. It fixes the FTBFS with binutils-gold in Debian. It is not a complete debdiff. Please consider using this patch in future uploads. With best regards, Dmitrijs.
pgpzffIbKBTvA.pgp
Description: PGP signature
=== modified file 'configure.in'
--- a/configure.in 2006-09-25 08:07:07 +0000
+++ b/configure.in 2010-12-13 16:46:37 +0000
@@ -294,6 +294,7 @@
POST="$FLTKCONFIG --post"
AC_CHECK_LIB(Xpm,XpmCreatePixmapFromData)
+ AC_CHECK_LIB(X11,XCreateBitmapFromData)
else
AC_MSG_WARN(FLTK not available so no GUI will be built.)
fi
=== modified file 'debian/control'
--- a/debian/control 2009-03-29 22:49:56 +0000
+++ b/debian/control 2010-12-13 16:48:46 +0000
@@ -6,7 +6,7 @@
Vcs-Bzr: http://bzr.licquia.org/htmldoc/debian/
Vcs-Browser: http://bzr.licquia.org/loggerhead/htmldoc/debian/
Standards-Version: 3.8.1
-Build-Depends: libfltk1.1-dev, libssl-dev, debhelper (>> 7), zlib1g-dev, libjpeg-dev, libpng-dev
+Build-Depends: libfltk1.1-dev, libssl-dev, debhelper (>> 7), zlib1g-dev, libjpeg-dev, libpng-dev, dh-autoreconf, autoconf2.59
Package: htmldoc
Architecture: any
=== modified file 'debian/rules'
--- a/debian/rules 2009-03-29 22:49:56 +0000
+++ b/debian/rules 2010-12-13 16:47:10 +0000
@@ -6,9 +6,14 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export AUTOM4TE=autom4te2.59
+export AUTOCONF=autoconf2.59
+export AUTOHEADER=true
+
build: build-stamp
build-stamp:
dh_testdir
+ dh_autoreconf
./configure --prefix=/usr --mandir=/usr/share/man
# Add here commands to compile the package.
@@ -27,6 +32,7 @@
rm -f htmldoc.list
rm -f desktop/htmldoc.dt desktop/htmldoc.ftr desktop/htmldoc.plist
+ dh_autoreconf_clean
dh_clean
install: install-stamp
