[Python-modules-commits] r29638 - in packages/qscintilla2/trunk/debian (6 files)

[kitterman at users.alioth.debian.org]

    Date: Saturday, July 5, 2014 @ 15:01:34
  Author: kitterman
Revision: 29638

* New upstream release
  - Repack tarball to remove sourcelss javascript files (doc/html-Qt4Qt5/
    jquery.js and doc/html-Qt3/jquery.js)
  - Rebuild should resolve #753581 (Closes: #753581)
  - Dropped debian/patches/pyconfigure_target_config_fix.patch, resolved
    upstream
  - Refreshed patches

Modified:
  packages/qscintilla2/trunk/debian/changelog
  packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff
  packages/qscintilla2/trunk/debian/patches/qsci_link.patch
  packages/qscintilla2/trunk/debian/patches/qt5_includes.patch
  packages/qscintilla2/trunk/debian/patches/series
Deleted:
  packages/qscintilla2/trunk/debian/patches/pyconfigure_target_config_fix.patch

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2014-07-05 13:51:14 UTC (rev 29637)
+++ packages/qscintilla2/trunk/debian/changelog	2014-07-05 15:01:34 UTC (rev 29638)
@@ -1,3 +1,15 @@
+qscintilla2 (2.8.3+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)
+    - Rebuild should resolve #753581 (Closes: #753581)
+    - Dropped debian/patches/pyconfigure_target_config_fix.patch, resolved
+      upstream
+    - Refreshed patches
+
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 05 Jul 2014 10:00:28 -0400
+
 qscintilla2 (2.8.2+dfsg-3) unstable; urgency=medium
 
   * Correct location and content of qscintilla2.prf for Qt5 build

Modified: packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff	2014-07-05 13:51:14 UTC (rev 29637)
+++ packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff	2014-07-05 15:01:34 UTC (rev 29638)
@@ -3,10 +3,10 @@
 <scott at kitterman.com>
 patch the configure script for the Python bindings to support object dir
 builds
-Index: qscintilla2-2.8.2+dfsg/Python/configure.py
+Index: qscintilla2-2.8.3+dfsg/Python/configure.py
 ===================================================================
---- qscintilla2-2.8.2+dfsg.orig/Python/configure.py	2014-06-09 16:33:03.267985662 -0400
-+++ qscintilla2-2.8.2+dfsg/Python/configure.py	2014-06-09 16:34:38.239982856 -0400
+--- qscintilla2-2.8.3+dfsg.orig/Python/configure.py	2014-07-05 10:02:02.318834374 -0400
++++ qscintilla2-2.8.3+dfsg/Python/configure.py	2014-07-05 10:02:02.306834375 -0400
 @@ -31,6 +31,8 @@
  import glob
  import optparse
@@ -25,7 +25,7 @@
          lib_dir = target_configuration.qsci_lib_dir
          if lib_dir is None:
              lib_dir = target_configuration.qt_lib_dir
-@@ -249,7 +253,12 @@
+@@ -264,7 +268,12 @@
          the target configuration.
          """
  

Deleted: packages/qscintilla2/trunk/debian/patches/pyconfigure_target_config_fix.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/pyconfigure_target_config_fix.patch	2014-07-05 13:51:14 UTC (rev 29637)
+++ packages/qscintilla2/trunk/debian/patches/pyconfigure_target_config_fix.patch	2014-07-05 15:01:34 UTC (rev 29638)
@@ -1,17 +0,0 @@
-Index: qscintilla2-2.8.2+dfsg/Python/configure.py
-===================================================================
---- qscintilla2-2.8.2+dfsg.orig/Python/configure.py	2014-06-09 23:00:46.691298305 -0400
-+++ qscintilla2-2.8.2+dfsg/Python/configure.py	2014-06-09 23:24:53.000000000 -0400
-@@ -285,10 +285,10 @@
-         qmake = dict(CONFIG='qscintilla2')
- 
-         if target_configuration.qsci_inc_dir is not None:
--            qmake['INCLUDEPATH'] = quote(target_config.qsci_inc_dir)
-+            qmake['INCLUDEPATH'] = quote(target_configuration.qsci_inc_dir)
- 
-         if target_configuration.qsci_lib_dir is not None:
--            qmake['LIBS'] = '-L%s' % quote(target_config.qsci_inc_dir)
-+            qmake['LIBS'] = '-L%s' % quote(target_configuration.qsci_inc_dir)
- 
-         if target_configuration.qsci_is_dll:
-             qmake['DEFINES'] = 'QSCINTILLA_DLL'

Modified: packages/qscintilla2/trunk/debian/patches/qsci_link.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/qsci_link.patch	2014-07-05 13:51:14 UTC (rev 29637)
+++ packages/qscintilla2/trunk/debian/patches/qsci_link.patch	2014-07-05 15:01:34 UTC (rev 29638)
@@ -1,8 +1,8 @@
-Index: qscintilla2-2.8.2+dfsg/Python/configure.py
+Index: qscintilla2-2.8.3+dfsg/Python/configure.py
 ===================================================================
---- qscintilla2-2.8.2+dfsg.orig/Python/configure.py	2014-06-11 10:10:17.000000000 -0400
-+++ qscintilla2-2.8.2+dfsg/Python/configure.py	2014-06-11 10:12:13.713987412 -0400
-@@ -1332,7 +1332,10 @@
+--- 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 @@
  
      libs = qmake_config.get('LIBS')
      if libs:
@@ -13,4 +13,4 @@
 +            pro.write('LIBS += %s -lqscintilla2\n' % libs)
  
      if not opts.static:
-         dylib = module_config.get_mac_wrapped_library_file(target_config)
+         pro.write('''

Modified: packages/qscintilla2/trunk/debian/patches/qt5_includes.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/qt5_includes.patch	2014-07-05 13:51:14 UTC (rev 29637)
+++ packages/qscintilla2/trunk/debian/patches/qt5_includes.patch	2014-07-05 15:01:34 UTC (rev 29638)
@@ -1,11 +1,11 @@
 When building for Qt5, the python extension needs QtWidgets and QtPrintSupport
 because things moved there from QtGui in Qt4.  Sent upstream.
 
-Index: qscintilla2-2.8.2+dfsg/Python/configure.py
+Index: qscintilla2-2.8.3+dfsg/Python/configure.py
 ===================================================================
---- qscintilla2-2.8.2+dfsg.orig/Python/configure.py	2014-06-09 22:56:25.711306016 -0400
-+++ qscintilla2-2.8.2+dfsg/Python/configure.py	2014-06-09 23:25:54.000000000 -0400
-@@ -1321,6 +1321,9 @@
+--- qscintilla2-2.8.3+dfsg.orig/Python/configure.py	2014-07-05 10:02:57.882832733 -0400
++++ qscintilla2-2.8.3+dfsg/Python/configure.py	2014-07-05 10:02:57.874832733 -0400
+@@ -1423,6 +1423,9 @@
      if includepath:
          pro.write('INCLUDEPATH += %s\n' % includepath)
  

Modified: packages/qscintilla2/trunk/debian/patches/series
===================================================================
--- packages/qscintilla2/trunk/debian/patches/series	2014-07-05 13:51:14 UTC (rev 29637)
+++ packages/qscintilla2/trunk/debian/patches/series	2014-07-05 15:01:34 UTC (rev 29638)
@@ -3,5 +3,4 @@
 remove-logo-privacy-issue.diff
 qt5_includes.patch
 qt5_libname.patch
-pyconfigure_target_config_fix.patch
 qsci_link.patch