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

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Mon Jul 28 03:54:48 UTC 2014 

    Date: Monday, July 28, 2014 @ 03:54:43
  Author: kitterman
Revision: 29974

* Add dev packages (pyqt5.qsci-dev and pyqt4.qsci-dev) for sip files to make
  it possible to provide sip bindings to classes derived from Qscintilla
  classes (Closes: #755491)
  - Add debian/pyqt5.qsci-dev.install and pyqt4.qsci-dev.install
  - Add debian/patches/sip_install_loc.patch to adjust sip file location in
    Python/QSci.pro for Debian python build locations (Thanks to J?\195?\188rgen E.
    Fischer)
* Additional adjustments to debian/rules to prevent errors from being
  ignored (thanks to J?\195?\188rgen E. Fischer)
* Update debian/copyright

Added:
  packages/qscintilla2/trunk/debian/patches/sip_install_loc.patch
  packages/qscintilla2/trunk/debian/pyqt4.qsci-dev.install
  packages/qscintilla2/trunk/debian/pyqt5.qsci-dev.install
Modified:
  packages/qscintilla2/trunk/debian/changelog
  packages/qscintilla2/trunk/debian/control
  packages/qscintilla2/trunk/debian/copyright
  packages/qscintilla2/trunk/debian/patches/series
  packages/qscintilla2/trunk/debian/rules

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2014-07-28 00:14:35 UTC (rev 29973)
+++ packages/qscintilla2/trunk/debian/changelog	2014-07-28 03:54:43 UTC (rev 29974)
@@ -12,7 +12,17 @@
       and python3-all-dbg to build-depends
     - Rework debian/rules based on how python-qt4 does it to actually build
       and install the dbg variants
+  * Add dev packages (pyqt5.qsci-dev and pyqt4.qsci-dev) for sip files to make
+    it possible to provide sip bindings to classes derived from Qscintilla
+    classes (Closes: #755491)
+    - Add debian/pyqt5.qsci-dev.install and pyqt4.qsci-dev.install
+    - Add debian/patches/sip_install_loc.patch to adjust sip file location in
+      Python/QSci.pro for Debian python build locations (Thanks to Jürgen E.
+      Fischer)
+  * Additional adjustments to debian/rules to prevent errors from being
+    ignored (thanks to Jürgen E. Fischer)
   * Make Qt5 arch any since pyqt5 now builds on hurd
+  * Update debian/copyright
   * Wrap and sort
   * Drop obsolete Breaks/Replaces
 

Modified: packages/qscintilla2/trunk/debian/control
===================================================================
--- packages/qscintilla2/trunk/debian/control	2014-07-28 00:14:35 UTC (rev 29973)
+++ packages/qscintilla2/trunk/debian/control	2014-07-28 03:54:43 UTC (rev 29974)
@@ -243,6 +243,14 @@
  This package contains Python bindings so QScintilla 2 can be used in
  PyQt4 applications.
 
+Package: pyqt4.qsci-dev
+Architecture: all
+Depends: python-qt4-dev, python-sip-dev, ${misc:Depends}
+Description: Development files for Python Qscintilla2 (Qt4)
+ This package contains the source SIP files from which the Python bindings for
+ Qscintilla2 (Qt4) are created. They are needed for building PyQt4 bindindgs
+ for Qscintilla2 as well as creating bindings for own widgets written in C++.
+
 Package: python-qscintilla2-dbg
 Priority: extra
 Section: debug
@@ -310,6 +318,14 @@
  This package contains Python 3 bindings so QScintilla 2 can be used in
  PyQt5 applications.
 
+Package: pyqt5.qsci-dev
+Architecture: all
+Depends: pyqt5-dev, python-sip-dev, ${misc:Depends}
+Description: Development files for Python Qscintilla2 (Qt5)
+ This package contains the source SIP files from which the Python bindings for 
+ Qscintilla2 (Qt5) are created. They are needed for building PyQt5 bindindgs
+ for Qscintilla2 as well as creating bindings for own widgets written in C++.
+
 Package: python3-pyqt5.qsci-dbg
 Priority: extra
 Section: debug

Modified: packages/qscintilla2/trunk/debian/copyright
===================================================================
--- packages/qscintilla2/trunk/debian/copyright	2014-07-28 00:14:35 UTC (rev 29973)
+++ packages/qscintilla2/trunk/debian/copyright	2014-07-28 03:54:43 UTC (rev 29974)
@@ -18,10 +18,10 @@
 Copyright:
 
     QScintilla 2 (under Qt3/, Qt4Qt5/, Python/ designer-Qt*/ and doc/html-Qt*/):
-    Copyright (c) 2012 Riverbank Computing Limited <info at riverbankcomputing.com>
+    Copyright (c) 2014 Riverbank Computing Limited <info at riverbankcomputing.com>
 
     Scintilla (under src/ include/ lexers/ lexlib/ and doc/Scintilla):
-    Copyright 1998-2011 by Neil Hodgson <neilh at scintilla.org>
+    Copyright 1998-2013 by Neil Hodgson <neilh at scintilla.org>
 
     lexers/LexSML.cpp:// Copyright 2009 by James Moffatt and Yuzhou Xin
     lexers/LexSML.cpp:// Modified from LexCaml.cxx by Robert Roessler <robertr at rftp.com> Copyright 2005
@@ -51,6 +51,8 @@
     lexers/LexYAML.cpp:// Copyright 2003- by Sean O'Dell <sean at celsoft.com>
     lexers/LexGAP.cpp:// Copyright 2007 by Istvan Szollosi ( szteven <at> gmail <dot> com )
     lexers/LexCmake.cpp:// Copyright 2007 by Cristian Adam <cristian [dot] adam [at] gmx [dot] net>
+    lexers/LexKVIrc.cpp:// Copyright 2013 by OmegaPhil <OmegaPhil+scintilla at gmail.com>
+    lexers/LexRust.cpp: ** Copyright (c) 2013 by SiegeLord <slabode at aim.com>
 
     Parts of Qt (under example-Qt3/ and example-Qt4/)
     Copyright (C) 2004-2006 Trolltech ASA

Modified: packages/qscintilla2/trunk/debian/patches/series
===================================================================
--- packages/qscintilla2/trunk/debian/patches/series	2014-07-28 00:14:35 UTC (rev 29973)
+++ packages/qscintilla2/trunk/debian/patches/series	2014-07-28 03:54:43 UTC (rev 29974)
@@ -1,3 +1,4 @@
+sip_install_loc.patch
 configure.py-objdir-support.diff
 fix-lib-install-dir.diff
 remove-logo-privacy-issue.diff

Added: packages/qscintilla2/trunk/debian/patches/sip_install_loc.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/sip_install_loc.patch	                        (rev 0)
+++ packages/qscintilla2/trunk/debian/patches/sip_install_loc.patch	2014-07-28 03:54:43 UTC (rev 29974)
@@ -0,0 +1,14 @@
+Adjust for Debian Python build file location.  No need to upstream.
+Index: qscintilla2-2.8.3+dfsg/Python/configure.py
+===================================================================
+--- qscintilla2-2.8.3+dfsg.orig/Python/configure.py	2014-07-15 21:08:17.000000000 -0400
++++ qscintilla2-2.8.3+dfsg/Python/configure.py	2014-07-27 23:05:45.650505234 -0400
+@@ -278,7 +278,7 @@
+             return None
+ 
+         path = os.path.join(target_configuration.qsci_sip_dir, 'Qsci')
+-        files = glob.glob('sip/*.sip')
++        files = glob.glob('../sip/*.sip')
+ 
+         return path, files
+ 

Added: packages/qscintilla2/trunk/debian/pyqt4.qsci-dev.install
===================================================================
--- packages/qscintilla2/trunk/debian/pyqt4.qsci-dev.install	                        (rev 0)
+++ packages/qscintilla2/trunk/debian/pyqt4.qsci-dev.install	2014-07-28 03:54:43 UTC (rev 29974)
@@ -0,0 +1 @@
+usr/share/sip/PyQt4/*

Added: packages/qscintilla2/trunk/debian/pyqt5.qsci-dev.install
===================================================================
--- packages/qscintilla2/trunk/debian/pyqt5.qsci-dev.install	                        (rev 0)
+++ packages/qscintilla2/trunk/debian/pyqt5.qsci-dev.install	2014-07-28 03:54:43 UTC (rev 29974)
@@ -0,0 +1 @@
+usr/share/sip/PyQt5/*

Modified: packages/qscintilla2/trunk/debian/rules
===================================================================
--- packages/qscintilla2/trunk/debian/rules	2014-07-28 00:14:35 UTC (rev 29973)
+++ packages/qscintilla2/trunk/debian/rules	2014-07-28 03:54:43 UTC (rev 29974)
@@ -150,9 +150,9 @@
 	$(MAKE) -C Python/buildqt5-3$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C Python/dbg-buildqt5-3$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
 endif
-	ABITAG=`python$* -c "import sysconfig; print(sysconfig.get_config_var('SOABI'))"`; \
+	ABITAG=`python3$* -c "import sysconfig; print(sysconfig.get_config_var('SOABI'))"`; \
 	  for f in `find debian/tmp/usr/lib/python3* -name '*.so' ! -name '*.cpython*.so'`; do \
-	  mv $$f $${f%.so}.$$ABITAG.so; \
+	  mv $$f $${f%.so}.$$ABITAG.so || exit 1; \
 	done; 
 
 d_qt4_dbg = debian/python-qscintilla2-dbg
@@ -174,21 +174,21 @@
 	mkdir -p $(CURDIR)/debian/libqt5scintilla2-dev/usr/include/$(DEB_HOST_MULTIARCH)/qt5/Qsci
 	mkdir -p $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features
 	mkdir -p $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/api/python3
-	mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/include/$(DEB_HOST_MULTIARCH)/qt5/Qsci/*.h $(CURDIR)/debian/libqt5scintilla2-dev/usr/include/$(DEB_HOST_MULTIARCH)/qt5/Qsci/
+	cp $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/include/$(DEB_HOST_MULTIARCH)/qt5/Qsci/*.h $(CURDIR)/debian/libqt5scintilla2-dev/usr/include/$(DEB_HOST_MULTIARCH)/qt5/Qsci/
 	rm -rf $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/include
-	mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/lib/*.so $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib
-	mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5/mkspecs/features/* $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features
+	cp $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/lib/*.so $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib
+	cp $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5/mkspecs/features/* $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features
 	cd designer-Qt5 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/libqt5scintilla2-designer install
 	mkdir -p $(CURDIR)/debian/libqt5scintilla2-l10n/usr/share/qt5/translations
-	mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5/translations/* $(CURDIR)/debian/libqt5scintilla2-l10n/usr/share/qt5/translations
+	cp $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5/translations/* $(CURDIR)/debian/libqt5scintilla2-l10n/usr/share/qt5/translations
 	mkdir -p $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/qsci/api/python
-	mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5/qsci/api/python/* $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/qsci/api/python
+	cp $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5/qsci/api/python/* $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/qsci/api/python
 	rm -rf $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5
-	mv $(CURDIR)/Python/buildqt5-$(shell py3versions -dv)/QScintilla2.api $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/api/python3
+	cp $(CURDIR)/Python/buildqt5-$(shell py3versions -dv)/QScintilla2.api $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/api/python3
 endif
 	cd designer-Qt4Qt5 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
 	for p in $(PYTHONS) ; do \
-                $(MAKE) -f debian/rules install-python-$$p;\
+                $(MAKE) -f debian/rules install-python-$$p || exit 1;\
         done
 
 binary-common:

More information about the Python-modules-commits mailing list