tags 547818 + patch pending
thanks

Dear maintainer,

I've prepared an NMU for gaphor (versioned as 0.13.1-1.1) and uploaded
it to DELAYED/5, according to devref §5.11.1. The most important part of
the patch is passing --install-layout=deb to setup.py when invoked with
"install". Additionally:

- it ports your comment out logic for zope requirements to any place
  where eggs get installed (and avoids removing heading "zope" strings)

- it ensures patch file stamp gets removed upon clean

Cheers.

-- 
Stefano Zacchiroli -o- PhD in Computer Science \ PostDoc @ Univ. Paris 7
z...@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'è ..|  .  |. Et ne m'en veux pas si je te tutoie
sempre uno zaino ...........| ..: |.... Je dis tu à tous ceux que j'aime
diff -u gaphor-0.13.1/debian/rules gaphor-0.13.1/debian/rules
--- gaphor-0.13.1/debian/rules
+++ gaphor-0.13.1/debian/rules
@@ -23,7 +23,7 @@
 	python setup.py build
 	touch build-stamp
 
-clean: clean-patched unpatch
+clean: clean-patched-stamp unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp clean-patched-stamp
@@ -36,7 +36,7 @@
 
 	dh_clean 
 
-clean-patched: patch
+clean-patched-stamp: patch
 	dh_testdir
 	dh_testroot
 	python setup.py clean
@@ -52,11 +52,13 @@
 	mkdir -p debian/gaphor/usr/share/pixmaps
 	cp debian/gaphor.xpm debian/gaphor/usr/share/pixmaps
 
-	python setup.py install --root=$(CURDIR)/debian/gaphor
+	python setup.py install \
+		--root=$(CURDIR)/debian/gaphor --install-layout=deb
 
 	# Comment zope requirement because zope3 package does not provide a
 	# egg-info directory
-	sed -i s/^zope/#/ $(CURDIR)/debian/gaphor/usr/lib/python2.*/site-packages/gaphor-*-py2.*.egg-info/requires.txt
+	find debian/ -wholename '*/gaphor-*.egg-info/requires.txt' \
+		| xargs sed -i 's/^zope/# zope/'
 
 # Build architecture-dependent files here.
 binary-indep: build install
diff -u gaphor-0.13.1/debian/changelog gaphor-0.13.1/debian/changelog
--- gaphor-0.13.1/debian/changelog
+++ gaphor-0.13.1/debian/changelog
@@ -1,3 +1,14 @@
+gaphor (0.13.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules
+    - pass --install-layout=def to setup.py for Python 2.6 transition
+      (Closes: #547818)
+    - more robust comment-out strategy for zope.* requirements in eggs
+    - fix name of clean-patched-stamp (ensure it gets removed upon clean)
+
+ -- Stefano Zacchiroli <z...@debian.org>  Sat, 10 Oct 2009 22:57:23 +0200
+
 gaphor (0.13.1-1) unstable; urgency=low
 
   * New upstream release

Reply via email to