The method seems kind of ridiculous to me, but that's the documented
way to do things...
Since debhelper doesn't expect the --sourcedirectory to be created as
part of the build process, we arrange for it to be created ahead of
time by placing an empty .gitignore file in it. (It could have been
any file whose name started with a ., but .gitignore seems to be
semi-idiomatic for this purpose.)
---
debian/changelog | 1 +
debian/control | 14 +++++++++++++-
debian/rules | 15 ++++++++++++---
utils/.gitignore | 0
4 files changed, 26 insertions(+), 4 deletions(-)
create mode 100644 utils/.gitignore
diff --git a/debian/changelog b/debian/changelog
index 3ea6fe1..d070c5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ 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.
+ * Package git-merge-changelog (Closes: #646013).
-- Samuel Bronson <naes...@gmail.com> Wed, 06 Nov 2013 21:41:19 -0500
diff --git a/debian/control b/debian/control
index 6ec4caa..011a5f9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: gnulib
Section: devel
Priority: optional
Maintainer: Ian Beckwith <i...@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), texinfo
+Build-Depends: dpkg-dev (>= 1.16.2), debhelper (>= 7.0.50~), autoconf, automake
+Build-Depends-Indep: texinfo
Standards-Version: 3.9.4
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/rules b/debian/rules
index 72a1cae..1de52a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,25 @@
#!/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 --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 debian/gnulib/usr/bin
diff --git a/utils/.gitignore b/utils/.gitignore
new file mode 100644
index 0000000..e69de29
--
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
