Control: tag -1 + patch

Hi John,

Chris Lamb wrote:
> gopher fails to build from source in unstable/amd64:

the following patch fixes this issue. Only packaging changes are needed,
but it needs changes in multiple places:

diff --git a/debian/changelog b/debian/changelog
index dbc225b..f035732 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gopher (3.0.13+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Fix FTBFS (Closes: #798758)
+    + Use autoconf and gnulib instead of autoconf2.13.
+    + debian/rules: configure-stamp is a dependency of build-stamp, not build.
+    + debian/rules: Add symlink to /usr/share/gnulib/lib/getloadavg.c and
+      remove it again in the clean target.
+
+ -- Axel Beckert <a...@debian.org>  Sun, 20 Sep 2015 18:04:44 +0200
+
 gopher (3.0.13) unstable; urgency=low
 
   * More changes to download.c to prefer getcwd() to get_current_dir_name().
diff --git a/debian/control b/debian/control
index 38e33c0..46966e4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: John Goerzen <jgoer...@complete.org>
 Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.0.0), ncurses-dev, autoconf2.13
+Build-Depends: debhelper (>= 4.0.0), ncurses-dev, autoconf, gnulib
 
 Package: gopher
 Provides: gopher-client
diff --git a/debian/rules b/debian/rules
index 9661eaa..52c6c78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,16 +19,17 @@ configure: configure-stamp
 configure-stamp:
        dh_testdir
        # Add here commands to configure the package.
-       autoconf2.13
-       autoheader2.13
+       autoconf
+       autoheader
+       ln -vs /usr/share/gnulib/lib/getloadavg.c .
        ./configure --prefix=/usr --mandir=\$${prefix}/share/man \
                --infodir=\$${prefix}/share/info --disable-auth \
                --sysconfdir=/etc
 
        touch configure-stamp
 
-build: configure-stamp build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: configure-stamp
        dh_testdir
 
        # Add here commands to compile the package.
@@ -49,7 +50,7 @@ clean:
        -rm -f `find . -name "config.log"`
        -rm -f Makefile.config gopher/Makefile gopher/locales/Makefile \
                Makefile config.h doc/Makefile \
-               gophfilt/Makefile object/Makefile
+               gophfilt/Makefile object/Makefile getloadavg.c
 
        dh_clean
 
I'd be happy if I don't need to NMU this as you seem to be upstream,
too, and the packaging is part of the upstream code (which is probably
the reason why this is a native package).

                Regards, Axel
-- 
 ,''`.  |  Axel Beckert <a...@debian.org>, http://people.debian.org/~abe/
: :' :  |  Debian Developer, ftp.ch.debian.org Admin
`. `'   |  4096R: 2517 B724 C5F6 CA99 5329  6E61 2FF9 CD59 6126 16B5
  `-    |  1024D: F067 EA27 26B9 C3FC 1486  202E C09E 1D89 9593 0EDE

Attachment: signature.asc
Description: Digital signature

Reply via email to