Apply git-merge-changelog packaging patches from Samuel Bronson

[gnulib.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 5e8c258..1dec219 100755 (executable)
--- 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