X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=1dec219153666e78034f40f4b911cae180288229;hb=a6ae1bb228f3bcfac76095600d05969d214ed65f;hp=356ca1337167b2db3be725528d276d64dd01a257;hpb=5e05da8849498d8dc22bbb603c9e995c58e1c381;p=gnulib.git

diff --git a/debian/rules b/debian/rules
index 356ca1337..1dec21915 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,51 +1,41 @@
 #!/usr/bin/make -f
 
 %:
-	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 ${@} --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 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
@@ -53,8 +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: