X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=debian%2Frules;h=d4a44bf5d7acc22de3d00d3e31a0fff268b11580;hb=refs%2Ftags%2Fdebian%2F20090908%2Bc5c46dc-1;hp=a5cedfc3b69e5e5f44b61e6b56464d2cde86ad11;hpb=1ea4b33d1a41f4be6e31d8c8678ba83f70f616ec;p=gnulib.git

diff --git a/debian/rules b/debian/rules
index a5cedfc3b..d4a44bf5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,14 +9,21 @@ 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)
+	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 \
+	)
 
 override_dh_auto_clean:
 	$(MAKE) -C doc clean
@@ -46,6 +53,10 @@ 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