[Python-modules-commits] r11460 - in packages/pyside/trunk/debian (5 files)

odyx-guest at users.alioth.debian.org odyx-guest at users.alioth.debian.org
Sat Jan 30 16:09:47 UTC 2010 

    Date: Saturday, January 30, 2010 @ 16:09:45
  Author: odyx-guest
Revision: 11460

Last bunch of updates before upload I hope.

Added:
  packages/pyside/trunk/debian/patches/spelling_error_in_binary.patch
Modified:
  packages/pyside/trunk/debian/changelog
  packages/pyside/trunk/debian/control
  packages/pyside/trunk/debian/patches/series
  packages/pyside/trunk/debian/rules

Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog	2010-01-30 15:59:10 UTC (rev 11459)
+++ packages/pyside/trunk/debian/changelog	2010-01-30 16:09:45 UTC (rev 11460)
@@ -20,10 +20,13 @@
     - multiple_python_versions.patch: Add
     - use_cmake_no_config.patch     : Add
     - debug_build_add_postfix.patch : Add
+    - spelling_error_in_binary.patch: Add
   * debian/watch: Add.
   * Bump Standards to 3.8.3 - No changes needed.
   * Use 3.0 (quilt) source format.
 
+  * -dbg build is disabled for now.
+
  -- Didier Raboud <didier at raboud.com>  Wed, 26 Aug 2009 11:38:40 +0200
 
 pyside (0.1.4.5-0ubuntu2) jaunty; urgency=low

Modified: packages/pyside/trunk/debian/control
===================================================================
--- packages/pyside/trunk/debian/control	2010-01-30 15:59:10 UTC (rev 11459)
+++ packages/pyside/trunk/debian/control	2010-01-30 16:09:45 UTC (rev 11460)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Didier Raboud <didier at raboud.com>
-Build-Depends: debhelper (>= 7.0.50), cmake (>= 2.6.0), python-all-dev (>= 2.3.5-11), python-all-dbg (>= 2.3.5-11), libqt4-dev (>= 4.5.0), libphonon-dev (>= 4.5.0), libqt4-opengl-dev (>= 4.5.0), boostpythongenerator (>= 0.3.3), python-support (>= 0.3.9), libboost-python-dev (>= 1.40)
+Build-Depends: debhelper (>= 7.0.50), cmake (>= 2.6.0), python-all-dev (>= 2.3.5-11), python-all-dbg (>= 2.3.5-11), libqt4-dev , libphonon-dev , libqt4-opengl-dev , boostpythongenerator (>= 0.3.3), python-support (>= 0.3.9), libboost-python-dev (>= 1.40)
 Standards-Version: 3.8.3
 XS-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyside/trunk/
@@ -28,29 +28,29 @@
 Description: Python bindings for Qt4 (big metapackage)
  Python bindings for Qt4 framework. This is a metapackage for all modules.
 
-Package: python-pyside-dbg
-Architecture: any
-Priority: extra
-Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends},
-	 python-pyside.phonon (>= ${binary:Version}) |
-	 python-pyside.qtcore (>= ${binary:Version}) |
-	 python-pyside.qtgui (>= ${binary:Version}) |
-	 python-pyside.qthelp (>= ${binary:Version}) |
-	 python-pyside.qtnetwork (>= ${binary:Version}) |
-	 python-pyside.qtopengl (>= ${binary:Version}) |
-	 python-pyside.qtscript (>= ${binary:Version}) |
-	 python-pyside.qtsql (>= ${binary:Version}) |
-	 python-pyside.qtsvg (>= ${binary:Version}) |
-	 python-pyside.qtuitools (>= ${binary:Version}) |
-	 python-pyside.qtwebkit (>= ${binary:Version}) |
-	 python-pyside.qtxml (>= ${binary:Version}) |
-	 libpysidebase0 (>= ${binary:Version})
-Description: Python bindings for Qt 4 (debug symbols)
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the debugging symbols.
+# Package: python-pyside-dbg
+# Architecture: any
+# Priority: extra
+# Section: debug
+# Depends: ${shlibs:Depends}, ${misc:Depends},
+# 	 python-pyside.phonon (>= ${binary:Version}) |
+# 	 python-pyside.qtcore (>= ${binary:Version}) |
+# 	 python-pyside.qtgui (>= ${binary:Version}) |
+# 	 python-pyside.qthelp (>= ${binary:Version}) |
+# 	 python-pyside.qtnetwork (>= ${binary:Version}) |
+# 	 python-pyside.qtopengl (>= ${binary:Version}) |
+# 	 python-pyside.qtscript (>= ${binary:Version}) |
+# 	 python-pyside.qtsql (>= ${binary:Version}) |
+# 	 python-pyside.qtsvg (>= ${binary:Version}) |
+# 	 python-pyside.qtuitools (>= ${binary:Version}) |
+# 	 python-pyside.qtwebkit (>= ${binary:Version}) |
+# 	 python-pyside.qtxml (>= ${binary:Version}) |
+# 	 libpysidebase0 (>= ${binary:Version})
+# Description: Python bindings for Qt 4 (debug symbols)
+#  Qt is a cross-platform C++ application framework. Qt's primary feature
+#  is its rich set of widgets that provide standard GUI functionality.
+#  .
+#  This package contains the debugging symbols.
 
 Package: libpysidebase0
 Architecture: any

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2010-01-30 15:59:10 UTC (rev 11459)
+++ packages/pyside/trunk/debian/patches/series	2010-01-30 16:09:45 UTC (rev 11460)
@@ -1,3 +1,4 @@
 multiple_python_versions.patch
 use_cmake_no_config.patch
 debug_build_add_postfix.patch
+spelling_error_in_binary.patch

Added: packages/pyside/trunk/debian/patches/spelling_error_in_binary.patch
===================================================================
--- packages/pyside/trunk/debian/patches/spelling_error_in_binary.patch	                        (rev 0)
+++ packages/pyside/trunk/debian/patches/spelling_error_in_binary.patch	2010-01-30 16:09:45 UTC (rev 11460)
@@ -0,0 +1,18 @@
+Description: Fix spelling-error-in-binary of a_d_dress
+Author: Didier Raboud <didier at raboud.com>
+Forwarded: yes (IRC)
+Origin: vendor
+Last-Update: 2010-01-30
+Index: pyside-qt4.6+0.2.3/base/type_details.hpp
+===================================================================
+--- pyside-qt4.6+0.2.3.orig/base/type_details.hpp	2010-01-30 16:49:47.000000000 +0100
++++ pyside-qt4.6+0.2.3/base/type_details.hpp	2010-01-30 16:50:09.000000000 +0100
+@@ -136,7 +136,7 @@
+         boost::python::object py_obj(PySide::ptr(obj));
+         if (!py_obj.ptr())
+         {
+-            fprintf(stderr, "Fail to create python object from object in adress: %p\n", obj);
++            fprintf(stderr, "Fail to create python object from object in address: %p\n", obj);
+             py_obj = boost::python::object();
+         }
+         else

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2010-01-30 15:59:10 UTC (rev 11459)
+++ packages/pyside/trunk/debian/rules	2010-01-30 16:09:45 UTC (rev 11460)
@@ -4,10 +4,14 @@
 
 # default is first version
 PYVERSIONS=$(shell pyversions -v -r)
-ALLPY=$(PYVERSIONS:%=%-dbg) $(PYVERSIONS)
+# -dbg commented out
+# ALLPY=$(PYVERSIONS:%=%-dbg) $(PYVERSIONS)
+ALLPY=$(PYVERSIONS)
 
+# Don't do that yet (-dbg disabled)
 # Separate configuration for debug compilations and normal ones
-override_dh_auto_configure: $(PYVERSIONS:%=override_dh_auto_configure-%) $(PYVERSIONS:%=override_dh_auto_configure_dbg-%-dbg)
+# override_dh_auto_configure: $(PYVERSIONS:%=override_dh_auto_configure-%) $(PYVERSIONS:%=override_dh_auto_configure_dbg-%-dbg)
+override_dh_auto_configure: $(PYVERSIONS:%=override_dh_auto_configure-%)
 
 # Normal configuration
 override_dh_auto_configure-%:
@@ -17,11 +21,11 @@
 	dh_auto_configure --builddirectory=build-$* -- -DBUILD_PYTHON=/usr/bin/python$* -DCMAKE_SKIP_RPATH=true -DCMAKE_BUILDTYPE:STRING="Release"
 
 # Debug configuration
-override_dh_auto_configure_dbg-%:
-	mkdir -p build-$*
-	# Disable the RPATH propagation for the libraries
-	# Use the BUILD_PYTHON variable from patch multiple_python_versions.patch
-	dh_auto_configure --builddirectory=build-$* -- -DBUILD_PYTHON=/usr/bin/python$* -DCMAKE_SKIP_RPATH=true -DCMAKE_DEBUG_POSTFIX:STRING="_d" -DCMAKE_BUILD_TYPE:STRING="Debug"
+# override_dh_auto_configure_dbg-%:
+# 	mkdir -p build-$*
+# 	# Disable the RPATH propagation for the libraries
+# 	# Use the BUILD_PYTHON variable from patch multiple_python_versions.patch
+# 	dh_auto_configure --builddirectory=build-$* -- -DBUILD_PYTHON=/usr/bin/python$* -DCMAKE_SKIP_RPATH=true -DCMAKE_DEBUG_POSTFIX:STRING="_d" -DCMAKE_BUILD_TYPE:STRING="Debug"
 
 
 override_dh_auto_build: $(ALLPY:%=override_dh_auto_build-%)
@@ -35,9 +39,10 @@
 override_dh_auto_install-%:
 	dh_auto_install --builddirectory=build-$*
 
-# Move debug libraries to our -dbg lib, don't strip the debug build
-override_dh_strip:
-	dh_strip --dbg-package=python-pyside-dbg --exclude=_d.so
+# -dbg disabled
+# # Move debug libraries to our -dbg lib, don't strip the debug build
+# override_dh_strip:
+# 	dh_strip --dbg-package=python-pyside-dbg --exclude=_d.so
 
 override_dh_auto_clean:
 	rm -rf build-*

More information about the Python-modules-commits mailing list