[Python-modules-commits] r8933 - in packages/python-toscawidgets/trunk/debian (7 files)

[zack at users.alioth.debian.org]

    Date: Saturday, July 4, 2009 @ 09:18:39
  Author: zack
Revision: 8933

better work around to avoid removal of (only apparently) useless __init__.py

Added:
  packages/python-toscawidgets/trunk/debian/patches/
  packages/python-toscawidgets/trunk/debian/patches/00dpatch.conf
  packages/python-toscawidgets/trunk/debian/patches/00list
  packages/python-toscawidgets/trunk/debian/patches/force-init_py.dpatch
Modified:
  packages/python-toscawidgets/trunk/debian/changelog
  packages/python-toscawidgets/trunk/debian/control
  packages/python-toscawidgets/trunk/debian/rules

Modified: packages/python-toscawidgets/trunk/debian/changelog
===================================================================
--- packages/python-toscawidgets/trunk/debian/changelog	2009-07-03 17:34:17 UTC (rev 8932)
+++ packages/python-toscawidgets/trunk/debian/changelog	2009-07-04 09:18:39 UTC (rev 8933)
@@ -1,3 +1,11 @@
+python-toscawidgets (0.9.7.1-3) UNRELEASED; urgency=low
+
+  * better work around to avoid pysupport removal of apparently useless
+    __init__.py: make them non empty via patch
+  * debian/{control,rules}: add support for dpatch-ing
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sat, 04 Jul 2009 10:50:31 +0200
+
 python-toscawidgets (0.9.7.1-2) experimental; urgency=low
 
   * debian/rules:

Modified: packages/python-toscawidgets/trunk/debian/control
===================================================================
--- packages/python-toscawidgets/trunk/debian/control	2009-07-03 17:34:17 UTC (rev 8932)
+++ packages/python-toscawidgets/trunk/debian/control	2009-07-04 09:18:39 UTC (rev 8933)
@@ -7,6 +7,7 @@
 Build-Depends:
  debhelper (>= 7),
  cdbs,
+ dpatch,
  python-dev,
  python-support,
  python-setuptools

Added: packages/python-toscawidgets/trunk/debian/patches/00dpatch.conf
===================================================================
--- packages/python-toscawidgets/trunk/debian/patches/00dpatch.conf	                        (rev 0)
+++ packages/python-toscawidgets/trunk/debian/patches/00dpatch.conf	2009-07-04 09:18:39 UTC (rev 8933)
@@ -0,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs

Added: packages/python-toscawidgets/trunk/debian/patches/00list
===================================================================
--- packages/python-toscawidgets/trunk/debian/patches/00list	                        (rev 0)
+++ packages/python-toscawidgets/trunk/debian/patches/00list	2009-07-04 09:18:39 UTC (rev 8933)
@@ -0,0 +1 @@
+force-init_py

Added: packages/python-toscawidgets/trunk/debian/patches/force-init_py.dpatch
===================================================================
--- packages/python-toscawidgets/trunk/debian/patches/force-init_py.dpatch	                        (rev 0)
+++ packages/python-toscawidgets/trunk/debian/patches/force-init_py.dpatch	2009-07-04 09:18:39 UTC (rev 8933)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## force-init_py.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: avoid removal of apparently useless __init__.py by pysupport
+
+ at DPATCH@
+diff -urNad trunk~/toscawidgets/tw/paste_templates/__init__.py trunk/toscawidgets/tw/paste_templates/__init__.py
+--- trunk~/toscawidgets/tw/paste_templates/__init__.py	2009-06-16 15:14:56.000000000 +0200
++++ trunk/toscawidgets/tw/paste_templates/__init__.py	2009-07-04 11:17:01.061691224 +0200
+@@ -0,0 +1,2 @@
++# Non empty __init__.py, just to avoid python-support removing it as
++# apparently useless.
+diff -urNad trunk~/tw.forms/tw/forms/templates/__init__.py trunk/tw.forms/tw/forms/templates/__init__.py
+--- trunk~/tw.forms/tw/forms/templates/__init__.py	2009-06-16 15:16:29.000000000 +0200
++++ trunk/tw.forms/tw/forms/templates/__init__.py	2009-07-04 11:16:08.554714940 +0200
+@@ -0,0 +1,2 @@
++# Non empty __init__.py, just to avoid python-support removing it as
++# apparently useless.


Property changes on: packages/python-toscawidgets/trunk/debian/patches/force-init_py.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/python-toscawidgets/trunk/debian/rules
===================================================================
--- packages/python-toscawidgets/trunk/debian/rules	2009-07-03 17:34:17 UTC (rev 8932)
+++ packages/python-toscawidgets/trunk/debian/rules	2009-07-04 09:18:39 UTC (rev 8933)
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 DEB_PYTHON_SYSTEM = pysupport
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
 PKG = python-toscawidgets
 UPSTREAMS = \
@@ -10,28 +11,11 @@
 	$(NULL)
 export SUBDIRS = $(UPSTREAMS)
 
-# Dirs of Python modules which should exist in spite of not containing
-# any .py file (e.g. templates for genshi). This list is used to
-# hackishly work around pysupport eager removal of "useless"
-# __init__.py files.
-# See #535611 (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=535611)
-force_modules = \
-	tw.forms/tw/forms/templates \
-	$(NULL)
-
 DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
 
 makebuilddir/$(PKG)::
 	find . -name '*.pyc' -exec rm {} \;
 
-makebuilddir/$(PKG)::
-	for d in $(force_modules) ; do \
-		echo '# NOT A REAL PYTHON MODULE, DO NOT USE.' > $$d/i_dont_exist.py ; \
-		echo '# Work around for pysupport eagerness in removing "useless" __init__.py' >> $$d/i_dont_exist.py ; \
-	done
-clean::
-	for d in $(force_modules) ; do rm -f $$d/i_dont_exist.py ; done
-
 # avoid installing useless *.pth files ; fix spurious +x bits
 install/$(PKG)::
 	rm -f debian/$(PKG)/usr/lib/python*/site-packages/*.pth