Apply git-merge-changelog packaging patches from Samuel Bronson

[gnulib.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index a5cedfc..1dec219 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,44 +1,41 @@
 #!/usr/bin/make -f
 
 %:
-       dh ${@} --with quilt
-
-DATE=$(shell date +%Y%m%d)
-
-upstream:
-       # Needs: git-core
-
-       cd .. && \
-       git clone git://git.savannah.gnu.org/gnulib.git && \
-       mv gnulib gnulib-$(DATE)
-
-       rm -rf ../gnulib-$(DATE)/.git ../gnulib-$(DATE)/.gitattributes
-       find ../gnulib-$(DATE) -name .cvsignore | xargs rm -f
-       find ../gnulib-$(DATE) -name .gitignore | xargs rm -f
-
-       tar cfz ../gnulib_$(DATE).orig.tar.gz ../gnulib-$(DATE)
+       dh ${@} --sourcedirectory=utils
 
 override_dh_auto_clean:
        $(MAKE) -C doc clean
+       rm -rf utils/*
+       dh_auto_clean
+
+override_dh_auto_configure-arch:
+       ./gnulib-tool --create-testdir --without-tests -S \
+               --dir=utils git-merge-changelog
+       dh_auto_configure
 
-override_dh_auto_build:
+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 config doc lib m4 modules tests debian/gnulib/usr/share/gnulib
+       cp -a build-aux posix-modules config doc lib m4 modules top tests \
+             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
        chmod 0755 debian/gnulib/usr/share/gnulib/build-aux/config.sub
        chmod 0755 debian/gnulib/usr/share/gnulib/build-aux/gendocs.sh
        chmod 0644 debian/gnulib/usr/share/gnulib/doc/gendocs_template
-       chmod 0644 debian/gnulib/usr/share/gnulib/lib/fflush.c
-       chmod 0644 debian/gnulib/usr/share/gnulib/m4/canonicalize-lgpl.m4
+       chmod 0755 debian/gnulib/usr/share/gnulib/lib/config.charset
        chmod 0644 debian/gnulib/usr/share/gnulib/m4/fflush.m4
        chmod 0644 debian/gnulib/usr/share/gnulib/modules/canonicalize-lgpl
        chmod 0644 debian/gnulib/usr/share/gnulib/modules/fflush
@@ -46,6 +43,12 @@ override_dh_auto_install:
        chmod 0644 debian/gnulib/usr/share/gnulib/tests/test-base64.c
        chmod 0755 debian/gnulib/usr/share/gnulib/tests/test-closein.sh
        chmod 0644 debian/gnulib/usr/share/gnulib/tests/test-fflush.c
+       chmod 0755 debian/gnulib/usr/share/gnulib/tests/test-posix_spawn1.in.sh
+       chmod 0755 debian/gnulib/usr/share/gnulib/tests/test-posix_spawn2.in.sh
 
        # Removing unused files
        rm -f debian/gnulib/usr/share/gnulib/modules/COPYING
+       rm -f debian/gnulib/usr/share/gnulib/*/.cvsignore
+       rm -f debian/gnulib/usr/share/gnulib/*/.gitignore
+
+override_dh_auto_test: