[Python-modules-commits] r22423 - in packages/qscintilla2/trunk/debian (8 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Tue Jul 10 17:08:20 UTC 2012 

    Date: Tuesday, July 10, 2012 @ 17:08:18
  Author: kitterman
Revision: 22423

* New upstream release
  - Update debian rules for new directory naming Qt4/Qt4Qt5
  - Update debian/libqscintilla2-doc.docs, libqscintilla2-doc.doc-base.api,
    and libqscintilla2-doc.examples for new documentation and examples
    directory names
  - Refresh patches
  - Update debian/copyright
* Add missing X-Python3-Version to specify Python 3.1 as minimum Python 3

Modified:
  packages/qscintilla2/trunk/debian/changelog
  packages/qscintilla2/trunk/debian/control
  packages/qscintilla2/trunk/debian/copyright
  packages/qscintilla2/trunk/debian/libqscintilla2-doc.doc-base.api
  packages/qscintilla2/trunk/debian/libqscintilla2-doc.docs
  packages/qscintilla2/trunk/debian/libqscintilla2-doc.examples
  packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff
  packages/qscintilla2/trunk/debian/rules

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2012-07-10 14:24:00 UTC (rev 22422)
+++ packages/qscintilla2/trunk/debian/changelog	2012-07-10 17:08:18 UTC (rev 22423)
@@ -1,3 +1,16 @@
+qscintilla2 (2.6.2-1) experimental; urgency=low
+
+  * New upstream release
+    - Update debian rules for new directory naming Qt4/Qt4Qt5
+    - Update debian/libqscintilla2-doc.docs, libqscintilla2-doc.doc-base.api,
+      and libqscintilla2-doc.examples for new documentation and examples
+      directory names
+    - Refresh patches
+    - Update debian/copyright
+  * Add missing X-Python3-Version to specify Python 3.1 as minimum Python 3
+
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 10 Jul 2012 01:17:03 -0400
+
 qscintilla2 (2.6.1-5) unstable; urgency=low
 
   * Upload to unstable for qt4-x11 multiarch transition

Modified: packages/qscintilla2/trunk/debian/control
===================================================================
--- packages/qscintilla2/trunk/debian/control	2012-07-10 14:24:00 UTC (rev 22422)
+++ packages/qscintilla2/trunk/debian/control	2012-07-10 17:08:18 UTC (rev 22423)
@@ -5,6 +5,7 @@
 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
+X-Python3-Version: >= 3.1
 Homepage: http://www.riverbankcomputing.co.uk/software/qscintilla
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/qscintilla2/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/qscintilla2/trunk/

Modified: packages/qscintilla2/trunk/debian/copyright
===================================================================
--- packages/qscintilla2/trunk/debian/copyright	2012-07-10 14:24:00 UTC (rev 22422)
+++ packages/qscintilla2/trunk/debian/copyright	2012-07-10 17:08:18 UTC (rev 22423)
@@ -8,7 +8,7 @@
 
 Upstream Authors: 
 
-    QScintilla 2 (under Qt3/, Qt4/, Python/ designer-Qt*/ and doc/html-Qt*/):
+    QScintilla 2 (under Qt3/, Qt4Qt5/, Python/ designer-Qt*/ and doc/html-Qt*/):
     Phil Thompson <phil at river-bank.demon.co.uk>
     Riverbank Computing Limited <info at riverbankcomputing.com>
      
@@ -17,11 +17,11 @@
     
 Copyright: 
 
-    QScintilla 2 (under Qt3/, Qt4/, Python/ designer-Qt*/ and doc/html-Qt*/):
-    Copyright (c) 2011 Riverbank Computing Limited <info at riverbankcomputing.com>
+    QScintilla 2 (under Qt3/, Qt4Qt5/, Python/ designer-Qt*/ and doc/html-Qt*/):
+    Copyright (c) 2012 Riverbank Computing Limited <info at riverbankcomputing.com>
  
     Scintilla (under src/ include/ and doc/Scintilla):
-    Copyright 1998-2007 by Neil Hodgson <neilh at scintilla.org>
+    Copyright 1998-2011 by Neil Hodgson <neilh at scintilla.org>
     
     src/LexAda.cpp: Copyright (C) 2002 by Sergey Koshcheyev <sergey.k at seznam.cz>
     src/LexAsn1.cpp: Copyright (C) 2004 by Herr Pfarrer rpfarrer <at> yahoo <dot> de

Modified: packages/qscintilla2/trunk/debian/libqscintilla2-doc.doc-base.api
===================================================================
--- packages/qscintilla2/trunk/debian/libqscintilla2-doc.doc-base.api	2012-07-10 14:24:00 UTC (rev 22422)
+++ packages/qscintilla2/trunk/debian/libqscintilla2-doc.doc-base.api	2012-07-10 17:08:18 UTC (rev 22423)
@@ -7,5 +7,5 @@
 Section: Programming/C++
 
 Format: HTML
-Index: /usr/share/doc/libqscintilla2-doc/html-Qt4/index.html
-Files: /usr/share/doc/libqscintilla2-doc/html-Qt4/*.html
+Index: /usr/share/doc/libqscintilla2-doc/html-Qt4Qt5/index.html
+Files: /usr/share/doc/libqscintilla2-doc/html-Qt4Qt5/*.html

Modified: packages/qscintilla2/trunk/debian/libqscintilla2-doc.docs
===================================================================
--- packages/qscintilla2/trunk/debian/libqscintilla2-doc.docs	2012-07-10 14:24:00 UTC (rev 22422)
+++ packages/qscintilla2/trunk/debian/libqscintilla2-doc.docs	2012-07-10 17:08:18 UTC (rev 22423)
@@ -1,2 +1,2 @@
 doc/Scintilla/
-doc/html-Qt4/
+doc/html-Qt4Qt5/

Modified: packages/qscintilla2/trunk/debian/libqscintilla2-doc.examples
===================================================================
--- packages/qscintilla2/trunk/debian/libqscintilla2-doc.examples	2012-07-10 14:24:00 UTC (rev 22422)
+++ packages/qscintilla2/trunk/debian/libqscintilla2-doc.examples	2012-07-10 17:08:18 UTC (rev 22423)
@@ -1 +1 @@
-example-Qt4/
+example-Qt4Qt5/

Modified: packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff	2012-07-10 14:24:00 UTC (rev 22422)
+++ packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff	2012-07-10 17:08:18 UTC (rev 22423)
@@ -1,10 +1,10 @@
 01_qscintilla.pro.dpatch by Torsten Marek <shlomme at debian.org>
 Don't install the library directly
-Index: qscintilla2-2.6.1/Qt4/qscintilla.pro
+Index: qscintilla2-2.6.2/Qt4Qt5/qscintilla.pro
 ===================================================================
---- qscintilla2-2.6.1.orig/Qt4/qscintilla.pro	2012-02-10 04:59:51.000000000 -0500
-+++ qscintilla2-2.6.1/Qt4/qscintilla.pro	2012-02-11 12:41:31.287129310 -0500
-@@ -37,7 +37,7 @@
+--- qscintilla2-2.6.2.orig/Qt4Qt5/qscintilla.pro	2012-06-20 14:09:15.000000000 -0400
++++ qscintilla2-2.6.2/Qt4Qt5/qscintilla.pro	2012-07-10 01:19:47.348028182 -0400
+@@ -42,7 +42,7 @@
  #DEFINES += SCI_NAMESPACE
  
  # Handle both Qt v4 and v3.

Modified: packages/qscintilla2/trunk/debian/rules
===================================================================
--- packages/qscintilla2/trunk/debian/rules	2012-07-10 14:24:00 UTC (rev 22422)
+++ packages/qscintilla2/trunk/debian/rules	2012-07-10 17:08:18 UTC (rev 22423)
@@ -18,8 +18,8 @@
 
 configure-stamp:
 	dh_testdir
-	cd Qt4 && qmake-qt4 QMAKE_STRIP=""
-	cd designer-Qt4 && qmake-qt4 INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4 QMAKE_STRIP=""
+	cd Qt4Qt5 && qmake-qt4 QMAKE_STRIP=""
+	cd designer-Qt4 && qmake-qt4 INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 QMAKE_STRIP=""
 	touch $@
 
 configure: configure-stamp $(PYTHONS:%=Python/build-%/configure-stamp)
@@ -28,12 +28,12 @@
 	dh_testdir
 	mkdir -p Python/build-$*
 	cd Python/build-$* \
-		&& python$* ../configure.py -n ../../Qt4/ -o ../../Qt4 -c -p 4
+		&& python$* ../configure.py -n ../../Qt4Qt5/ -o ../../Qt4Qt5 -c -p 4
 	touch $@
 
 build-library-stamp: configure
 	dh_testdir
-	cd Qt4 && $(MAKE)
+	cd Qt4Qt5 && $(MAKE)
 	cd designer-Qt4 && $(MAKE)
 	touch $@
 
@@ -51,7 +51,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	-cd Qt4 && $(MAKE) distclean
+	-cd Qt4Qt5 && $(MAKE) distclean
 	-cd designer-Qt4 && $(MAKE) distclean
 
 	rm -fr $(PYTHONS:%=Python/build-%)
@@ -67,7 +67,7 @@
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	cd Qt4 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
+	cd Qt4Qt5 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
 	cd designer-Qt4 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
 	for p in $(PYTHONS) ; do \
                 $(MAKE) -f debian/rules install-python-$$p;\

More information about the Python-modules-commits mailing list