[Pkg-corba-commits] r275 - in /trunk/python-omniorb/debian: changelog patches/dist-packages__init__ patches/series

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

Author: flub-guest
Date: Sun Jun  5 20:17:01 2011
New Revision: 275

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=275
Log:
Add patch to stop shipping __init__.py into dist-packages

Added:
    trunk/python-omniorb/debian/patches/dist-packages__init__
Modified:
    trunk/python-omniorb/debian/changelog
    trunk/python-omniorb/debian/patches/series

Modified: trunk/python-omniorb/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/debian/changelog?rev=275&op=diff
==============================================================================
--- trunk/python-omniorb/debian/changelog (original)
+++ trunk/python-omniorb/debian/changelog Sun Jun  5 20:17:01 2011
@@ -1,3 +1,10 @@
+python-omniorb (3.5-3) UNRELEASED; urgency=low
+
+  * debian/patches/dist-packages__init__: patch to stop shipping __init__.py
+    into dist-packages (Closes: #629345).
+
+ -- Floris Bruynooghe <flub at devork.be>  Sun, 05 Jun 2011 21:15:00 +0100
+
 python-omniorb (3.5-2) unstable; urgency=low
 
   * debian/omniidl-python.install: fix bug exposed by python2.5

Added: trunk/python-omniorb/debian/patches/dist-packages__init__
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/debian/patches/dist-packages__init__?rev=275&op=file
==============================================================================
--- trunk/python-omniorb/debian/patches/dist-packages__init__ (added)
+++ trunk/python-omniorb/debian/patches/dist-packages__init__ Sun Jun  5 20:17:01 2011
@@ -1,0 +1,18 @@
+Description: Do not install an __init__.py into dist-packages
+Bug-Debian: http://bugs.debian.org/629345
+Author: Floris Bruynooghe <flub at devork.be>
+Last-Update: 2011-06-05
+
+--- a/python/COS/dir.mk
++++ b/python/COS/dir.mk
+@@ -78,8 +78,8 @@
+ EXPORTEDFILES += $(foreach f, $(filter CosNaming%, $(FILES)), $(PYLIBROOT)/$(f))
+ 
+ # __init__.py to make it a package
+-FILES += __init__.py
+-INSTALLEDFILES += $(INSTALLPYTHONDIR)/__init__.py
++#FILES += __init__.py
++#INSTALLEDFILES += $(INSTALLPYTHONDIR)/__init__.py
+ 
+ # A .pth file to expose omniORB/COS to the global namespace
+ FILES += omniORB.pth

Modified: trunk/python-omniorb/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/debian/patches/series?rev=275&op=diff
==============================================================================
--- trunk/python-omniorb/debian/patches/series (original)
+++ trunk/python-omniorb/debian/patches/series Sun Jun  5 20:17:01 2011
@@ -1,3 +1,4 @@
 buildsys
 pydebug
 pythonpath
+dist-packages__init__