[Python-modules-commits] r29986 - in packages/qscintilla2/trunk/debian (5 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Mon Jul 28 18:30:49 UTC 2014 

    Date: Monday, July 28, 2014 @ 18:30:48
  Author: kitterman
Revision: 29986

  - Add debian/patches/build_debug_libs.patch to enable debug build in lib
    and designer plugin
  - Adjust configure to build python bindings with debug enabled

Added:
  packages/qscintilla2/trunk/debian/patches/build_debug_libs.patch
Modified:
  packages/qscintilla2/trunk/debian/changelog
  packages/qscintilla2/trunk/debian/control
  packages/qscintilla2/trunk/debian/patches/series
  packages/qscintilla2/trunk/debian/rules

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2014-07-28 17:30:40 UTC (rev 29985)
+++ packages/qscintilla2/trunk/debian/changelog	2014-07-28 18:30:48 UTC (rev 29986)
@@ -1,4 +1,4 @@
-qscintilla2 (2.8.3+dfsg-3) UNRELEASED; urgency=medium
+qscintilla2 (2.8.3+dfsg-3) unstable; urgency=medium
 
   * Add support for Qt designer plugin with Qt5
     - Add new binary, libqt5scintilla2-designer, in debian/control
@@ -12,6 +12,9 @@
       and python3-all-dbg to build-depends
     - Rework debian/rules based on how python-qt4 does it to actually build
       and install the dbg variants
+    - Add debian/patches/build_debug_libs.patch to enable debug build in lib
+      and designer plugin
+    - Adjust configure to build python bindings with debug enabled
   * Add dev packages (pyqt5.qsci-dev and pyqt4.qsci-dev) for sip files to make
     it possible to provide sip bindings to classes derived from Qscintilla
     classes (Closes: #755491)

Modified: packages/qscintilla2/trunk/debian/control
===================================================================
--- packages/qscintilla2/trunk/debian/control	2014-07-28 17:30:40 UTC (rev 29985)
+++ packages/qscintilla2/trunk/debian/control	2014-07-28 18:30:48 UTC (rev 29986)
@@ -51,8 +51,7 @@
 Section: debug
 Architecture: any
 Depends: libqscintilla2-11 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Description: Qt4 port of the Scintilla source code editing widget (debug)
  QScintilla is a text editor for Qt4 with features especially useful when
  writing and debugging source code. These include support for syntax
@@ -84,8 +83,7 @@
 Section: debug
 Architecture: any
 Depends: libqt5scintilla2-11 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Description: Qt5 port of the Scintilla source code editing widget (debug)
  QScintilla is a text editor for Qt5 with features especially useful when
  writing and debugging source code. These include support for syntax
@@ -139,8 +137,7 @@
 Section: debug
 Architecture: any
 Depends: libqscintilla2-designer (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Description: Qt4 Designer plugin for QScintilla 2 (debug)
  QScintilla is a text editor for Qt4 with features especially useful when
  writing and debugging source code. These include support for syntax
@@ -171,8 +168,7 @@
 Section: debug
 Architecture: any
 Depends: libqt5scintilla2-designer (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Description: Qt5 Designer plugin for QScintilla 2 (debug)
  QScintilla is a text editor for Qt5 with features especially useful when
  writing and debugging source code. These include support for syntax
@@ -259,8 +255,7 @@
          python-qscintilla2 (= ${binary:Version}),
          python-qt4-dbg,
          python-sip-dbg,
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Description: Python bindings for QScintilla 2 (debug extensions)
  QScintilla is a text editor for Qt4 with features especially useful when
  writing and debugging source code. These include support for syntax
@@ -292,9 +287,8 @@
          python3-pyqt4-dbg,
          python3-pyqt4.qsci (= ${binary:Version}),
          python3-sip-dbg,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Python 3 bindings for QScintilla 2 (debug extensions)
+         ${misc:Depends}
+Description: Python 3 bindings for QScintilla 2 (Qt 4 debug extensions)
  QScintilla is a text editor for Qt4 with features especially useful when
  writing and debugging source code. These include support for syntax
  styling, error indicators, code completion, call tips and margins.
@@ -334,9 +328,8 @@
          python3-pyqt5-dbg,
          python3-pyqt5.qsci (= ${binary:Version}),
          python3-sip-dbg,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Python 3 bindings for QScintilla 2 (debug extensions)
+         ${misc:Depends}
+Description: Python 3 bindings for QScintilla 2 (Qt 5 debug extensions)
  QScintilla is a text editor for Qt5 with features especially useful when
  writing and debugging source code. These include support for syntax
  styling, error indicators, code completion, call tips and margins.

Added: packages/qscintilla2/trunk/debian/patches/build_debug_libs.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/build_debug_libs.patch	                        (rev 0)
+++ packages/qscintilla2/trunk/debian/patches/build_debug_libs.patch	2014-07-28 18:30:48 UTC (rev 29986)
@@ -0,0 +1,27 @@
+Build libs and designer plugin with debug for -dbg packages
+Index: qscintilla2-2.8.3+dfsg/Qt4Qt5/qscintilla.pro
+===================================================================
+--- qscintilla2-2.8.3+dfsg.orig/Qt4Qt5/qscintilla.pro	2014-07-28 13:42:31.572950904 -0400
++++ qscintilla2-2.8.3+dfsg/Qt4Qt5/qscintilla.pro	2014-07-28 13:43:14.912949623 -0400
+@@ -29,7 +29,7 @@
+ 
+ TEMPLATE = lib
+ TARGET = qscintilla2
+-CONFIG += qt warn_off release thread exceptions
++CONFIG += qt warn_off release thread exceptions debug
+ INCLUDEPATH += . ../include ../lexlib ../src
+ 
+ DEFINES += QSCINTILLA_MAKE_DLL SCINTILLA_QT SCI_LEXER
+Index: qscintilla2-2.8.3+dfsg/designer-Qt4Qt5/designer.pro
+===================================================================
+--- qscintilla2-2.8.3+dfsg.orig/designer-Qt4Qt5/designer.pro	2014-07-28 13:42:31.580950904 -0400
++++ qscintilla2-2.8.3+dfsg/designer-Qt4Qt5/designer.pro	2014-07-28 13:44:19.848947705 -0400
+@@ -4,7 +4,7 @@
+ TEMPLATE = lib
+ TARGET = qscintillaplugin
+ 
+-CONFIG += release plugin qscintilla2
++CONFIG += release plugin qscintilla2 debug
+ 
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     QT += designer

Modified: packages/qscintilla2/trunk/debian/patches/series
===================================================================
--- packages/qscintilla2/trunk/debian/patches/series	2014-07-28 17:30:40 UTC (rev 29985)
+++ packages/qscintilla2/trunk/debian/patches/series	2014-07-28 18:30:48 UTC (rev 29986)
@@ -5,3 +5,4 @@
 qt5_includes.patch
 qt5_libname.patch
 qsci_link.patch
+build_debug_libs.patch

Modified: packages/qscintilla2/trunk/debian/rules
===================================================================
--- packages/qscintilla2/trunk/debian/rules	2014-07-28 17:30:40 UTC (rev 29985)
+++ packages/qscintilla2/trunk/debian/rules	2014-07-28 18:30:48 UTC (rev 29986)
@@ -81,7 +81,8 @@
 	cd Python/dbg-build-$* \
 		&& python$*-dbg ../configure.py -n ../../QSciQt4/ -o ../../QSciQt4 \
 		--sip-incdir=/usr/include/python$* -c --qsci-incdir=../../QSciQt4 \
-		--qsci-libdir=../../QSciQt4 --destdir=$(CUR_DIR)/usr/lib/python$*/dist-packages/PyQt4
+		--qsci-libdir=../../QSciQt4 --destdir=$(CUR_DIR)/usr/lib/python$*/dist-packages/PyQt4 \
+		--debug 
 ifeq ($(qt5), "yes")
 	case "$*" in 3*) \
 		mkdir -p Python/dbg-buildqt5-$* ; \
@@ -90,8 +91,9 @@
 		cd Python/dbg-buildqt5-$* \
 		  && QT_SELECT=qt5-$(DEB_HOST_MULTIARCH) python$*-dbg ../configure.py -n ../../QSciQt5/ -o ../../QSciQt5 \
 		  --sip-incdir=/usr/include/python$* -c --qsci-incdir=../../QSciQt5 --pyqt=PyQt5 \
-		   --qsci-libdir=../../QSciQt5 --qmake=/usr/bin/qmake \
-		  --destdir=$(CUR_DIR)/usr/lib/python$*/dist-packages/PyQt5; \
+		  --qsci-libdir=../../QSciQt5 --qmake=/usr/bin/qmake \
+		  --destdir=$(CUR_DIR)/usr/lib/python$*/dist-packages/PyQt5 \
+		  --debug ; \
 	esac
 endif
 	touch $@
@@ -202,16 +204,26 @@
 	dh_link
 ifeq (,$(findstring -i, $(DH_OPTIONS)))
 	set -e; \
-	for p in libqscintilla2-$(SONAME) libqt5scintilla2-$(SONAME) \
-	    libqscintilla2-designer libqt5scintilla2-designer \
-	    python-qscintilla2 python3-pyqt4.qsci python3-pyqt5.qsci \
+	for p in libqscintilla2-$(SONAME) libqscintilla2-designer \
+	    python-qscintilla2 python3-pyqt4.qsci \
 	    ; do \
 	    DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
 	    rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
 	    mkdir -p debian/$$p-dbg/usr/share/doc; \
 	    ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
 	done
+ifeq ($(qt5), "yes")
+	set -e; \
+	for p in libqt5scintilla2-$(SONAME) libqt5scintilla2-designer \
+	    python3-pyqt5.qsci \
+	    ; do \
+	    DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
+	    rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
+	    mkdir -p debian/$$p-dbg/usr/share/doc; \
+	    ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
+	done
 endif
+endif
 	dh_compress
 	dh_fixperms
 	dh_python2

More information about the Python-modules-commits mailing list