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

mitya57-guest at users.alioth.debian.org mitya57-guest at users.alioth.debian.org
Sat Jul 27 10:58:51 UTC 2013


    Date: Saturday, July 27, 2013 @ 10:58:50
  Author: mitya57-guest
Revision: 25277

Now that we don't care about python < 2.5, use just dist-packages instead of 

Modified:
  packages/pyqt5/trunk/debian/rules

Modified: packages/pyqt5/trunk/debian/rules
===================================================================
--- packages/pyqt5/trunk/debian/rules	2013-07-27 09:21:59 UTC (rev 25276)
+++ packages/pyqt5/trunk/debian/rules	2013-07-27 10:58:50 UTC (rev 25277)
@@ -4,14 +4,6 @@
 
 export DH_OPTIONS=${EXTRA_DH_OPTIONS}
 
--include /usr/share/python/python.mk
-ifeq (,$(py_sitename))
-py_sitename = site-packages
-py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
-py_sitename_sh = $(py_sitename)
-py_libdir_sh = $(py_libdir)
-endif
-
 py3_dbusmoddir = $(shell python3 -c 'import dbus.mainloop; print(dbus.mainloop.__path__[0])')
 
 export QMAKESPEC=/usr/share/qt5/mkspecs/linux-g++
@@ -63,7 +55,7 @@
 	ln -s ../sip build-$*/sip
 	cd build-$* && python$* ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
 			-m $(shell python$*-config --configdir) \
-			-d /usr/lib/python$*/$(call py_sitename, $*) \
+			-d /usr/lib/python$*/dist-packages \
 			--dbus /usr/include/dbus-1.0 \
 			$(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin) 
 	touch $@
@@ -75,7 +67,7 @@
 	cd dbg-build-$* && python$*-dbg ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
 			-m $(shell python$*-dbg-config --configdir) \
 			-l /usr/include/python$*$(if $(filter 3.2, $*),dmu,dm) \
-			-d /usr/lib/python$*/$(call py_sitename, $*) \
+			-d /usr/lib/python$*/dist-packages \
 			--no-designer-plugin
 	touch $@
 




More information about the Python-modules-commits mailing list