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

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Thu May 16 00:29:54 UTC 2013


    Date: Thursday, May 16, 2013 @ 00:29:52
  Author: kitterman
Revision: 24398

* Upload to unstable
* New upstream release
  - Refreshed patches
  - Update sip{3}-api provides for new minor SIP API version
  - Update Breaks for new transition
* Drop unused python/python3:Provides

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/rules

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2013-05-16 00:11:27 UTC (rev 24397)
+++ packages/sip4/trunk/debian/changelog	2013-05-16 00:29:52 UTC (rev 24398)
@@ -1,9 +1,19 @@
-sip4 (4.14.3-2) UNRELEASED; urgency=low
+sip4 (4.14.6-1) unstable; urgency=low
 
+  * Upload to unstable
+
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:03:59 +0200
+  [ Scott Kitterman ]
+  * New upstream release
+    - Refreshed patches
+    - Update sip{3}-api provides for new minor SIP API version
+    - Update Breaks for new transition
+  * Drop unused python/python3:Provides
 
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 07 May 2013 22:48:39 -0400
+
 sip4 (4.14.3-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/sip4/trunk/debian/control
===================================================================
--- packages/sip4/trunk/debian/control	2013-05-16 00:11:27 UTC (rev 24397)
+++ packages/sip4/trunk/debian/control	2013-05-16 00:29:52 UTC (rev 24398)
@@ -14,12 +14,12 @@
 Package: python-sip
 Architecture: any
 Section: python
-Provides: ${python:Provides}
+Provides: ${sip:Provides}
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Breaks: python-qscintilla (<< 2.4.3-3~),
-        python-qwt5-qt4 (<< 5.2.1~cvs20091107+dfsg-6~),
-        python-qwt3d-qt4 (<< 0.1.7~cvs20090625-7~),
-        python-qt4 (<<4.9~)
+Breaks: python-qscintilla (<< 2.6.2-2+),
+        python-qwt5-qt4 (<< 5.2.1~cvs20091107+dfsg-6+b3),
+        python-qwt3d-qt4 (<< 0.1.7~cvs20090625-9+),
+        python-qt4 (<<4.10~)
 Description: Python/C++ bindings generator runtime library
  SIP is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
@@ -29,7 +29,6 @@
 Priority: extra
 Architecture: any
 Section: debug
-Provides: ${python:Provides}
 Depends: python-sip (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
 Description: Python/C++ bindings generator runtime library (debug extension)
  SIP is a tool for generating bindings for C++ classes with some ideas
@@ -95,7 +94,7 @@
 Package: python3-sip
 Architecture: any
 Section: python
-Provides: ${python3:Provides}
+Provides: ${sip3:Provides}
 Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Description: Python 3/C++ bindings generator runtime library
  SIP is a tool for generating bindings for C++ classes with some ideas

Modified: packages/sip4/trunk/debian/patches/siputils_debian_changes.diff
===================================================================
--- packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2013-05-16 00:11:27 UTC (rev 24397)
+++ packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2013-05-16 00:29:52 UTC (rev 24398)
@@ -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.3/siputils.py
+Index: sip4-4.14.4/siputils.py
 ===================================================================
---- sip4-4.14.3.orig/siputils.py	2013-01-11 12:09:13.000000000 -0500
-+++ sip4-4.14.3/siputils.py	2013-02-13 00:46:54.345833434 -0500
-@@ -784,7 +784,8 @@
+--- 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 @@
  
          libs.extend(self.optional_list("LIBS_WINDOWS"))
  
@@ -14,7 +14,7 @@
  
          # Save the transformed values.
          self.CFLAGS.set(cflags)
-@@ -926,6 +927,15 @@
+@@ -959,6 +960,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	2013-05-16 00:11:27 UTC (rev 24397)
+++ packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2013-05-16 00:29:52 UTC (rev 24398)
@@ -1,8 +1,8 @@
-Index: sip4-4.14.3/siputils.py
+Index: sip4-4.14.4/siputils.py
 ===================================================================
---- sip4-4.14.3.orig/siputils.py	2013-02-13 00:46:54.345833434 -0500
-+++ sip4-4.14.3/siputils.py	2013-02-13 00:47:24.253832550 -0500
-@@ -1652,9 +1652,12 @@
+--- sip4-4.14.4.orig/siputils.py	2013-03-06 09:50:41.563819869 -0500
++++ sip4-4.14.4/siputils.py	2013-03-06 09:50:46.671820067 -0500
+@@ -1685,9 +1685,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	2013-05-16 00:11:27 UTC (rev 24397)
+++ packages/sip4/trunk/debian/rules	2013-05-16 00:29:52 UTC (rev 24398)
@@ -2,8 +2,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PY2_PROVIDES=sip-api-9.0, sip-api-9.1
-PY3_PROVIDES=sip-py3api-9.0, sip-py3api-9.1
+PY2_PROVIDES=sip-api-9.0, sip-api-9.1, sip-api-9.2
+PY3_PROVIDES=sip-py3api-9.0, sip-py3api-9.1, sip-py3api-9.2
 # `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]")
 
@@ -96,8 +96,8 @@
 	dh_testdir
 	dh_testroot	
 	dh_prep -a
-	echo "python:Provides=$(PY2_PROVIDES)" >> debian/python-sip.substvars
-	echo "python3:Provides=$(PY3_PROVIDES)" >> debian/python3-sip.substvars
+	echo "sip:Provides=$(PY2_PROVIDES)" >> debian/python-sip.substvars
+	echo "sip3:Provides=$(PY3_PROVIDES)" >> debian/python3-sip.substvars
 	echo "$(PYDIST)" > debian/python3-sip.pydist
 	dh_installdirs -a
 	# This is needed to enforce that the install-arch-% rules are




More information about the Python-modules-commits mailing list