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

[kitterman at users.alioth.debian.org]

    Date: Wednesday, March 14, 2012 @ 04:10:55
  Author: kitterman
Revision: 20780

* Package for Python 3 (LP: #608962)
* Use Python policy compliant binary name for Python 3 (python3-pyqt4.qsci)
* Remove pointless Build-depends and Depends versioning
* Fix debian/rules to build for all python3 variants, not just the default
* Use dh_sip3 for python3-pyqt4.qsci, not dh_sip
* Drop incorrect Multi-Arch: same for libqscintilla2-8

Added:
  packages/qscintilla2/trunk/debian/python3-pyqt4.qsci.install
Modified:
  packages/qscintilla2/trunk/debian/changelog
  packages/qscintilla2/trunk/debian/control
  packages/qscintilla2/trunk/debian/python-qscintilla2.install
  packages/qscintilla2/trunk/debian/rules

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2012-03-14 01:45:34 UTC (rev 20779)
+++ packages/qscintilla2/trunk/debian/changelog	2012-03-14 04:10:55 UTC (rev 20780)
@@ -1,3 +1,17 @@
+qscintilla2 (2.6.1-4) experimental; urgency=low
+
+  [ Thomas Kluyver ]
+  * Package for Python 3 (LP: #608962)
+
+  [ Scott Kitterman ]
+  * Use Python policy compliant binary name for Python 3 (python3-pyqt4.qsci)
+  * Remove pointless Build-depends and Depends versioning
+  * Fix debian/rules to build for all python3 variants, not just the default
+  * Use dh_sip3 for python3-pyqt4.qsci, not dh_sip
+  * Drop incorrect Multi-Arch: same for libqscintilla2-8
+
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 13 Mar 2012 22:19:28 -0400
+
 qscintilla2 (2.6.1-3) experimental; urgency=low
 
   * Re-upload due to broken -2 attempt

Modified: packages/qscintilla2/trunk/debian/control
===================================================================
--- packages/qscintilla2/trunk/debian/control	2012-03-14 01:45:34 UTC (rev 20779)
+++ packages/qscintilla2/trunk/debian/control	2012-03-14 04:10:55 UTC (rev 20780)
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme at debian.org>, Gudjon I. Gudjonsson <gudjon at gudjon.org>, Scott Kitterman <scott at kitterman.com>
-Build-Depends: debhelper (>= 8.1.3~), libqt4-dev (>= 4:4.8.0~), python-all-dev (>= 2.6.6-3~), python-sip-dev (>= 4.10), python-qt4 (>= 4.8.3-3~), python-qt4-dev (>= 4.8.3-3~)
+Build-Depends: debhelper (>= 8.1.3~), libqt4-dev (>= 4:4.8.0~), python-all-dev (>= 2.6.6-3~), python-sip-dev (>= 4.10), python-qt4 (>= 4.8.3-3~), python-qt4-dev (>= 4.8.3-3~), python3-all-dev (>= 3.1.3-13~), python3-sip-dev, python3-pyqt4
 Standards-Version: 3.9.3
 Section: libs
 Homepage: http://www.riverbankcomputing.co.uk/software/qscintilla
@@ -15,7 +15,6 @@
 Pre-Depends: ${misc:Pre-Depends}
 Replaces: libqscintilla2-5, libqscintilla2-6
 Breaks: libqscintilla2-5, libqscintilla2-6
-Multi-Arch: same
 Description: Qt4 port of the Scintilla source code editing widget
  QScintilla is a text editor for Qt4 with features especially useful when 
  writing and debugging source code. These include support for syntax 
@@ -72,3 +71,15 @@
  . 
  This package contains Python bindings so QScintilla 2 can be used in
  PyQt4 applications.
+
+Package: python3-pyqt4.qsci
+Section: python
+Architecture: any
+Depends: ${python3:Depends}, ${shlibs:Depends}, python3-pyqt4, ${sip3:Depends}, ${misc:Depends}
+Description: Python 3 bindings for QScintilla 2
+ 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 Python 3 bindings so QScintilla 2 can be used in
+ PyQt4 applications.

Modified: packages/qscintilla2/trunk/debian/python-qscintilla2.install
===================================================================
--- packages/qscintilla2/trunk/debian/python-qscintilla2.install	2012-03-14 01:45:34 UTC (rev 20779)
+++ packages/qscintilla2/trunk/debian/python-qscintilla2.install	2012-03-14 04:10:55 UTC (rev 20780)
@@ -1 +1 @@
-usr/lib/python*/*-packages/PyQt4/*
+usr/lib/python2*/*-packages/PyQt4/*

Added: packages/qscintilla2/trunk/debian/python3-pyqt4.qsci.install
===================================================================
--- packages/qscintilla2/trunk/debian/python3-pyqt4.qsci.install	                        (rev 0)
+++ packages/qscintilla2/trunk/debian/python3-pyqt4.qsci.install	2012-03-14 04:10:55 UTC (rev 20780)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PyQt4/*

Modified: packages/qscintilla2/trunk/debian/rules
===================================================================
--- packages/qscintilla2/trunk/debian/rules	2012-03-14 01:45:34 UTC (rev 20779)
+++ packages/qscintilla2/trunk/debian/rules	2012-03-14 04:10:55 UTC (rev 20780)
@@ -14,7 +14,7 @@
 	CXXFLAGS += -O2
 endif
 
-PYTHONS := $(shell pyversions -vr debian/control)
+PYTHONS := $(shell pyversions -vr debian/control) $(shell py3versions -vr)
 
 configure-stamp:
 	dh_testdir
@@ -86,8 +86,10 @@
 	dh_compress
 	dh_fixperms
 	dh_python2
+	dh_python3
 	rm -rf $(CURDIR)/debian/python-qscintilla2/usr/share/pyshared
 	dh_sip
+	dh_sip3
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps