[Python-modules-commits] r32073 - in packages/sip4/trunk/debian (4 files)

[mitya57 at users.alioth.debian.org]

    Date: Thursday, March 26, 2015 @ 10:49:28
  Author: mitya57
Revision: 32073

Merge two siputils patches into a single one.

Modified:
  packages/sip4/trunk/debian/changelog
  packages/sip4/trunk/debian/patches/series
  packages/sip4/trunk/debian/patches/siputils_debian_changes.diff
Deleted:
  packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2015-03-26 10:45:38 UTC (rev 32072)
+++ packages/sip4/trunk/debian/changelog	2015-03-26 10:49:28 UTC (rev 32073)
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Backport upstream patch to fix a regression in this release.
+  * Merge two siputils patches into a single one.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 26 Mar 2015 13:25:14 +0300
 

Modified: packages/sip4/trunk/debian/patches/series
===================================================================
--- packages/sip4/trunk/debian/patches/series	2015-03-26 10:45:38 UTC (rev 32072)
+++ packages/sip4/trunk/debian/patches/series	2015-03-26 10:49:28 UTC (rev 32073)
@@ -1,3 +1,2 @@
 siputils_debian_changes.diff
-siputils_objdir_module_fix.diff
 fix_methodcode_regression.diff

Modified: packages/sip4/trunk/debian/patches/siputils_debian_changes.diff
===================================================================
--- packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2015-03-26 10:45:38 UTC (rev 32072)
+++ packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2015-03-26 10:49:28 UTC (rev 32073)
@@ -1,5 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_siputils.dpatch by Torsten Marek <shlomme at debian.org>
+Description: Debian changes to siputils.py
+Author: Torsten Marek <shlomme at debian.org>
+Last-Update: 2015-03-26
+
 --- a/siputils.py
 +++ b/siputils.py
 @@ -809,7 +809,8 @@
@@ -28,3 +30,13 @@
          if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
              prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
          elif sys.platform == "darwin" and framework:
+@@ -1682,6 +1692,9 @@
+             root, discard = os.path.splitext(mf)
+             cpp = "moc_" + root + ".cpp"
+ 
++            if self._src_dir != self.dir:
++                mf = os.path.join(self._src_dir, mf)
++
+             mfile.write("\n%s: %s\n" % (cpp, mf))
+             mfile.write("\t$(MOC) -o %s $<\n" % cpp)
+ 

Deleted: packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff
===================================================================
--- packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2015-03-26 10:45:38 UTC (rev 32072)
+++ packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2015-03-26 10:49:28 UTC (rev 32073)
@@ -1,12 +0,0 @@
---- a/siputils.py
-+++ b/siputils.py
-@@ -1692,6 +1692,9 @@
-             root, discard = os.path.splitext(mf)
-             cpp = "moc_" + root + ".cpp"
- 
-+            if self._src_dir != self.dir:
-+                mf = os.path.join(self._src_dir, mf)
-+
-             mfile.write("\n%s: %s\n" % (cpp, mf))
-             mfile.write("\t$(MOC) -o %s $<\n" % cpp)
-