[Python-apps-commits] r1471 - in packages/s3cmd/trunk/debian (rules)

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

    Date: Wednesday, June 18, 2008 @ 15:03:04
  Author: dottedmag-guest
Revision: 1471

Fixed quilt use: no longer generates garbage in .diff.gz

Modified:
  packages/s3cmd/trunk/debian/rules

Modified: packages/s3cmd/trunk/debian/rules
===================================================================
--- packages/s3cmd/trunk/debian/rules	2008-06-18 14:05:28 UTC (rev 1470)
+++ packages/s3cmd/trunk/debian/rules	2008-06-18 15:03:04 UTC (rev 1471)
@@ -5,27 +5,32 @@
 
 PACKAGE_NAME=s3cmd
 
-build:
-
-clean: patch
+clean: clean-patched unpatch
 	dh_testdir
 	dh_testroot
 
-	S3CMD_PACKAGING=1 python setup.py clean
-	-rm -f build-stamp
 	-rm -f S3/*.pyc
 
 	dh_clean
 
-install: build
+#
+# We have to run patched setup.py, as it checks for the elementtree
+#
+clean-patched: patch
 	dh_testdir
 	dh_testroot
+
+	S3CMD_PACKAGING=1 python setup.py clean
+
+install: patch
+	dh_testdir
+	dh_testroot
 	dh_clean -k
 
 	S3CMD_PACKAGING=1 python setup.py install --no-compile --root $(CURDIR)/debian/$(PACKAGE_NAME)
 	rm -rf debian/$(PACKAGE_NAME)/usr/lib/python*/site-packages/*.egg-info
 
-binary-indep: build install
+binary-indep: install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs NEWS
@@ -39,7 +44,7 @@
 	dh_md5sums
 	dh_builddeb
 
-binary-arch: build install
+binary-arch: install
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install