[Python-modules-commits] r25328 - in packages/pyqt5/trunk/debian (changelog rules)

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

    Date: Thursday, August 1, 2013 @ 11:57:53
  Author: mitya57-guest
Revision: 25328

Install files to python3-dbus.mainloop.pyqt5{,-dbg} directly instead
of generating .install files. This fixes a problem of the -dbg package
being not installable because of unwanted debug-id files.

Modified:
  packages/pyqt5/trunk/debian/changelog
  packages/pyqt5/trunk/debian/rules

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2013-08-01 02:03:48 UTC (rev 25327)
+++ packages/pyqt5/trunk/debian/changelog	2013-08-01 11:57:53 UTC (rev 25328)
@@ -2,6 +2,9 @@
 
   * Update debian/copyright, thanks Paul Tagliamonte for comments.
   * Use xz compression for binary packages.
+  * Install files to python3-dbus.mainloop.pyqt5{,-dbg} directly instead
+    of generating .install files. This fixes a problem of the -dbg package
+    being not installable because of unwanted debug-id files.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Tue, 30 Jul 2013 16:44:16 +0400
 

Modified: packages/pyqt5/trunk/debian/rules
===================================================================
--- packages/pyqt5/trunk/debian/rules	2013-08-01 02:03:48 UTC (rev 25327)
+++ packages/pyqt5/trunk/debian/rules	2013-08-01 11:57:53 UTC (rev 25328)
@@ -106,7 +106,6 @@
 	dh_prep -a
 	dh_installdirs -a
 	#sed -i -e '/strip/ d' $(CURDIR)/build-$(DEFAULT_PYTHON)/designer/Makefile
-	rm -f $(CURDIR)/debian/python3-dbus.mainloop.pyqt5.install
 	# This is needed to enforce that the install-arch-% rules are
 	# not run in parallel. Both rules install into the same directory,
 	# and therefore might try to access the same files at the same time.
@@ -124,22 +123,17 @@
 d3_qt5_dbg = debian/python3-pyqt5-dbg
 
 install-arch-3.%:
-	$(MAKE) -C build-3.$* install \
-		INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
-	if [ -e $(CURDIR)/debian/tmp$(call py3_dbusmoddir,3.$*)/pyqt5.so ]; then \
-		mkdir -p $(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
-		mv $(CURDIR)/debian/tmp$(call py3_dbusmoddir,3.$*)/pyqt5.so \
-		$(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
-		echo 'usr/lib/python3.$*/dist-packages/*' >> $(CURDIR)/debian/python3-dbus.mainloop.pyqt5.install;\
-	fi
-
+	$(MAKE) -C build-3.$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C dbg-build-3.$* install INSTALL_ROOT=$(CURDIR)/$(d3_qt5_dbg) DESTDIR=$(CURDIR)/$(d3_qt5_dbg)
-	if [ -e $(CURDIR)/$(d3_qt5_dbg)$(call py3_dbusmoddir,3.$*)/pyqt5.so ]; then \
-		mkdir -p $(CURDIR)/debian/python3-dbus.mainloop.pyqt5-dbg/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
-		mv $(CURDIR)/debian/python3-pyqt5-dbg$(call py3_dbusmoddir,3.$*)/pyqt5.so \
-		$(CURDIR)/debian/python3-dbus.mainloop.pyqt5-dbg/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
-	fi
 
+	mkdir -p $(CURDIR)/debian/python3-dbus.mainloop.pyqt5/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
+	mv $(CURDIR)/debian/tmp$(call py3_dbusmoddir,3.$*)/pyqt5.so \
+	   $(CURDIR)/debian/python3-dbus.mainloop.pyqt5/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
+
+	mkdir -p $(CURDIR)/debian/python3-dbus.mainloop.pyqt5-dbg/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
+	mv $(CURDIR)/debian/python3-pyqt5-dbg$(call py3_dbusmoddir,3.$*)/pyqt5.so \
+	   $(CURDIR)/debian/python3-dbus.mainloop.pyqt5-dbg/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
+
 	# Don't initiate the uic/widget-plugins
 	touch $(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/PyQt5/uic/widget-plugins/.noinit
 	for module in opengl sql webkit xmlpatterns svg multimedia; do \
@@ -201,13 +195,6 @@
 	rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/share/sip
 	rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/lib/python3/dist-packages/PyQt5/uic
 	rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/lib/python3/dist-packages/dbus
-	rm -rf $(CURDIR)/debian/python3-dbus.mainloop.pyqt5/usr/bin
-	rm -rf $(CURDIR)/debian/python3-dbus.mainloop.pyqt5/usr/share/sip
-	rm -rf $(CURDIR)/debian/python3-dbus.mainloop.pyqt5/usr/lib/python3/dist-packages/PyQt5
-	rm -rf $(CURDIR)/debian/python3-dbus.mainloop.pyqt5/usr/lib/python3.*/dist-packages/PyQt5
-	rm -rf $(CURDIR)/debian/python3-dbus.mainloop.pyqt5-dbg/usr/lib/debug/usr/bin
-	rm -rf $(CURDIR)/debian/python3-dbus.mainloop.pyqt5-dbg/usr/lib/debug/usr/lib/python3/dist-packages/PyQt5
-	rm -rf $(CURDIR)/debian/python3-dbus.mainloop.pyqt5-dbg/usr/lib/debug/usr/lib/python3.*/dist-packages/PyQt5
 	rm -rf $(CURDIR)/debian/pyqt5-doc/usr/share/doc/pyqt5-doc/examples/webkit/googlechat
 	dh_fixperms
 	dh_compress -Xexamples