[Python-modules-commits] r18754 - in packages/python-peak.rules/trunk/debian (rules)

[eriol-guest at users.alioth.debian.org]

    Date: Wednesday, September 28, 2011 @ 15:17:56
  Author: eriol-guest
Revision: 18754

Do more careful repacks and use mkdir -p $(GOS_TMP_DIR) instead of
test -d $(GOS_TMP_DIR) || mkdir $(GOS_TMP_DIR).
Thanks to Stefano Rivera for the hints.

Modified:
  packages/python-peak.rules/trunk/debian/rules

Modified: packages/python-peak.rules/trunk/debian/rules
===================================================================
--- packages/python-peak.rules/trunk/debian/rules	2011-09-28 14:35:24 UTC (rev 18753)
+++ packages/python-peak.rules/trunk/debian/rules	2011-09-28 15:17:56 UTC (rev 18754)
@@ -5,6 +5,8 @@
 GOS_TMP_DIR = $(DEB_ROOT)/get-orig-source
 PWD := $(shell pwd)
 
+TAR_EXTRA_ARGS = --owner root --group root --mode a+rX
+
 PRIORITIZED_METHODS = prioritized_methods-0.2.2dev-20110830
 DEB_PRIORITIZED_METHODS_DIR = $(subst _,-,$(subst .,-,$(PRIORITIZED_METHODS)))
 
@@ -29,17 +31,17 @@
 	dh_installdocs
 
 get-orig-source:
-	test -d $(GOS_TMP_DIR) || mkdir $(GOS_TMP_DIR)
-	uscan --force-download --destdir $(GOS_TMP_DIR) --no-symlink;
+	mkdir -p $(GOS_TMP_DIR)
+	uscan --force-download --destdir $(GOS_TMP_DIR) --no-symlink
 	uscan --no-conf \
 		--watchfile debian/`echo $(PRIORITIZED_METHODS) | cut -d- -f1`.watch \
 		--upstream-version 0 --download-version `echo $(PRIORITIZED_METHODS) | cut -d- -f2,3` \
-		--download --destdir $(GOS_TMP_DIR) --no-symlink;
+		--download --destdir $(GOS_TMP_DIR) --no-symlink
 	mv $(GOS_TMP_DIR)/$(PRIORITIZED_METHODS).tar.gz \
-		$(GOS_TMP_DIR)/$(PKG)_$(VERSION).orig-`echo $(PRIORITIZED_METHODS) | tr ._ -`.tar.gz;
+		$(GOS_TMP_DIR)/$(PKG)_$(VERSION).orig-`echo $(PRIORITIZED_METHODS) | tr ._ -`.tar.gz
 	# Create manually the empty main package
 	mkdir $(GOS_TMP_DIR)/$(PKG)-$(VERSION)
-	cd $(GOS_TMP_DIR); tar czf $(PKG)_$(VERSION).orig.tar.gz $(PKG)-$(VERSION)
+	cd $(GOS_TMP_DIR); GZIP=--best tar -cz $(TAR_EXTRA_ARGS) -f $(PKG)_$(VERSION).orig.tar.gz $(PKG)-$(VERSION)
 	rmdir $(GOS_TMP_DIR)/$(PKG)-$(VERSION)
 	mv $(GOS_TMP_DIR)/$(PKG)_$(VERSION).orig* $(PWD)
 	rm -Rf $(GOS_TMP_DIR)