[Python-modules-commits] r24872 - in packages/qscintilla2/trunk/debian (4 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Wed Jun 19 07:02:57 UTC 2013 

    Date: Wednesday, June 19, 2013 @ 07:02:54
  Author: kitterman
Revision: 24872

* New upstream release
  - Update debian/patches/configure.py-objdir-support.diff to account for
    the potential for both PyQt4 and PyQt5 (when packaged) builds
  - Update debian/patches/py_conf_inc_dir.diff for upstream updates to
    Python/configure.py
* Update watch file, thanks to Bart Martens

Modified:
  packages/qscintilla2/trunk/debian/changelog
  packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff
  packages/qscintilla2/trunk/debian/patches/py_conf_inc_dir.diff
  packages/qscintilla2/trunk/debian/watch

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2013-06-19 06:50:26 UTC (rev 24871)
+++ packages/qscintilla2/trunk/debian/changelog	2013-06-19 07:02:54 UTC (rev 24872)
@@ -1,3 +1,14 @@
+qscintilla2 (2.7.2-1) unstable; urgency=low
+
+  * New upstream release
+    - Update debian/patches/configure.py-objdir-support.diff to account for
+      the potential for both PyQt4 and PyQt5 (when packaged) builds
+    - Update debian/patches/py_conf_inc_dir.diff for upstream updates to
+      Python/configure.py
+  * Update watch file, thanks to Bart Martens
+
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 19 Jun 2013 02:46:07 -0400
+
 qscintilla2 (2.7.1-1) unstable; urgency=low
 
   * Upload to unstable

Modified: packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff	2013-06-19 06:50:26 UTC (rev 24871)
+++ packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff	2013-06-19 07:02:54 UTC (rev 24872)
@@ -1,9 +1,9 @@
 02_configure.dpatch by Torsten Marek <shlomme at debian.org>
 patch the configure script for the Python bindings to support object dir builds
-Index: qscintilla2-2.7.1/Python/configure.py
+Index: qscintilla2-2.7.2/Python/configure.py
 ===================================================================
---- qscintilla2-2.7.1.orig/Python/configure.py	2013-05-18 17:13:48.196373557 -0400
-+++ qscintilla2-2.7.1/Python/configure.py	2013-05-18 17:13:48.188373557 -0400
+--- qscintilla2-2.7.2.orig/Python/configure.py	2013-06-19 02:36:45.767513660 -0400
++++ qscintilla2-2.7.2/Python/configure.py	2013-06-19 02:38:49.419510007 -0400
 @@ -29,6 +29,8 @@
  import glob
  import optparse
@@ -13,7 +13,7 @@
  try:
      import sysconfig
  except ImportError:
-@@ -460,6 +462,8 @@
+@@ -538,6 +540,8 @@
                  "The QScintilla version number could not be determined by "
                  "reading %s." % sciglobal)
  
@@ -22,12 +22,15 @@
      if not glob.glob(os.path.join(target_config.qsci_lib_dir, '*qscintilla2*')):
          error("The QScintilla library could not be found in %s. If QScintilla is installed then use the --qsci-libdir argument to explicitly specify the correct directory." % target_config.qsci_lib_dir)
  
-@@ -542,7 +546,7 @@
-     argv.append('-c')
+@@ -621,9 +625,9 @@
      argv.append('.')
  
--    argv.append('sip/qscimod4.sip')
-+    argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
+     if opts.pyqt_package == 'PyQt5':
+-        argv.append('sip/qscimod5.sip')
++        argv.append(os.path.join(src_dir, 'sip/qscimod5.sip'))
+     else:
+-        argv.append('sip/qscimod4.sip')
++        argv.append(os.path.join(src_dir, 'sip/qscimod4.sip'))
  
      rc = os.spawnv(os.P_WAIT, target_config.sip, argv)
      if rc != 0:

Modified: packages/qscintilla2/trunk/debian/patches/py_conf_inc_dir.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/py_conf_inc_dir.diff	2013-06-19 06:50:26 UTC (rev 24871)
+++ packages/qscintilla2/trunk/debian/patches/py_conf_inc_dir.diff	2013-06-19 07:02:54 UTC (rev 24872)
@@ -2,11 +2,11 @@
 -I/usr/include/i386-linux-gnu/python2.7
 Patch by Scott Kitterman <scott at kitterman.com>, will be sent upstream
 
-Index: qscintilla2-2.7.1/Python/configure.py
+Index: qscintilla2-2.7.2/Python/configure.py
 ===================================================================
---- qscintilla2-2.7.1.orig/Python/configure.py	2013-03-06 16:46:05.860789440 -0500
-+++ qscintilla2-2.7.1/Python/configure.py	2013-03-06 23:49:14.137777060 -0500
-@@ -96,6 +96,7 @@
+--- qscintilla2-2.7.2.orig/Python/configure.py	2013-06-19 02:44:38.511499692 -0400
++++ qscintilla2-2.7.2/Python/configure.py	2013-06-19 02:45:27.603498242 -0400
+@@ -99,6 +99,7 @@
          if hasattr(sysconfig, 'get_path'):
              # The modern API.
              self.inc_dir = sysconfig.get_path('include')
@@ -14,16 +14,16 @@
              self.module_dir = sysconfig.get_path('platlib')
          else:
              # The legacy distutils API.
-@@ -154,6 +155,7 @@
-         self.pyqt_sip_dir = os.path.join(py_config.data_dir, 'sip', 'PyQt4')
-         self.qsci_sip_dir = self.pyqt_sip_dir
+@@ -153,6 +154,7 @@
+         py_config = HostPythonConfiguration()
+         self.py_module_dir = py_config.module_dir
          self.py_inc_dir = py_config.inc_dir
 +        self.py_conf_inc_dir = py_config.py_conf_inc_dir
-         self.sip_inc_dir = py_config.inc_dir
          self.py_lib_dir = py_config.lib_dir
+         self.py_platform = py_config.platform
+         self.py_sip_dir = os.path.join(py_config.data_dir, 'sip')
+@@ -736,6 +738,8 @@
  
-@@ -649,6 +651,8 @@
- 
      pro.write('INCLUDEPATH += %s\n' % target_config.qsci_inc_dir)
      pro.write('INCLUDEPATH += %s\n' % target_config.py_inc_dir)
 +    if target_config.py_inc_dir != target_config.py_conf_inc_dir:

Modified: packages/qscintilla2/trunk/debian/watch
===================================================================
--- packages/qscintilla2/trunk/debian/watch	2013-06-19 06:50:26 UTC (rev 24871)
+++ packages/qscintilla2/trunk/debian/watch	2013-06-19 07:02:54 UTC (rev 24872)
@@ -1,5 +1,5 @@
-#      /static/Downloads/QScintilla2/QScintilla-gpl-(.*)\.tar\.gz
-
 version=3
-http://www.riverbankcomputing.com/software/qscintilla/download \
- /static/Downloads/QScintilla2/QScintilla-gpl-([\d\.]+)\.tar\.gz debian uupdate
+opts=uversionmangle=s/(.*\db?)([\._\-]snapshot)/0.0.$1~$2/ \
+http://www.riverbankcomputing.co.uk/software/qscintilla/download \
+(?:.*/|.*=|)QScintilla-gpl[\-\._](\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)(?:/\S*)?
+# Bart Martens <bartm at debian.org>  Fri, 17 May 2013 04:03:41 +0000

More information about the Python-modules-commits mailing list