[Python-modules-commits] r31614 - in packages/sip4/trunk/debian (3 files)

[mitya57 at users.alioth.debian.org]

    Date: Wednesday, December 24, 2014 @ 18:49:00
  Author: mitya57
Revision: 31614

Refresh patches.

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

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2014-12-24 18:41:12 UTC (rev 31613)
+++ packages/sip4/trunk/debian/changelog	2014-12-24 18:49:00 UTC (rev 31614)
@@ -1,6 +1,7 @@
 sip4 (4.16.5+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 24 Dec 2014 21:40:44 +0300
 

Modified: packages/sip4/trunk/debian/patches/siputils_debian_changes.diff
===================================================================
--- packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2014-12-24 18:41:12 UTC (rev 31613)
+++ packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2014-12-24 18:49:00 UTC (rev 31614)
@@ -1,10 +1,8 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 02_siputils.dpatch by Torsten Marek <shlomme at debian.org>
-Index: sip4-4.14.4/siputils.py
-===================================================================
---- sip4-4.14.4.orig/siputils.py	2013-02-03 08:14:08.000000000 -0500
-+++ sip4-4.14.4/siputils.py	2013-03-06 09:50:41.563819869 -0500
-@@ -808,7 +808,8 @@
+--- a/siputils.py
++++ b/siputils.py
+@@ -809,7 +809,8 @@
  
          libs.extend(self.optional_list("LIBS_WINDOWS"))
  
@@ -14,7 +12,7 @@
  
          # Save the transformed values.
          self.CFLAGS.set(cflags)
-@@ -959,6 +960,15 @@
+@@ -960,6 +961,15 @@
          clib is the library name in cannonical form.
          framework is set of the library is implemented as a MacOS framework.
          """

Modified: packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff
===================================================================
--- packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2014-12-24 18:41:12 UTC (rev 31613)
+++ packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2014-12-24 18:49:00 UTC (rev 31614)
@@ -1,8 +1,6 @@
-Index: sip4-4.16.2+dfsg/siputils.py
-===================================================================
---- sip4-4.16.2+dfsg.orig/siputils.py	2014-07-04 11:25:16.519703071 -0400
-+++ sip4-4.16.2+dfsg/siputils.py	2014-07-04 11:25:16.515703071 -0400
-@@ -1683,9 +1683,12 @@
+--- a/siputils.py
++++ b/siputils.py
+@@ -1689,9 +1689,12 @@
          mfile.write("\n$(OFILES): $(HFILES)\n")
  
          for mf in self._build["moc_headers"].split():
@@ -14,5 +12,5 @@
 +                mf = os.path.join(self._src_dir, mf)
 +
              mfile.write("\n%s: %s\n" % (cpp, mf))
-             mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
+             mfile.write("\t$(MOC) -o %s $<\n" % cpp)