[kernel] r19242 - dists/sid/linux/debian

[Ben Hutchings]

Author: benh
Date: Mon Jul  9 13:28:07 2012
New Revision: 19242

Log:
Ignore .git directory when copying/comparing source

This helps people using git-svn checkouts (thanks to Yves-Alexis Perez)

Modified:
   dists/sid/linux/debian/rules
   dists/sid/linux/debian/rules.real

Modified: dists/sid/linux/debian/rules
==============================================================================
--- dists/sid/linux/debian/rules	Fri Jul  6 05:11:39 2012	(r19241)
+++ dists/sid/linux/debian/rules	Mon Jul  9 13:28:07 2012	(r19242)
@@ -51,7 +51,7 @@
 TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME)))
 
 orig: $(DIR_ORIG)
-	rsync --delete --exclude /debian --exclude .svk --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
+	rsync --delete --exclude /debian --exclude .svk --exclude .svn --exclude .git --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
 	QUILT_PATCHES='$(CURDIR)/debian/patches' quilt push --quiltrc - -a -q --fuzz=0
 
 $(DIR_ORIG):
@@ -64,7 +64,7 @@
 
 maintainerclean:
 	rm -f debian/config.defines.dump debian/control debian/control.md5sum debian/rules.gen
-	rm -rf $(filter-out debian .svk .svn, $(wildcard * .[^.]*))
+	rm -rf $(filter-out debian .svk .svn .git, $(wildcard * .[^.]*))
 
 clean: debian/control
 	dh_testdir

Modified: dists/sid/linux/debian/rules.real
==============================================================================
--- dists/sid/linux/debian/rules.real	Fri Jul  6 05:11:39 2012	(r19241)
+++ dists/sid/linux/debian/rules.real	Mon Jul  9 13:28:07 2012	(r19242)
@@ -70,7 +70,7 @@
 
 define copy_source
 mkdir -p '$(1)'
-cp -al $(filter-out debian .pc .svk .svn, $(wildcard * .[^.]*)) '$(1)'
+cp -al $(filter-out debian .pc .svk .svn .git, $(wildcard * .[^.]*)) '$(1)'
 endef
 
 $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION)
@@ -85,7 +85,7 @@
 	set -o pipefail;						\
 	(cd '$(BUILD_DIR)';						\
 	 set +e;							\
-         diff -urN -p -x debian -x .pc -x .svk -x .svn source_none source_$*; \
+         diff -urN -p -x debian -x .pc -x .svk -x .svn -x .git source_none source_$*; \
 	 test $$? -eq 1) |						\
 	filterdiff --remove-timestamps --strip=1 --addoldprefix=a/ --addnewprefix=b/ | \
 	bzip2 -c >$@ ||							\