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

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Wed Aug 24 18:02:00 UTC 2011 

    Date: Wednesday, August 24, 2011 @ 18:01:58
  Author: kitterman
Revision: 18318

sip4 (4.12.4-1) unstable; urgency=low

  * Team upload
  * New upstream release
  * Remove obsolete debian/source/lintian-overrides
  * Fix typo in last changelog entry
  * Replace hack in debian/rules with --no-dbg-cleaning and bump minimun
    python version to 2.6.7-3~

 -- Scott Kitterman <scott at kitterman.com>  Wed, 24 Aug 2011 10:22:09 -0400

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	2011-08-24 13:42:43 UTC (rev 18317)
+++ packages/sip4/trunk/debian/changelog	2011-08-24 18:01:58 UTC (rev 18318)
@@ -1,3 +1,14 @@
+sip4 (4.12.4-1) unstable; urgency=low
+
+  * Team upload
+  * New upstream release
+  * Remove obsolete debian/source/lintian-overrides
+  * Fix typo in last changelog entry
+  * Replace hack in debian/rules with --no-dbg-cleaning and bump minimun
+    python version to 2.6.7-3~
+
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 24 Aug 2011 10:22:09 -0400
+
 sip4 (4.12.3-1) unstable; urgency=low
 
   * Team upload
@@ -10,7 +21,7 @@
     - 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
+    - Thanks to bzed for all his work on the package
 
  -- Scott Kitterman <scott at kitterman.com>  Fri, 29 Jul 2011 19:24:24 -0400
 

Modified: packages/sip4/trunk/debian/control
===================================================================
--- packages/sip4/trunk/debian/control	2011-08-24 13:42:43 UTC (rev 18317)
+++ packages/sip4/trunk/debian/control	2011-08-24 18:01:58 UTC (rev 18318)
@@ -3,7 +3,7 @@
 Priority: optional
 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>
-Build-Depends: debhelper (>= 7), python-all-dev (>=  2.6.6-3~), python-all-dbg, python3-all-dev, python3-all-dbg
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.6.7-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

Modified: packages/sip4/trunk/debian/patches/siputils_debian_changes.diff
===================================================================
--- packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2011-08-24 13:42:43 UTC (rev 18317)
+++ packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2011-08-24 18:01:58 UTC (rev 18318)
@@ -1,10 +1,10 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 02_siputils.dpatch by Torsten Marek <shlomme at debian.org>
-Index: sip4-4.12.3/siputils.py
+Index: sip4-4.12.4/siputils.py
 ===================================================================
---- 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 @@
+--- sip4-4.12.4.orig/siputils.py	2011-07-29 14:22:29.000000000 -0400
++++ sip4-4.12.4/siputils.py	2011-08-19 09:47:39.357989179 -0400
+@@ -737,7 +737,8 @@
  
          libs.extend(self.optional_list("LIBS_WINDOWS"))
  
@@ -14,11 +14,7 @@
  
          # Save the transformed values.
          self.CFLAGS.set(cflags)
-@@ -856,9 +857,19 @@
-         """Return a list of additional libraries (in platform specific form)
-         that must be linked with a library.
- 
-+
+@@ -869,6 +870,15 @@
          clib is the library name in cannonical form.
          framework is set of the library is implemented as a MacOS framework.
          """
@@ -30,7 +26,7 @@
 +        ##################################################################
 +
 +        return []
-+        
-         prl_libs = []
- 
++
          if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
+             prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
+         elif sys.platform == "darwin" and framework:

Modified: packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff
===================================================================
--- packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2011-08-24 13:42:43 UTC (rev 18317)
+++ packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2011-08-24 18:01:58 UTC (rev 18318)
@@ -1,8 +1,8 @@
-Index: sip4-4.12.3/siputils.py
+Index: sip4-4.12.4/siputils.py
 ===================================================================
---- 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 @@
+--- sip4-4.12.4.orig/siputils.py	2011-08-11 16:16:42.116674115 -0400
++++ sip4-4.12.4/siputils.py	2011-08-11 16:16:47.892674112 -0400
+@@ -1583,9 +1583,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-08-24 13:42:43 UTC (rev 18317)
+++ packages/sip4/trunk/debian/rules	2011-08-24 18:01:58 UTC (rev 18318)
@@ -151,16 +151,7 @@
 endif
 	dh_compress -X.inv
 	dh_fixperms
-	# 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_python2 --no-dbg-cleaning
 	dh_python3
 	dh_installdeb
 	dh_shlibdeps

More information about the Python-modules-commits mailing list