[Python-modules-commits] r28079 - in packages/pycxx/trunk/debian (5 files)

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

    Date: Sunday, March 9, 2014 @ 14:17:22
  Author: jtaylor-guest
Revision: 28079

- drop upstream applied 02_fix_indentation.patch
- add fix-version.patch to fix setup.py version number

Added:
  packages/pycxx/trunk/debian/patches/fix-version.patch
Modified:
  packages/pycxx/trunk/debian/changelog
  packages/pycxx/trunk/debian/patches/01_change_include_paths.patch
  packages/pycxx/trunk/debian/patches/series
Deleted:
  packages/pycxx/trunk/debian/patches/02_fix_indentation.patch

Modified: packages/pycxx/trunk/debian/changelog
===================================================================
--- packages/pycxx/trunk/debian/changelog	2014-03-09 14:17:19 UTC (rev 28078)
+++ packages/pycxx/trunk/debian/changelog	2014-03-09 14:17:22 UTC (rev 28079)
@@ -1,6 +1,8 @@
 pycxx (6.2.5-1) unstable; urgency=medium
 
   * New upstream release (Closes: #739879)
+    - drop upstream applied 02_fix_indentation.patch
+    - add fix-version.patch to fix setup.py version number
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Sun, 09 Mar 2014 14:48:16 +0100
 

Modified: packages/pycxx/trunk/debian/patches/01_change_include_paths.patch
===================================================================
--- packages/pycxx/trunk/debian/patches/01_change_include_paths.patch	2014-03-09 14:17:19 UTC (rev 28078)
+++ packages/pycxx/trunk/debian/patches/01_change_include_paths.patch	2014-03-09 14:17:22 UTC (rev 28079)
@@ -1,8 +1,6 @@
 Description: fix includes to match packaged layout
 Forwarded: not-needed
 
-diff --git a/Src/cxxextensions.c b/Src/cxxextensions.c
-index 28a8e1d..cfab556 100644
 --- a/Src/cxxextensions.c
 +++ b/Src/cxxextensions.c
 @@ -37,7 +37,7 @@
@@ -15,8 +13,6 @@
 -#include "Src/Python3/cxxextensions.c"
 +#include "Python3/cxxextensions.c"
  #endif
-diff --git a/Src/cxxsupport.cxx b/Src/cxxsupport.cxx
-index 1f2fb43..946e60d 100644
 --- a/Src/cxxsupport.cxx
 +++ b/Src/cxxsupport.cxx
 @@ -37,7 +37,7 @@

Deleted: packages/pycxx/trunk/debian/patches/02_fix_indentation.patch
===================================================================
--- packages/pycxx/trunk/debian/patches/02_fix_indentation.patch	2014-03-09 14:17:19 UTC (rev 28078)
+++ packages/pycxx/trunk/debian/patches/02_fix_indentation.patch	2014-03-09 14:17:22 UTC (rev 28079)
@@ -1,31 +0,0 @@
-Description: fix indentation and version number
-Bug: http://sourceforge.net/tracker/?func=detail&aid=3207845&group_id=3180&atid=103180
-
-diff --git a/setup.py b/setup.py
-index ef82cf5..016aa7e 100755
---- a/setup.py
-+++ b/setup.py
-@@ -12,18 +12,18 @@ sources = (glob( os.path.join( "Src", "*.cxx" ) )
- class my_install (install):
- 
-     def finalize_options (self):
--	if not self.install_data or (len(self.install_data) < 8) :
--	    self.install_data = "$base/share/python$py_version_short"
-+        if not self.install_data or (len(self.install_data) < 8):
-+            self.install_data = "$base/share/python$py_version_short"
-         install.finalize_options (self)
- 
-     def run (self):
--	self.distribution.data_files = [("CXX", sources)]
--	self.distribution.headers = headers
-+        self.distribution.data_files = [("CXX", sources)]
-+        self.distribution.headers = headers
-         install.run (self)
- 
- 
- setup (name             = "CXX",
--       version          = "6.2.0",
-+       version          = "6.2.4",
-        maintainer       = "Barry Scott",
-        maintainer_email = "barry-scott at users.sourceforge.net",
-        description      = "Facility for extending Python with C++",

Added: packages/pycxx/trunk/debian/patches/fix-version.patch
===================================================================
--- packages/pycxx/trunk/debian/patches/fix-version.patch	                        (rev 0)
+++ packages/pycxx/trunk/debian/patches/fix-version.patch	2014-03-09 14:17:22 UTC (rev 28079)
@@ -0,0 +1,14 @@
+Description: fix indentation and version number
+Bug: http://sourceforge.net/tracker/?func=detail&aid=3207845&group_id=3180&atid=103180
+
+--- a/setup.py
++++ b/setup.py
+@@ -23,7 +23,7 @@ class my_install (install):
+ 
+ 
+ setup (name             = "CXX",
+-       version          = "6.2.4",
++       version          = "6.2.5",
+        maintainer       = "Barry Scott",
+        maintainer_email = "barry-scott at users.sourceforge.net",
+        description      = "Facility for extending Python with C++",

Modified: packages/pycxx/trunk/debian/patches/series
===================================================================
--- packages/pycxx/trunk/debian/patches/series	2014-03-09 14:17:19 UTC (rev 28078)
+++ packages/pycxx/trunk/debian/patches/series	2014-03-09 14:17:22 UTC (rev 28079)
@@ -1,2 +1,2 @@
 01_change_include_paths.patch
-02_fix_indentation.patch
+fix-version.patch