[Python-modules-commits] r29960 - in packages/qscintilla2/trunk/debian (changelog control rules)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Sun Jul 27 18:11:05 UTC 2014


    Date: Sunday, July 27, 2014 @ 18:11:03
  Author: kitterman
Revision: 29960

* Add -dbg packages (Closes: #618985)
  - Add -dbg packages to debian/control
  - Add python-qt4-dbg, python3-pyqt4-dbg, python3-pyqt5-dbg, python-all-dbg
    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
* Make Qt5 arch any since pyqt5 now builds on hurd

Modified:
  packages/qscintilla2/trunk/debian/changelog
  packages/qscintilla2/trunk/debian/control
  packages/qscintilla2/trunk/debian/rules

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2014-07-27 18:08:56 UTC (rev 29959)
+++ packages/qscintilla2/trunk/debian/changelog	2014-07-27 18:11:03 UTC (rev 29960)
@@ -6,10 +6,17 @@
     - Update debian/rules
     - Merge debian/patches/designer_link_fix.patch into debian/patches/
       qt5_libname.patch and update for Qt5 name for designer plugin
+  * Add -dbg packages (Closes: #618985)
+    - Add -dbg packages to debian/control
+    - Add python-qt4-dbg, python3-pyqt4-dbg, python3-pyqt5-dbg, python-all-dbg
+      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
+  * Make Qt5 arch any since pyqt5 now builds on hurd
   * Wrap and sort
   * Drop obsolete Breaks/Replaces
 
- -- Scott Kitterman <scott at kitterman.com>  Sat, 12 Jul 2014 20:41:23 -0400
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 27 Jul 2014 12:47:35 -0400
 
 qscintilla2 (2.8.3+dfsg-2) unstable; urgency=medium
 

Modified: packages/qscintilla2/trunk/debian/control
===================================================================
--- packages/qscintilla2/trunk/debian/control	2014-07-27 18:08:56 UTC (rev 29959)
+++ packages/qscintilla2/trunk/debian/control	2014-07-27 18:11:03 UTC (rev 29960)
@@ -6,17 +6,24 @@
            Scott Kitterman <scott at kitterman.com>
 Build-Depends: debhelper (>= 9),
                libqt4-dev (>= 4:4.8.0~),
-               pyqt5-dev [linux-any kfreebsd-any],
+               pyqt5-dev,
+               python-all-dbg,
                python-all-dev (>= 2.6.6-3~),
                python-qt4 (>= 4.8.3-3~),
+               python-qt4-dbg,
                python-qt4-dev (>= 4.8.3-3~),
+               python-sip-dbg,
                python-sip-dev (>= 4.10),
+               python3-all-dbg,
                python3-all-dev (>= 3.1.3-13~),
                python3-pyqt4,
-               python3-pyqt5 (>= 5.3+dfsg-2~) [linux-any kfreebsd-any],
+               python3-pyqt4-dbg,
+               python3-pyqt5 (>= 5.3+dfsg-2~),
+               python3-pyqt5-dbg,
+               python3-sip-dbg,
                python3-sip-dev,
-               qtbase5-dev [linux-any kfreebsd-any],
-               qttools5-dev [linux-any kfreebsd-any]
+               qtbase5-dev,
+               qttools5-dev
 Standards-Version: 3.9.5
 Section: libs
 X-Python3-Version: >= 3.1
@@ -39,8 +46,26 @@
  of proportional fonts, bold and italics, multiple foreground and background
  colours and multiple fonts.
 
+Package: libqscintilla2-11-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: libqscintilla2-11 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs: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
+ styling, error indicators, code completion, call tips and margins.
+ .
+ Styling choices are more open than with many editors, allowing the use
+ of proportional fonts, bold and italics, multiple foreground and background
+ colours and multiple fonts.
+ .
+ This package contains the debug extensions.
+
 Package: libqt5scintilla2-11
-Architecture: kfreebsd-any linux-any
+Architecture: any
 Depends: libqt5scintilla2-l10n (>= ${source:Upstream-Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -54,6 +79,24 @@
  of proportional fonts, bold and italics, multiple foreground and background
  colours and multiple fonts.
 
+Package: libqt5scintilla2-11-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: libqt5scintilla2-11 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs: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
+ styling, error indicators, code completion, call tips and margins.
+ .
+ Styling choices are more open than with many editors, allowing the use
+ of proportional fonts, bold and italics, multiple foreground and background
+ colours and multiple fonts.
+ .
+ This package contains the debug extensions.
+
 Package: libqscintilla2-l10n
 Architecture: all
 Depends: ${misc:Depends}
@@ -91,6 +134,25 @@
  This package contains a plugin to use the QScintilla 2 widget in the
  Qt4 UI Designer.
 
+Package: libqscintilla2-designer-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: libqscintilla2-designer (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs: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
+ styling, error indicators, code completion, call tips and margins.
+ .
+ Styling choices are more open than with many editors, allowing the use
+ of proportional fonts, bold and italics, multiple foreground and background
+ colours and multiple fonts.
+ .
+ This package contains the debug extensions for the QScintilla 2 widget in the
+ Qt4 UI Designer.
+
 Package: libqt5scintilla2-designer
 Section: misc
 Architecture: any
@@ -104,6 +166,25 @@
  This package contains a plugin to use the QScintilla 2 widget in the
  Qt5 UI Designer.
 
+Package: libqt5scintilla2-designer-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: libqt5scintilla2-designer (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs: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
+ styling, error indicators, code completion, call tips and margins.
+ .
+ Styling choices are more open than with many editors, allowing the use
+ of proportional fonts, bold and italics, multiple foreground and background
+ colours and multiple fonts.
+ .
+ This package contains the debug extensions for the QScintilla 2 widget in the
+ Qt5 UI Designer.
+
 Package: libqscintilla2-dev
 Section: libdevel
 Architecture: all
@@ -121,7 +202,7 @@
 
 Package: libqt5scintilla2-dev
 Section: libdevel
-Architecture: kfreebsd-any linux-any
+Architecture: any
 Depends: libqt5scintilla2-11 (<< ${source:Upstream-Version}+1~),
          libqt5scintilla2-11 (>= ${source:Upstream-Version}),
          qtbase5-dev,
@@ -162,6 +243,23 @@
  This package contains Python bindings so QScintilla 2 can be used in
  PyQt4 applications.
 
+Package: python-qscintilla2-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python-dbg,
+         python-qscintilla2 (= ${binary:Version}),
+         python-qt4-dbg,
+         python-sip-dbg,
+         ${misc:Depends},
+         ${shlibs: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
+ styling, error indicators, code completion, call tips and margins.
+ .
+ This package contains the extensions built for the Python debug interpreter.
+
 Package: python3-pyqt4.qsci
 Section: python
 Architecture: any
@@ -178,9 +276,27 @@
  This package contains Python 3 bindings so QScintilla 2 can be used in
  PyQt4 applications.
 
+Package: python3-pyqt4.qsci-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python3-dbg,
+         python3-pyqt4-dbg,
+         python3-pyqt4.qsci (= ${binary:Version}),
+         python3-sip-dbg,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Python 3 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
+ styling, error indicators, code completion, call tips and margins.
+ .
+ This package contains the extensions built for the Python 3 debug
+ interpreter.
+
 Package: python3-pyqt5.qsci
 Section: python
-Architecture: kfreebsd-any linux-any
+Architecture: any
 Depends: python3-pyqt5,
          ${misc:Depends},
          ${python3:Depends},
@@ -193,3 +309,21 @@
  .
  This package contains Python 3 bindings so QScintilla 2 can be used in
  PyQt5 applications.
+
+Package: python3-pyqt5.qsci-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python3-dbg,
+         python3-pyqt5-dbg,
+         python3-pyqt5.qsci (= ${binary:Version}),
+         python3-sip-dbg,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Python 3 bindings for QScintilla 2 (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.
+ .
+ This package contains the extensions built for the Python 3 debug
+ interpreter.

Modified: packages/qscintilla2/trunk/debian/rules
===================================================================
--- packages/qscintilla2/trunk/debian/rules	2014-07-27 18:08:56 UTC (rev 29959)
+++ packages/qscintilla2/trunk/debian/rules	2014-07-27 18:11:03 UTC (rev 29960)
@@ -52,7 +52,7 @@
 endif
 	touch $@
 
-configure: configure-stamp $(PYTHONS:%=Python/build-%/configure-stamp)
+configure: configure-stamp $(PYTHONS:%=Python/build-%/configure-stamp) $(PYTHONS:%=Python/dbg-build-%/configure-stamp)
 
 Python/build-%/configure-stamp:
 	dh_testdir
@@ -75,6 +75,28 @@
 endif
 	touch $@
 
+Python/dbg-build-%/configure-stamp:
+	dh_testdir
+	mkdir -p Python/dbg-build-$*
+	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
+ifeq ($(qt5), "yes")
+	case "$*" in 3*) \
+		mkdir -p Python/dbg-buildqt5-$* ; \
+	esac
+	case "$*" in 3*) \
+		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; \
+	esac
+endif
+	touch $@
+
+
 build-library-stamp: configure
 	dh_testdir
 	cd QSciQt4 && $(MAKE)
@@ -86,13 +108,19 @@
 	touch $@
 
 build: build-arch build-indep
-build-arch: build-library-stamp $(PYTHONS:%=Python/build-%/build-stamp)
+build-arch: build-library-stamp $(PYTHONS:%=Python/build-%/build-stamp) $(PYTHONS:%=Python/dbg-build-%/configure-stamp)
 
 Python/build-%/build-stamp: Python/build-%/configure-stamp build-library-stamp
 	dh_testdir
 	$(MAKE) -C Python/build-$*
 	touch $@
 
+Python/dbg-build-%/build-stamp: Python/dbg-build-%/configure-stamp
+	dh_testdir
+	$(MAKE) -C Python/build-$*
+	touch $@
+
+
 build-indep: build-stamp
 build-stamp:
 
@@ -102,7 +130,7 @@
 	-cd Qt4Qt5 && $(MAKE) distclean
 	-cd designer-Qt4Qt5 && $(MAKE) distclean
 
-	rm -rf Python/build*
+	rm -rf Python/*build*
 	rm -rf QSciQt4
 	rm -rf QSciQt5
 	rm -rf designer-Qt4
@@ -111,19 +139,28 @@
 
 	dh_clean 
 
-install-python-%: 
-	$(MAKE) -C Python/build-$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
+d3_qt4_dbg = debian/python3-pyqt4.qsci-dbg
+d3_qt5_dbg = debian/python3-pyqt5.qsci-dbg
+
+install-python-3%: 
+	$(MAKE) -C Python/build-3$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C Python/dbg-build-3$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/$(d3_qt4_dbg)
+
 ifeq ($(qt5), "yes")
-	$(MAKE) -C Python/buildqt5-$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C Python/buildqt5-3$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C Python/dbg-buildqt5-3$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
 endif
-	case "$*" in 3*) \
-	  ABITAG=`python$* -c "import sysconfig; print(sysconfig.get_config_var('SOABI'))"`; \
-          for f in `find debian/tmp/usr/lib/python3* -name '*.so' ! -name '*.cpython*.so'`; do \
-            mv $$f $${f%.so}.$$ABITAG.so; \
-          done; \
-	esac
+	ABITAG=`python$* -c "import sysconfig; print(sysconfig.get_config_var('SOABI'))"`; \
+	  for f in `find debian/tmp/usr/lib/python3* -name '*.so' ! -name '*.cpython*.so'`; do \
+	  mv $$f $${f%.so}.$$ABITAG.so; \
+	done; 
 
+d_qt4_dbg = debian/python-qscintilla2-dbg
 
+install-python-%: 
+	$(MAKE) -C Python/build-$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C Python/dbg-build-$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/$(d_qt4_dbg)
+
 install: build
 	dh_testdir
 	dh_testroot
@@ -163,7 +200,18 @@
 	dh_installdocs -A
 	dh_installexamples
 	dh_link
-	dh_strip
+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 \
+	    ; 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
 	dh_compress
 	dh_fixperms
 	dh_python2




More information about the Python-modules-commits mailing list