X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=8cdf024c47f775abfd0f241a80798c9d1702c47e;hb=5c082dc2ec8dfe6922b327f134785f24783def7b;hp=a5cedfc3b69e5e5f44b61e6b56464d2cde86ad11;hpb=0dfe636812f4ce9072a2b0f6c6ec73af038ed432;p=gnulib.git

diff --git a/debian/rules b/debian/rules
index a5cedfc3b..8cdf024c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,44 +1,46 @@
 #!/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)
+#EXPORT DH_VERBOSE=1
 
-	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 ${@}
 
 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
 
-	mkdir -p debian/gnulib/usr/share/gnulib
-	cp -a build-aux config doc lib m4 modules tests debian/gnulib/usr/share/gnulib
+override_dh_auto_install-arch:
+	dh_auto_install --sourcedir=debian/git-merge-changelog.src --destdir=debian/git-merge-changelog
 
-	# Fixing permissions
+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 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 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 +48,11 @@ 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
-
-	# Removing unused files
+	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
+	# 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: