From a6ae1bb228f3bcfac76095600d05969d214ed65f Mon Sep 17 00:00:00 2001 From: Ian Beckwith Date: Sat, 1 Mar 2014 21:07:46 +0000 Subject: [PATCH] Apply git-merge-changelog packaging patches from Samuel Bronson --- debian/changelog | 11 +++++++++++ debian/compat | 2 +- debian/control | 14 +++++++++++++- debian/patches/01-gnulib-directory.patch | 9 --------- debian/rules | 22 +++++++++++++++++----- gnulib-tool | 2 +- 6 files changed, 43 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index adf034f0d..674b3b480 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +gnulib (20140202+stable-2) 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. + * Package git-merge-changelog (Closes: #646013). + * Override for lintian getting confused by example GFDL blurbs. + * Bump debhelper compat level to 9 for hardening flags. + + -- Samuel Bronson Wed, 06 Nov 2013 21:41:19 -0500 + gnulib (20140202+stable-1) unstable; urgency=low * New upstream stable snapshot. diff --git a/debian/compat b/debian/compat index 7f8f011eb..ec635144f 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index baa6ff312..0eecc351d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,8 @@ Source: gnulib Section: devel Priority: optional Maintainer: Ian Beckwith -Build-Depends: debhelper (>= 7.0.50~), texinfo +Build-Depends: dpkg-dev (>= 1.16.2), debhelper (>= 9), autoconf, automake +Build-Depends-Indep: texinfo Standards-Version: 3.9.5 Homepage: http://www.gnu.org/software/gnulib/ Vcs-Browser: http://erislabs.net/gitweb?p=gnulib.git @@ -16,3 +17,14 @@ Description: GNU Portability Library The GNU portability library is a macro system and C declarations and definitions for commonly-used API elements and abstracted system behaviors. It can be used to improve portability and other functionality in your programs. + +Package: git-merge-changelog +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: git merge driver for GNU ChangeLog files + ChangeLog files *always* foul up most version control systems in + their default configuration. + . + git-merge-changelog is a tool from gnulib designed to help with this + for the case of GNU-style ChangeLogs; it can be used with at least + git, bzr, and hg. diff --git a/debian/patches/01-gnulib-directory.patch b/debian/patches/01-gnulib-directory.patch index 57ebbf77e..b9bd60865 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 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 5e8c2586f..1dec21915 100755 --- a/debian/rules +++ b/debian/rules @@ -1,22 +1,34 @@ #!/usr/bin/make -f %: - dh ${@} + dh ${@} --sourcedirectory=utils override_dh_auto_clean: $(MAKE) -C doc clean + rm -rf utils/* + dh_auto_clean -override_dh_auto_build: +override_dh_auto_configure-arch: + ./gnulib-tool --create-testdir --without-tests -S \ + --dir=utils git-merge-changelog + dh_auto_configure + +override_dh_auto_install-arch: + dh_auto_install --destdir=debian/git-merge-changelog + +override_dh_auto_build-indep: $(MAKE) -C doc info $(MAKE) -C doc html -override_dh_auto_install: +override_dh_auto_install-indep: 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 13aac1ab9..592f1bf88 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 -- 2.11.0