[Python-modules-commits] r25664 - in packages/pyqt5/trunk/debian (7 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Thursday, August 22, 2013 @ 09:33:09
  Author: mitya57-guest
Revision: 25664

Update to 5.0.1 (part 2)

Added:
  packages/pyqt5/trunk/debian/patches/
  packages/pyqt5/trunk/debian/patches/libpython_multiarch.diff
  packages/pyqt5/trunk/debian/patches/series
Modified:
  packages/pyqt5/trunk/debian/changelog
  packages/pyqt5/trunk/debian/pyqt5-dev.install
  packages/pyqt5/trunk/debian/python3-pyqt5.install
  packages/pyqt5/trunk/debian/python3-pyqt5.qtquick.install

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2013-08-22 07:10:18 UTC (rev 25663)
+++ packages/pyqt5/trunk/debian/changelog	2013-08-22 09:33:09 UTC (rev 25664)
@@ -7,6 +7,7 @@
     extensions.
   * Install QtMultimediaWidgets extension.
   * Make pyqt5-doc recommend python3-pyqt5, because of the examples.
+  * Add a patch to support multiarch locations of libpython.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Thu, 22 Aug 2013 11:00:35 +0400
 

Added: packages/pyqt5/trunk/debian/patches/libpython_multiarch.diff
===================================================================
--- packages/pyqt5/trunk/debian/patches/libpython_multiarch.diff	                        (rev 0)
+++ packages/pyqt5/trunk/debian/patches/libpython_multiarch.diff	2013-08-22 09:33:09 UTC (rev 25664)
@@ -0,0 +1,16 @@
+Description: support multiarch locations of libpython
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Last-Update: 2013-08-22
+Forwarded: yes
+
+--- a/configure.py
++++ b/configure.py
+@@ -1179,6 +1179,8 @@
+ 
+         if glob.glob('%s/lib/libpython%d.%d*' % (ducfg['exec_prefix'], py_major, py_minor)):
+             lib_dir_flag = qmake_quote('-L%s/lib' % ducfg['exec_prefix'])
++        elif glob.glob('%s/lib/%s/libpython%d.%d*' % (ducfg['exec_prefix'], ducfg['MULTIARCH'], py_major, py_minor)):
++            lib_dir_flag = qmake_quote('-L%s/lib/%s' % (ducfg['exec_prefix'], ducfg['MULTIARCH']))
+         elif glob.glob('%s/libpython%d.%d*' % (ducfg['LIBDIR'], py_major, py_minor)):
+             lib_dir_flag = qmake_quote('-L%s' % ducfg['LIBDIR'])
+         else:

Added: packages/pyqt5/trunk/debian/patches/series
===================================================================
--- packages/pyqt5/trunk/debian/patches/series	                        (rev 0)
+++ packages/pyqt5/trunk/debian/patches/series	2013-08-22 09:33:09 UTC (rev 25664)
@@ -0,0 +1 @@
+libpython_multiarch.diff

Modified: packages/pyqt5/trunk/debian/pyqt5-dev.install
===================================================================
--- packages/pyqt5/trunk/debian/pyqt5-dev.install	2013-08-22 07:10:18 UTC (rev 25663)
+++ packages/pyqt5/trunk/debian/pyqt5-dev.install	2013-08-22 09:33:09 UTC (rev 25664)
@@ -1,2 +1 @@
-#usr/share/sip/PyQt5
-sip/* usr/share/sip/PyQt5
+usr/share/sip/*

Modified: packages/pyqt5/trunk/debian/python3-pyqt5.install
===================================================================
--- packages/pyqt5/trunk/debian/python3-pyqt5.install	2013-08-22 07:10:18 UTC (rev 25663)
+++ packages/pyqt5/trunk/debian/python3-pyqt5.install	2013-08-22 09:33:09 UTC (rev 25664)
@@ -1,7 +1,6 @@
 usr/lib/python3*/*-packages/PyQt5/Qt.so
 usr/lib/python3*/*-packages/PyQt5/QtCore.so
 usr/lib/python3*/*-packages/PyQt5/QtDBus.so
-#usr/lib/python3*/*-packages/PyQt5/QtDeclarative.so
 usr/lib/python3*/*-packages/PyQt5/QtDesigner.so
 usr/lib/python3*/*-packages/PyQt5/QtGui.so
 usr/lib/python3*/*-packages/PyQt5/QtHelp.so
@@ -12,5 +11,4 @@
 usr/lib/python3*/*-packages/PyQt5/QtTest.so
 usr/lib/python3*/*-packages/PyQt5/QtWidgets.so
 usr/lib/python3*/*-packages/PyQt5/__init__.py
-#usr/lib/python3*/*-packages/PyQt5/pyqtconfig*.py
 usr/lib/python3*/*-packages/PyQt5/uic/*

Modified: packages/pyqt5/trunk/debian/python3-pyqt5.qtquick.install
===================================================================
--- packages/pyqt5/trunk/debian/python3-pyqt5.qtquick.install	2013-08-22 07:10:18 UTC (rev 25663)
+++ packages/pyqt5/trunk/debian/python3-pyqt5.qtquick.install	2013-08-22 09:33:09 UTC (rev 25664)
@@ -1,2 +1,3 @@
 usr/lib/python3*/*-packages/PyQt5/QtQml.so
 usr/lib/python3*/*-packages/PyQt5/QtQuick.so
+usr/lib/*/qt5/plugins/PyQt5/libpyqt5qmlplugin.so