[Python-modules-commits] r23146 - in packages/sip4/trunk/debian (5 files)

[kitterman at users.alioth.debian.org]

    Date: Monday, December 10, 2012 @ 06:55:55
  Author: kitterman
Revision: 23146

* New upstream release
  - Refreshed patches
* Use updated watch file provided by Bart Martens
* Bump standards version to 3.9.4 without further change

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

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2012-12-09 21:17:57 UTC (rev 23145)
+++ packages/sip4/trunk/debian/changelog	2012-12-10 06:55:55 UTC (rev 23146)
@@ -1,3 +1,12 @@
+sip4 (4.14.2-1) experimental; urgency=low
+
+  * New upstream release
+    - Refreshed patches
+  * Use updated watch file provided by Bart Martens
+  * Bump standards version to 3.9.4 without further change
+
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 09 Dec 2012 14:02:36 -0500
+
 sip4 (4.14-5) experimental; urgency=low
 
   * Remove *.preinst scripts as they are no longer needed.

Modified: packages/sip4/trunk/debian/control
===================================================================
--- packages/sip4/trunk/debian/control	2012-12-09 21:17:57 UTC (rev 23145)
+++ packages/sip4/trunk/debian/control	2012-12-10 06:55:55 UTC (rev 23146)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme at debian.org>, Michael Casadevall <mcasadevall at debian.org>, Scott Kitterman <scott at kitterman.com>
 Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 7), python-all-dev (>= 2.6.7-3~), python-all-dbg, python3-all-dev (>= 3.2.2~rc1-1~), python3-all-dbg, flex
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://www.riverbankcomputing.co.uk/software/sip/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sip4/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sip4/trunk/

Modified: packages/sip4/trunk/debian/patches/siputils_debian_changes.diff
===================================================================
--- packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2012-12-09 21:17:57 UTC (rev 23145)
+++ packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2012-12-10 06:55:55 UTC (rev 23146)
@@ -1,10 +1,10 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 02_siputils.dpatch by Torsten Marek <shlomme at debian.org>
-Index: sip4-4.14/siputils.py
+Index: sip4-4.14.2/siputils.py
 ===================================================================
---- sip4-4.14.orig/siputils.py	2012-09-24 13:22:48.000000000 -0400
-+++ sip4-4.14/siputils.py	2012-10-01 02:04:16.898747945 -0400
-@@ -765,7 +765,8 @@
+--- sip4-4.14.2.orig/siputils.py	2012-12-07 13:09:49.000000000 -0500
++++ sip4-4.14.2/siputils.py	2012-12-09 14:04:18.141756553 -0500
+@@ -779,7 +779,8 @@
  
          libs.extend(self.optional_list("LIBS_WINDOWS"))
  
@@ -14,7 +14,7 @@
  
          # Save the transformed values.
          self.CFLAGS.set(cflags)
-@@ -900,6 +901,15 @@
+@@ -916,6 +917,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	2012-12-09 21:17:57 UTC (rev 23145)
+++ packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2012-12-10 06:55:55 UTC (rev 23146)
@@ -1,8 +1,8 @@
-Index: sip4-4.14/siputils.py
+Index: sip4-4.14.2/siputils.py
 ===================================================================
---- sip4-4.14.orig/siputils.py	2012-10-01 02:04:16.898747945 -0400
-+++ sip4-4.14/siputils.py	2012-10-01 02:04:33.690747445 -0400
-@@ -1620,9 +1620,12 @@
+--- sip4-4.14.2.orig/siputils.py	2012-12-09 14:04:18.141756553 -0500
++++ sip4-4.14.2/siputils.py	2012-12-09 14:04:56.605755415 -0500
+@@ -1636,9 +1636,12 @@
          mfile.write("\n$(OFILES): $(HFILES)\n")
  
          for mf in self._build["moc_headers"].split():

Modified: packages/sip4/trunk/debian/watch
===================================================================
--- packages/sip4/trunk/debian/watch	2012-12-09 21:17:57 UTC (rev 23145)
+++ packages/sip4/trunk/debian/watch	2012-12-10 06:55:55 UTC (rev 23146)
@@ -1,2 +1,3 @@
 version=3
-http://sf.net/pyqt/sip-(.*).tar.gz debian uupdate
+http://www.riverbankcomputing.co.uk/software/sip/download .*/sip-(\d+(?:\.\d+)*)\.(?:tgz|tbz2|tar\.(?:gz|bz2|xz))
+# Bart Martens <bartm at debian.org>  Fri, 23 Nov 2012 09:31:45 +0000