[Python-modules-commits] r22725 - in packages/sip4/trunk/debian (6 files)

[kitterman at users.alioth.debian.org]

    Date: Monday, October 1, 2012 @ 06:19:22
  Author: kitterman
Revision: 22725

* New upstream release
  - Update sip-api and sip-py3api for New Sip API version
* Fix debian/watch to work with the current download location

Modified:
  packages/sip4/trunk/debian/changelog
  packages/sip4/trunk/debian/patches/configure.py.patch
  packages/sip4/trunk/debian/patches/siputils_debian_changes.diff
  packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff
  packages/sip4/trunk/debian/rules
  packages/sip4/trunk/debian/watch

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2012-09-30 11:29:32 UTC (rev 22724)
+++ packages/sip4/trunk/debian/changelog	2012-10-01 06:19:22 UTC (rev 22725)
@@ -1,3 +1,11 @@
+sip4 (4.14-1) experimental; urgency=low
+
+  * New upstream release
+    - Update sip-api and sip-py3api for New Sip API version
+  * Fix debian/watch to work with the current download location
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 01 Oct 2012 01:57:53 -0400
+
 sip4 (4.13.3-2) unstable; urgency=low
 
   * Install sip.h for python3-sip-dev in the correct directories

Modified: packages/sip4/trunk/debian/patches/configure.py.patch
===================================================================
--- packages/sip4/trunk/debian/patches/configure.py.patch	2012-09-30 11:29:32 UTC (rev 22724)
+++ packages/sip4/trunk/debian/patches/configure.py.patch	2012-10-01 06:19:22 UTC (rev 22725)
@@ -1,8 +1,8 @@
-Index: sip4-4.12.3/configure.py
+Index: sip4-4.14/configure.py
 ===================================================================
---- sip4-4.12.3.orig/configure.py	2011-07-29 19:45:02.000000000 -0400
-+++ sip4-4.12.3/configure.py	2011-07-29 19:45:49.347639908 -0400
-@@ -222,6 +222,8 @@
+--- sip4-4.14.orig/configure.py	2012-09-29 07:26:55.000000000 -0400
++++ sip4-4.14/configure.py	2012-10-01 02:04:38.522747304 -0400
+@@ -224,6 +224,8 @@
          ("siplib", "siplib.c"),
          ("siplib", "siplib.sbf")
      )
@@ -11,7 +11,7 @@
  
      # The siplib directory may not exist if we are building away from the
      # source directory.
-@@ -231,7 +233,7 @@
+@@ -233,7 +235,7 @@
          pass
  
      for f in patched:

Modified: packages/sip4/trunk/debian/patches/siputils_debian_changes.diff
===================================================================
--- packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2012-09-30 11:29:32 UTC (rev 22724)
+++ packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2012-10-01 06:19:22 UTC (rev 22725)
@@ -1,10 +1,10 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 02_siputils.dpatch by Torsten Marek <shlomme at debian.org>
-Index: sip4-4.13.3/siputils.py
+Index: sip4-4.14/siputils.py
 ===================================================================
---- sip4-4.13.3.orig/siputils.py	2012-04-11 14:53:48.000000000 -0400
-+++ sip4-4.13.3/siputils.py	2012-06-21 11:18:06.533099607 -0400
-@@ -762,7 +762,8 @@
+--- 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 @@
  
          libs.extend(self.optional_list("LIBS_WINDOWS"))
  
@@ -14,7 +14,7 @@
  
          # Save the transformed values.
          self.CFLAGS.set(cflags)
-@@ -897,6 +898,15 @@
+@@ -900,6 +901,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-09-30 11:29:32 UTC (rev 22724)
+++ packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2012-10-01 06:19:22 UTC (rev 22725)
@@ -1,8 +1,8 @@
-Index: sip4-4.13.3/siputils.py
+Index: sip4-4.14/siputils.py
 ===================================================================
---- sip4-4.13.3.orig/siputils.py	2012-06-21 11:18:06.533099607 -0400
-+++ sip4-4.13.3/siputils.py	2012-06-21 11:21:56.865092801 -0400
-@@ -1617,9 +1617,12 @@
+--- 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 @@
          mfile.write("\n$(OFILES): $(HFILES)\n")
  
          for mf in self._build["moc_headers"].split():

Modified: packages/sip4/trunk/debian/rules
===================================================================
--- packages/sip4/trunk/debian/rules	2012-09-30 11:29:32 UTC (rev 22724)
+++ packages/sip4/trunk/debian/rules	2012-10-01 06:19:22 UTC (rev 22725)
@@ -2,8 +2,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PY2_PROVIDES=sip-api-8.0, sip-api-8.1
-PY3_PROVIDES=sip-py3api-8.0, sip-py3api-8.1
+PY2_PROVIDES=sip-api-9.0
+PY3_PROVIDES=sip-py3api-9.0
 # `dh_python3 --depends sip3` should generate dependency on newest API only
 PYDIST=sip $(shell python -c "a=[i.strip() for i in '$(PY3_PROVIDES)'.split(',')]; print sorted(a, reverse=True)[0]")
 

Modified: packages/sip4/trunk/debian/watch
===================================================================
--- packages/sip4/trunk/debian/watch	2012-09-30 11:29:32 UTC (rev 22724)
+++ packages/sip4/trunk/debian/watch	2012-10-01 06:19:22 UTC (rev 22725)
@@ -1,3 +1,2 @@
 version=3
-http://www.riverbankcomputing.co.uk/software/sip/download \
-      /static/Downloads/sip4/sip-([\d\.]*)\.tar\.gz debian uupdate
+http://sf.net/pyqt/sip-(.*).tar.gz debian uupdate