[Python-modules-commits] r7132 - in packages/python-qt4/trunk/debian (3 files)

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

    Date: Sunday, December 21, 2008 @ 16:51:16
  Author: ncommander-guest
Revision: 7132

* debian/rules:
  - Moved pyqtconfig.py installation to python-qt4.install
* debian/python-qt4.install
  - Install pyqtconfig.py files into python-qt4 vs. python-qt4-dev. 
    This is because python-qt4  is arch any, and python-qt4-dev is 
    arch all, and the config file can be different on different 
    architectures (i.e. ARM)

Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/python-qt4.install
  packages/python-qt4/trunk/debian/rules

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2008-12-21 14:36:25 UTC (rev 7131)
+++ packages/python-qt4/trunk/debian/changelog	2008-12-21 16:51:16 UTC (rev 7132)
@@ -11,12 +11,14 @@
         as floats on non-ARM architectures, and as doubles on ARM architectures.
       - Added handling of doubles on qreal != float for QLists
       - Modifed pyqtconfig from python-qt4-dev to python-qt4      
-  * debian/rules
-    - Modified debian/rules to install pyqtconfig.py files into
-      python-qt4 vs. python-qt4-dev. This is because python-qt4 
-      is arch any, and python-qt4-dev is arch all, and the config
-      file can be different on different architectures (i.e. ARM)
+  * debian/rules:
+    - Moved pyqtconfig.py installation to python-qt4.install
     - Standardized the uses of spaces and tabs
+  * debian/python-qt4.install
+    - Install pyqtconfig.py files into python-qt4 vs. python-qt4-dev. 
+      This is because python-qt4  is arch any, and python-qt4-dev is 
+      arch all, and the config file can be different on different 
+      architectures (i.e. ARM)
   * debian/control:
     - Added necessary conflict/replaces to python-qt4
 

Modified: packages/python-qt4/trunk/debian/python-qt4.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4.install	2008-12-21 14:36:25 UTC (rev 7131)
+++ packages/python-qt4/trunk/debian/python-qt4.install	2008-12-21 16:51:16 UTC (rev 7132)
@@ -12,4 +12,5 @@
 usr/lib/python*/site-packages/PyQt4/QtXml.so
 usr/lib/python*/site-packages/PyQt4/QtXmlPatterns.so
 usr/lib/python*/site-packages/PyQt4/uic/
+usr/lib/python*/site-packages/PyQt4/pyqtconfig.py
 usr/lib/qt4/*

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2008-12-21 14:36:25 UTC (rev 7131)
+++ packages/python-qt4/trunk/debian/rules	2008-12-21 16:51:16 UTC (rev 7132)
@@ -103,8 +103,6 @@
 	for v in ${PYTHONS}; do \
 		$(MAKE) -C build-$$v install \
 			INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp; \
-		mkdir -p debian/python-qt4/usr/lib/python$$v/site-packages/PyQt4;\
-		install -m 644 -o root -g root build-$$v/pyqtconfig.py debian/python-qt4/usr/lib/python$$v/site-packages/PyQt4;\
 	done
 
 	set -e; \