fixup git-merge-changelog package

[gnulib.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index d97dc54..8cdf024 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,51 +1,46 @@
 #!/usr/bin/make -f
 
+#EXPORT DH_VERBOSE=1
+
 %:
-       dh ${@} --with quilt
-
-DATE=$(shell date +%Y%m%d)
-
-upstream:
-       # Needs: git-core
-
-       cd .. && \
-       git clone --depth 1 git://git.savannah.gnu.org/gnulib.git  gnulib-$(DATE)
-       ( \
-           BUILDDIR="`pwd`" && \
-           cd ../gnulib-$(DATE) && \
-           VER=`git log -1 --pretty=%h` && \
-           cd .. && \
-           mv gnulib-$(DATE) gnulib-$(DATE)+$$VER && \
-           cd "$$BUILDDIR" && \
-           dch -p -v "$(DATE)+$$VER-1" "New upstream snapshot $(DATE)+$$VER." && \
-           rm -rf ../gnulib-$(DATE)+$$VER/.git ../gnulib-$(DATE)+$$VER/.gitattributes && \
-           find ../gnulib-$(DATE)+$$VER -name .cvsignore | xargs rm -f && \
-           find ../gnulib-$(DATE)+$$VER -name .gitignore | xargs rm -f && \
-           cd .. && \
-           tar cfz gnulib_$(DATE)+$$VER.orig.tar.gz gnulib-$(DATE)+$$VER \
-       )
+       dh ${@}
 
 override_dh_auto_clean:
        $(MAKE) -C doc clean
+       -rm -rf debian/git-merge-changelog.src
+       -rm -f debian/git-merge-changelog.1
+       dh_auto_clean
+
+override_dh_auto_configure-arch:
+       ./gnulib-tool --create-testdir --without-tests -S \
+               --dir=debian/git-merge-changelog.src git-merge-changelog
+       dh_auto_configure --sourcedir debian/git-merge-changelog.src
 
-override_dh_auto_build:
+override_dh_auto_build-indep:
        $(MAKE) -C doc info
        $(MAKE) -C doc html
 
-override_dh_auto_install:
-       mkdir -p debian/gnulib/usr/bin
-       cp -a check-module gnulib-tool debian/gnulib/usr/bin
+override_dh_auto_build-arch:
+       dh_auto_build --sourcedir debian/git-merge-changelog.src
+       pod2man --section=1 debian/git-merge-changelog.pod debian/git-merge-changelog.1
+
+override_dh_auto_install-arch:
+       dh_auto_install --sourcedir=debian/git-merge-changelog.src --destdir=debian/git-merge-changelog
 
+override_dh_auto_install-indep:
+       mkdir -p 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
-
-       # Fixing permissions
+             MODULES.html.sh Makefile gnulib-tool \
+             debian/gnulib/usr/share/gnulib
+       ln -s ../share/gnulib/gnulib-tool debian/gnulib/usr/bin
+       # Fix 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 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
@@ -55,8 +50,9 @@ override_dh_auto_install:
        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
+       # Remove 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: