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

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Mon Mar 17 23:26:49 UTC 2014 

    Date: Monday, March 17, 2014 @ 23:26:48
  Author: kitterman
Revision: 28224

* New upstream release
  - Update library name to libqscintilla2-11 based on upstream soname change
  - Refresh patches

Added:
  packages/qscintilla2/trunk/debian/libqscintilla2-11.install
  packages/qscintilla2/trunk/debian/python3-pyqt5.qsci.install
Modified:
  packages/qscintilla2/trunk/debian/changelog
  packages/qscintilla2/trunk/debian/control
  packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff
  packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff
  packages/qscintilla2/trunk/debian/patches/py_conf_inc_dir.diff
Deleted:
  packages/qscintilla2/trunk/debian/libqscintilla2-9.install

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2014-03-17 20:33:51 UTC (rev 28223)
+++ packages/qscintilla2/trunk/debian/changelog	2014-03-17 23:26:48 UTC (rev 28224)
@@ -1,3 +1,11 @@
+qscintilla2 (2.8.1-1) unstable; urgency=medium
+
+  * New upstream release
+    - Update library name to libqscintilla2-11 based on upstream soname change
+    - Refresh patches
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 17 Mar 2014 19:02:44 -0400
+
 qscintilla2 (2.7.2-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/qscintilla2/trunk/debian/control
===================================================================
--- packages/qscintilla2/trunk/debian/control	2014-03-17 20:33:51 UTC (rev 28223)
+++ packages/qscintilla2/trunk/debian/control	2014-03-17 23:26:48 UTC (rev 28224)
@@ -10,7 +10,7 @@
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/qscintilla2/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/qscintilla2/trunk/
 
-Package: libqscintilla2-9
+Package: libqscintilla2-11
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqscintilla2-l10n (>= ${source:Upstream-Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -26,7 +26,7 @@
 Package: libqscintilla2-l10n
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libqscintilla2-9
+Suggests: libqscintilla2-11
 Replaces: libqscintilla2-5, libqscintilla2-6, libqscintilla2-8, libqscintilla2-translations
 Breaks: libqscintilla2-5, libqscintilla2-6, libqscintilla2-8, libqscintilla2-translations
 Description: Scintilla source code editing widget for Qt4, translation files
@@ -52,7 +52,7 @@
 Package: libqscintilla2-dev
 Section: libdevel
 Architecture: all
-Depends: libqscintilla2-9 (>= ${source:Upstream-Version}), libqscintilla2-9 (<< ${source:Upstream-Version}+1~), libqt4-dev, ${misc:Depends}
+Depends: libqscintilla2-11 (>= ${source:Upstream-Version}), libqscintilla2-11 (<< ${source:Upstream-Version}+1~), libqt4-dev, ${misc:Depends}
 Description: Scintilla source code editing widget for Qt4, development files
  QScintilla is a text editor for Qt4 with features especially useful when 
  writing and debugging source code. These include support for syntax 

Added: packages/qscintilla2/trunk/debian/libqscintilla2-11.install
===================================================================
--- packages/qscintilla2/trunk/debian/libqscintilla2-11.install	                        (rev 0)
+++ packages/qscintilla2/trunk/debian/libqscintilla2-11.install	2014-03-17 23:26:48 UTC (rev 28224)
@@ -0,0 +1 @@
+usr/lib/*.so.*

Deleted: packages/qscintilla2/trunk/debian/libqscintilla2-9.install
===================================================================
--- packages/qscintilla2/trunk/debian/libqscintilla2-9.install	2014-03-17 20:33:51 UTC (rev 28223)
+++ packages/qscintilla2/trunk/debian/libqscintilla2-9.install	2014-03-17 23:26:48 UTC (rev 28224)
@@ -1 +0,0 @@
-usr/lib/*.so.*

Modified: packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff	2014-03-17 20:33:51 UTC (rev 28223)
+++ packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff	2014-03-17 23:26:48 UTC (rev 28224)
@@ -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.2/Python/configure.py
+Index: qscintilla2-2.8.1/Python/configure.py
 ===================================================================
---- 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
+--- qscintilla2-2.8.1.orig/Python/configure.py	2014-03-17 19:09:29.155268568 -0400
++++ qscintilla2-2.8.1/Python/configure.py	2014-03-17 19:11:15.267265433 -0400
 @@ -29,6 +29,8 @@
  import glob
  import optparse
@@ -13,16 +13,16 @@
  try:
      import sysconfig
  except ImportError:
-@@ -538,6 +540,8 @@
+@@ -544,6 +546,8 @@
                  "The QScintilla version number could not be determined by "
                  "reading %s." % sciglobal)
  
 +    return # Debian: do not check for the installed version, we're good this way.
 +
-     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)
- 
-@@ -621,9 +625,9 @@
+     lib_dir = target_config.qsci_lib_dir
+     if lib_dir is None:
+         lib_dir = target_config.qsci_default_lib_dir
+@@ -631,9 +635,9 @@
      argv.append('.')
  
      if opts.pyqt_package == 'PyQt5':

Modified: packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff	2014-03-17 20:33:51 UTC (rev 28223)
+++ packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff	2014-03-17 23:26:48 UTC (rev 28224)
@@ -1,10 +1,10 @@
 01_qscintilla.pro.dpatch by Torsten Marek <shlomme at debian.org>
 Don't install the library directly
-Index: qscintilla2-2.7.1/Qt4Qt5/qscintilla.pro
+Index: qscintilla2-2.8.1/Qt4Qt5/qscintilla.pro
 ===================================================================
---- qscintilla2-2.7.1.orig/Qt4Qt5/qscintilla.pro	2013-03-01 16:03:05.000000000 -0500
-+++ qscintilla2-2.7.1/Qt4Qt5/qscintilla.pro	2013-03-06 13:12:40.488291304 -0500
-@@ -43,7 +43,7 @@
+--- qscintilla2-2.8.1.orig/Qt4Qt5/qscintilla.pro	2014-03-17 19:11:57.271264192 -0400
++++ qscintilla2-2.8.1/Qt4Qt5/qscintilla.pro	2014-03-17 19:11:57.259264192 -0400
+@@ -47,7 +47,7 @@
  #DEFINES += SCI_NAMESPACE
  
  # Handle both Qt v4 and v3.

Modified: packages/qscintilla2/trunk/debian/patches/py_conf_inc_dir.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/py_conf_inc_dir.diff	2014-03-17 20:33:51 UTC (rev 28223)
+++ packages/qscintilla2/trunk/debian/patches/py_conf_inc_dir.diff	2014-03-17 23:26:48 UTC (rev 28224)
@@ -2,10 +2,10 @@
 -I/usr/include/i386-linux-gnu/python2.7
 Patch by Scott Kitterman <scott at kitterman.com>, will be sent upstream
 
-Index: qscintilla2-2.7.2/Python/configure.py
+Index: qscintilla2-2.8.1/Python/configure.py
 ===================================================================
---- 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
+--- qscintilla2-2.8.1.orig/Python/configure.py	2014-03-17 19:12:22.995263432 -0400
++++ qscintilla2-2.8.1/Python/configure.py	2014-03-17 19:12:22.991263432 -0400
 @@ -99,6 +99,7 @@
          if hasattr(sysconfig, 'get_path'):
              # The modern API.
@@ -22,9 +22,9 @@
          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 @@
+@@ -743,6 +745,8 @@
+         pro.write('INCLUDEPATH += %s\n' % target_config.qsci_inc_dir)
  
-     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:
 +        pro.write('INCLUDEPATH += %s\n' % target_config.py_conf_inc_dir)

Added: packages/qscintilla2/trunk/debian/python3-pyqt5.qsci.install
===================================================================
--- packages/qscintilla2/trunk/debian/python3-pyqt5.qsci.install	                        (rev 0)
+++ packages/qscintilla2/trunk/debian/python3-pyqt5.qsci.install	2014-03-17 23:26:48 UTC (rev 28224)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PyQt5/*

More information about the Python-modules-commits mailing list