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

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Mon Sep 22 04:41:47 UTC 2014 

    Date: Monday, September 22, 2014 @ 04:41:46
  Author: kitterman
Revision: 30712

* New upstream release
  - Repack tarball to remove sourcelss javascript files (doc/html-Qt4Qt5/
    jquery.js and doc/html-Qt3/jquery.js)
  - Update debian/patches/qt5_libname.patch to match upstream changes in the
    same area
  - Refresh patches
  - Temporarily bump pyqt5 build-dep version to 5.3.2+dfsg-2~ to make sure
    it builds against the current pyqt5 on all archs
* Bump standards version to 3.9.6 without further change
* Remove obsolete debian/README.Debian

Modified:
  packages/qscintilla2/trunk/debian/changelog
  packages/qscintilla2/trunk/debian/control
  packages/qscintilla2/trunk/debian/patches/qsci_link.patch
  packages/qscintilla2/trunk/debian/patches/qt5_libname.patch
Deleted:
  packages/qscintilla2/trunk/debian/README.Debian

Deleted: packages/qscintilla2/trunk/debian/README.Debian
===================================================================
--- packages/qscintilla2/trunk/debian/README.Debian	2014-09-21 19:12:04 UTC (rev 30711)
+++ packages/qscintilla2/trunk/debian/README.Debian	2014-09-22 04:41:46 UTC (rev 30712)
@@ -1,8 +0,0 @@
-qscintilla2 for Debian
-----------------------
-
-QScintilla2 is only built for PyQt4. If you need to use the 
-QScintilla widget with PyQt3, please use the QScintilla v1 
-bindings in python-qt-ext
-
- -- Torsten Marek <shlomme at debian.org>  Sun, 29 Jul 2007 12:17:49 +0200

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2014-09-21 19:12:04 UTC (rev 30711)
+++ packages/qscintilla2/trunk/debian/changelog	2014-09-22 04:41:46 UTC (rev 30712)
@@ -1,3 +1,18 @@
+qscintilla2 (2.8.4+dfsg-1) unstable; urgency=medium
+
+  * New upstream release
+    - Repack tarball to remove sourcelss javascript files (doc/html-Qt4Qt5/
+      jquery.js and doc/html-Qt3/jquery.js)
+    - Update debian/patches/qt5_libname.patch to match upstream changes in the
+      same area
+    - Refresh patches
+    - Temporarily bump pyqt5 build-dep version to 5.3.2+dfsg-2~ to make sure
+      it builds against the current pyqt5 on all archs
+  * Bump standards version to 3.9.6 without further change
+  * Remove obsolete debian/README.Debian
+
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 21 Sep 2014 22:09:22 -0400
+
 qscintilla2 (2.8.3+dfsg-3) unstable; urgency=medium
 
   * Add support for Qt designer plugin with Qt5

Modified: packages/qscintilla2/trunk/debian/control
===================================================================
--- packages/qscintilla2/trunk/debian/control	2014-09-21 19:12:04 UTC (rev 30711)
+++ packages/qscintilla2/trunk/debian/control	2014-09-22 04:41:46 UTC (rev 30712)
@@ -18,13 +18,13 @@
                python3-all-dev (>= 3.1.3-13~),
                python3-pyqt4,
                python3-pyqt4-dbg,
-               python3-pyqt5 (>= 5.3+dfsg-2~),
+               python3-pyqt5 (>= 5.3.2+dfsg-2~),
                python3-pyqt5-dbg,
                python3-sip-dbg,
                python3-sip-dev,
                qtbase5-dev,
                qttools5-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Section: libs
 X-Python3-Version: >= 3.1
 Homepage: http://www.riverbankcomputing.co.uk/software/qscintilla

Modified: packages/qscintilla2/trunk/debian/patches/qsci_link.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/qsci_link.patch	2014-09-21 19:12:04 UTC (rev 30711)
+++ packages/qscintilla2/trunk/debian/patches/qsci_link.patch	2014-09-22 04:41:46 UTC (rev 30712)
@@ -1,8 +1,8 @@
-Index: qscintilla2-2.8.3+dfsg/Python/configure.py
+Index: qscintilla2-2.8.4+dfsg/Python/configure.py
 ===================================================================
---- qscintilla2-2.8.3+dfsg.orig/Python/configure.py	2014-07-05 10:05:48.614827688 -0400
-+++ qscintilla2-2.8.3+dfsg/Python/configure.py	2014-07-05 10:05:48.610827688 -0400
-@@ -1434,7 +1434,10 @@
+--- qscintilla2-2.8.4+dfsg.orig/Python/configure.py	2014-09-21 22:26:07.110346928 -0400
++++ qscintilla2-2.8.4+dfsg/Python/configure.py	2014-09-21 22:26:07.106346928 -0400
+@@ -1440,7 +1440,10 @@
  
      libs = qmake_config.get('LIBS')
      if libs:

Modified: packages/qscintilla2/trunk/debian/patches/qt5_libname.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/qt5_libname.patch	2014-09-21 19:12:04 UTC (rev 30711)
+++ packages/qscintilla2/trunk/debian/patches/qt5_libname.patch	2014-09-22 04:41:46 UTC (rev 30712)
@@ -1,9 +1,9 @@
 Rename library when built with Qt5 for co-installability.  Discussed with
 upstream, but not reviewed as they aren't particularly interested in it.
-Index: qscintilla2-2.8.3+dfsg/Qt4Qt5/qscintilla.pro
+Index: qscintilla2-2.8.4+dfsg/Qt4Qt5/qscintilla.pro
 ===================================================================
---- qscintilla2-2.8.3+dfsg.orig/Qt4Qt5/qscintilla.pro	2014-07-12 22:00:53.619873266 -0400
-+++ qscintilla2-2.8.3+dfsg/Qt4Qt5/qscintilla.pro	2014-07-12 22:00:53.615873267 -0400
+--- qscintilla2-2.8.4+dfsg.orig/Qt4Qt5/qscintilla.pro	2014-09-21 22:25:27.974348084 -0400
++++ qscintilla2-2.8.4+dfsg/Qt4Qt5/qscintilla.pro	2014-09-21 22:25:27.958348085 -0400
 @@ -41,6 +41,7 @@
  
  greaterThan(QT_MAJOR_VERSION, 4) {
@@ -12,10 +12,10 @@
  
      greaterThan(QT_MINOR_VERSION, 1) {
  	    macx:QT += macextras
-Index: qscintilla2-2.8.3+dfsg/Qt4Qt5/features/qscintilla2.prf
+Index: qscintilla2-2.8.4+dfsg/Qt4Qt5/features/qscintilla2.prf
 ===================================================================
---- qscintilla2-2.8.3+dfsg.orig/Qt4Qt5/features/qscintilla2.prf	2014-07-12 22:00:53.619873266 -0400
-+++ qscintilla2-2.8.3+dfsg/Qt4Qt5/features/qscintilla2.prf	2014-07-12 22:00:53.615873267 -0400
+--- qscintilla2-2.8.4+dfsg.orig/Qt4Qt5/features/qscintilla2.prf	2014-09-21 22:25:27.974348084 -0400
++++ qscintilla2-2.8.4+dfsg/Qt4Qt5/features/qscintilla2.prf	2014-09-21 22:25:27.966348085 -0400
 @@ -17,9 +17,18 @@
          win32: {
              LIBS += -lqscintilla2d
@@ -36,14 +36,14 @@
      LIBS += -lqscintilla2
 +        }
  }
-Index: qscintilla2-2.8.3+dfsg/designer-Qt4Qt5/designer.pro
+Index: qscintilla2-2.8.4+dfsg/designer-Qt4Qt5/designer.pro
 ===================================================================
---- qscintilla2-2.8.3+dfsg.orig/designer-Qt4Qt5/designer.pro	2014-07-12 22:00:53.619873266 -0400
-+++ qscintilla2-2.8.3+dfsg/designer-Qt4Qt5/designer.pro	2014-07-12 22:02:44.863869980 -0400
-@@ -8,8 +8,11 @@
+--- qscintilla2-2.8.4+dfsg.orig/designer-Qt4Qt5/designer.pro	2014-09-21 22:25:27.974348084 -0400
++++ qscintilla2-2.8.4+dfsg/designer-Qt4Qt5/designer.pro	2014-09-21 22:25:27.966348085 -0400
+@@ -11,8 +11,11 @@
  
- greaterThan(QT_MAJOR_VERSION, 4) {
-     QT += designer
+     # Work around QTBUG-39300.
+     CONFIG -= android_install
 +    TARGET = qt5scintillaplugin
 +    LIBS += -lqt5scintilla2
  } else {

More information about the Python-modules-commits mailing list