This will allow us to use gnulib-tool during the build, which we need to do in the next patch. --- debian/changelog | 8 ++++++++ debian/patches/01-gnulib-directory.patch | 9 --------- debian/rules | 6 ++++-- gnulib-tool | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog index 5ccdf79..3ea6fe1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gnulib (20130805+stable-1.1) unstable; urgency=low + + * Don't hardcode gnulib directory in 01-gnulib-directory.patch. + Instead, install gnulib-tool into the gnulib directory and symlink to + it from /usr/bin, like the docs say to do. + + -- Samuel Bronson <naes...@gmail.com> Wed, 06 Nov 2013 21:41:19 -0500 + gnulib (20130805+stable-1) unstable; urgency=low * Resumed making upstream snapshots - sorry about the gap. diff --git a/debian/patches/01-gnulib-directory.patch b/debian/patches/01-gnulib-directory.patch index 9cb8c48..951d970 100644 --- a/debian/patches/01-gnulib-directory.patch +++ b/debian/patches/01-gnulib-directory.patch @@ -22,12 +22,3 @@ Index: gnulib/gnulib-tool Copyright (C) $year Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. -@@ -453,7 +454,7 @@ - * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;; - esac - done -- gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'` -+ gnulib_dir=/usr/share/gnulib - } - - # func_tmpdir diff --git a/debian/rules b/debian/rules index 5e8c258..72a1cae 100755 --- a/debian/rules +++ b/debian/rules @@ -12,11 +12,13 @@ override_dh_auto_build: override_dh_auto_install: mkdir -p debian/gnulib/usr/bin - cp -a check-module gnulib-tool debian/gnulib/usr/bin + cp -a check-module debian/gnulib/usr/bin mkdir -p debian/gnulib/usr/share/gnulib cp -a build-aux posix-modules config doc lib m4 modules top tests \ - MODULES.html.sh Makefile debian/gnulib/usr/share/gnulib + MODULES.html.sh Makefile gnulib-tool \ + debian/gnulib/usr/share/gnulib + ln -s ../share/gnulib/gnulib-tool debian/gnulib/usr/bin # Fixing permissions chmod 0755 debian/gnulib/usr/share/gnulib/build-aux/config.guess diff --git a/gnulib-tool b/gnulib-tool index 84be8a7..e33073f 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -454,7 +454,7 @@ func_gnulib_dir () * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;; esac done - gnulib_dir=/usr/share/gnulib + gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'` } # func_tmpdir -- 1.8.4.rc3 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
