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

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

    Date: Wednesday, October 30, 2013 @ 09:53:45
  Author: mitya57-guest
Revision: 26316

py3_dbusmoddir is constant, no need to call it

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

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2013-10-30 09:33:15 UTC (rev 26315)
+++ packages/pyqt5/trunk/debian/changelog	2013-10-30 09:53:45 UTC (rev 26316)
@@ -12,6 +12,7 @@
   * Backport upstream patch to always apply passed qmake variables.
   * Pass --debug option to configure.py when doing debug builds.
   * Link with --as-needed.
+  * Simplify install code in debian/rules.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Mon, 21 Oct 2013 19:28:02 +0400
 

Modified: packages/pyqt5/trunk/debian/rules
===================================================================
--- packages/pyqt5/trunk/debian/rules	2013-10-30 09:33:15 UTC (rev 26315)
+++ packages/pyqt5/trunk/debian/rules	2013-10-30 09:53:45 UTC (rev 26316)
@@ -133,11 +133,11 @@
 	rm -rf $(CURDIR)/debian/tmp/usr/share/sip
 
 	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 \
+	mv $(CURDIR)/debian/tmp$(py3_dbusmoddir)/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 \
+	mv $(CURDIR)/debian/python3-pyqt5-dbg$(py3_dbusmoddir)/pyqt5.so \
 	   $(CURDIR)/debian/python3-dbus.mainloop.pyqt5-dbg/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
 
 	# Don't initiate the uic/widget-plugins