[Python-modules-commits] r31617 - in packages/sip4/trunk/debian (2 files)

[mitya57 at users.alioth.debian.org]

    Date: Thursday, December 25, 2014 @ 11:51:29
  Author: mitya57
Revision: 31617

Simplify siputils_objdir_module_fix.diff

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

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2014-12-25 11:49:34 UTC (rev 31616)
+++ packages/sip4/trunk/debian/changelog	2014-12-25 11:51:29 UTC (rev 31617)
@@ -1,7 +1,7 @@
 sip4 (4.16.5+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
-  * Refresh patches.
+  * Refresh and simplify patches.
   * Drop configure.py.patch, no longer needed.
   * Update clean and install targets in debian/rules for new version.
 

Modified: packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff
===================================================================
--- packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2014-12-25 11:49:34 UTC (rev 31616)
+++ packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2014-12-25 11:51:29 UTC (rev 31617)
@@ -1,11 +1,7 @@
 --- a/siputils.py
 +++ b/siputils.py
-@@ -1689,9 +1689,12 @@
-         mfile.write("\n$(OFILES): $(HFILES)\n")
- 
-         for mf in self._build["moc_headers"].split():
--            root, discard = os.path.splitext(mf)
-+            root, _ = os.path.splitext(mf)
+@@ -1692,6 +1692,9 @@
+             root, discard = os.path.splitext(mf)
              cpp = "moc_" + root + ".cpp"
  
 +            if self._src_dir != self.dir: