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

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Sat Jul 30 00:00:25 UTC 2011 

    Date: Saturday, July 30, 2011 @ 00:00:23
  Author: kitterman
Revision: 17936

sip4 (4.12.3-1) unstable; urgency=low

  * Team upload

  [ Scott Kitterman ]
  * New upstream release (No API version change)
    - Refresh and adapt patches
  * Switch to dh_python2
    - Update debian/rules
    - Drop python-support build-depends
  * Bump standards version to 3.9.2 without further change
  * Remove Bernd Zeimetz from Uploaders at his request
    - Thanks to bzed for all his work on the pacakge

 -- Scott Kitterman <scott at kitterman.com>  Fri, 29 Jul 2011 19:24:24 -0400

Modified:
  packages/sip4/trunk/debian/changelog
  packages/sip4/trunk/debian/control
  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

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2011-07-29 21:16:38 UTC (rev 17935)
+++ packages/sip4/trunk/debian/changelog	2011-07-30 00:00:23 UTC (rev 17936)
@@ -1,3 +1,19 @@
+sip4 (4.12.3-1) unstable; urgency=low
+
+  * Team upload
+
+  [ Scott Kitterman ]
+  * New upstream release (No API version change)
+    - Refresh and adapt patches
+  * Switch to dh_python2
+    - Update debian/rules
+    - Drop python-support build-depends
+  * Bump standards version to 3.9.2 without further change
+  * Remove Bernd Zeimetz from Uploaders at his request
+    - Thanks to bzed for all his work on the pacakge
+
+ -- Scott Kitterman <scott at kitterman.com>  Fri, 29 Jul 2011 19:24:24 -0400
+
 sip4 (4.12.1-1) unstable; urgency=low
 
   * Team upload.

Modified: packages/sip4/trunk/debian/control
===================================================================
--- packages/sip4/trunk/debian/control	2011-07-29 21:16:38 UTC (rev 17935)
+++ packages/sip4/trunk/debian/control	2011-07-30 00:00:23 UTC (rev 17936)
@@ -2,13 +2,13 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Torsten Marek <shlomme at debian.org>, Bernd Zeimetz <bzed at debian.org>, Michael Casadevall <mcasadevall at debian.org>
-Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1), python3-all-dev, python3-all-dbg
-Standards-Version: 3.9.1
+Uploaders: Torsten Marek <shlomme at debian.org>, Michael Casadevall <mcasadevall at debian.org>
+Build-Depends: debhelper (>= 7), python-all-dev (>=  2.6.6-3~), python-all-dbg, python3-all-dev, python3-all-dbg
+Standards-Version: 3.9.2
 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/
-XS-Python-Version: >= 2.4
+X-Python-Version: >= 2.4
 X-Python3-Version: >= 3.0
 
 Package: python-sip
@@ -16,6 +16,10 @@
 Section: python
 Provides: ${python: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.8.3-3~)
 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

Modified: packages/sip4/trunk/debian/patches/configure.py.patch
===================================================================
--- packages/sip4/trunk/debian/patches/configure.py.patch	2011-07-29 21:16:38 UTC (rev 17935)
+++ packages/sip4/trunk/debian/patches/configure.py.patch	2011-07-30 00:00:23 UTC (rev 17936)
@@ -1,14 +1,19 @@
-Index: sip-4.12/configure.py
+Index: sip4-4.12.3/configure.py
 ===================================================================
---- sip-4.12.orig/configure.py	2011-01-06 12:06:05.357805001 +0100
-+++ sip-4.12/configure.py	2011-01-06 14:20:02.747805001 +0100
-@@ -219,9 +219,11 @@
+--- 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 @@
          ("siplib", "siplib.c"),
          ("siplib", "siplib.sbf")
      )
 +    if not os.path.exists(patched[0][0]):
 +        os.mkdir(patched[0][0])
  
+     # The siplib directory may not exist if we are building away from the
+     # source directory.
+@@ -231,7 +233,7 @@
+         pass
+ 
      for f in patched:
 -        dst_fn = os.path.join(*f)
 +        dst_fn = os.path.join(src_dir, *f)

Modified: packages/sip4/trunk/debian/patches/siputils_debian_changes.diff
===================================================================
--- packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2011-07-29 21:16:38 UTC (rev 17935)
+++ packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2011-07-30 00:00:23 UTC (rev 17936)
@@ -1,10 +1,10 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 02_siputils.dpatch by Torsten Marek <shlomme at debian.org>
-Index: sip-4.12/siputils.py
+Index: sip4-4.12.3/siputils.py
 ===================================================================
---- sip-4.12.orig/siputils.py	2011-01-05 18:12:04.968846002 +0100
-+++ sip-4.12/siputils.py	2011-01-05 18:13:46.838846002 +0100
-@@ -722,7 +722,8 @@
+--- sip4-4.12.3.orig/siputils.py	2011-07-29 19:38:24.075640135 -0400
++++ sip4-4.12.3/siputils.py	2011-07-29 19:39:03.111640114 -0400
+@@ -729,7 +729,8 @@
  
          libs.extend(self.optional_list("LIBS_WINDOWS"))
  
@@ -14,7 +14,7 @@
  
          # Save the transformed values.
          self.CFLAGS.set(cflags)
-@@ -849,9 +850,19 @@
+@@ -856,9 +857,19 @@
          """Return a list of additional libraries (in platform specific form)
          that must be linked with a library.
  

Modified: packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff
===================================================================
--- packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2011-07-29 21:16:38 UTC (rev 17935)
+++ packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2011-07-30 00:00:23 UTC (rev 17936)
@@ -1,8 +1,8 @@
-Index: sip-4.12/siputils.py
+Index: sip4-4.12.3/siputils.py
 ===================================================================
---- sip-4.12.orig/siputils.py	2011-01-05 18:11:27.168846002 +0100
-+++ sip-4.12/siputils.py	2011-01-05 18:11:51.218846002 +0100
-@@ -1555,9 +1555,12 @@
+--- sip4-4.12.3.orig/siputils.py	2011-07-29 19:39:03.111640114 -0400
++++ sip4-4.12.3/siputils.py	2011-07-29 19:39:19.235640107 -0400
+@@ -1567,9 +1567,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	2011-07-29 21:16:38 UTC (rev 17935)
+++ packages/sip4/trunk/debian/rules	2011-07-30 00:00:23 UTC (rev 17936)
@@ -151,7 +151,16 @@
 endif
 	dh_compress -X.inv
 	dh_fixperms
-	dh_pysupport
+	# Gross hack, please avert eyes - Waiting for --no-dbg-cleaning option
+	mv debian/python-sip-dbg/usr/lib/python2.6/dist-packages/sipconfig_d.py \
+	  debian/python-sip/usr/lib/python2.6/dist-packages
+	mv debian/python-sip-dbg/usr/lib/python2.7/dist-packages/sipconfig_d.py \
+	  debian/python-sip/usr/lib/python2.7/dist-packages
+	dh_python2
+	mv debian/python-sip/usr/lib/python2.6/dist-packages/sipconfig_d.py \
+	  debian/python-sip-dbg/usr/lib/python2.6/dist-packages
+	mv debian/python-sip/usr/lib/python2.7/dist-packages/sipconfig_d.py \
+	  debian/python-sip-dbg/usr/lib/python2.7/dist-packages
 	dh_python3
 	dh_installdeb
 	dh_shlibdeps

More information about the Python-modules-commits mailing list