[Python-modules-commits] r28230 - in packages/python-qt4/trunk/debian (changelog rules)

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

    Date: Tuesday, March 18, 2014 @ 07:33:22
  Author: mitya57-guest
Revision: 28230

debian/rules: Drop Python 2.5 compatibility code.

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

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2014-03-18 07:29:23 UTC (rev 28229)
+++ packages/python-qt4/trunk/debian/changelog	2014-03-18 07:33:22 UTC (rev 28230)
@@ -9,6 +9,7 @@
   * debian/patches/config_extra_headers.diff: drop, applied upstream.
   * debian/patches/phonon_cfgtest.diff: drop, fixed differently upstream.
   * Refresh and rebase other patches.
+  * debian/rules: Drop Python 2.5 compatibility code.
   * debian/watch: Fix DFSG version mangling.
 
  -- Bernd Zeimetz <bzed at debian.org>  Thu, 13 Feb 2014 23:21:10 +0100

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2014-03-18 07:29:23 UTC (rev 28229)
+++ packages/python-qt4/trunk/debian/rules	2014-03-18 07:33:22 UTC (rev 28230)
@@ -4,14 +4,6 @@
 
 export 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
-
 py_dbusmoddir = $(shell python$(1) -c 'import dbus.mainloop; print dbus.mainloop.__path__[0]')
 py3_dbusmoddir = $(shell python3 -c 'import dbus.mainloop; print(dbus.mainloop.__path__[0])')
 
@@ -74,7 +66,7 @@
 	mkdir -p build-$*
 	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 $@
@@ -85,7 +77,7 @@
 	cd dbg-build-$* && python$*-dbg ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
 			-m $(shell python$*-dbg-config --configdir) \
 			-l /usr/include/python$*$(if $(filter 3.%, $*),dm,_d) \
-			-d /usr/lib/python$*/$(call py_sitename, $*) \
+			-d /usr/lib/python$*/dist-packages \
 			--debug --no-designer-plugin
 	touch $@
 
@@ -207,19 +199,19 @@
 	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/$(d_qt4_dbg)
 
 	# Don't initiate the uic/widget-plugins
-	touch $(CURDIR)/debian/tmp/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/uic/widget-plugins/.noinit
+	touch $(CURDIR)/debian/tmp/usr/lib/python$*/dist-packages/PyQt4/uic/widget-plugins/.noinit
 
-	mv $(d_qt4_dbg)/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/pyqtconfig.py \
-		$(d_qt4_dbg)/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/pyqtconfig_d.py
-	mkdir -p debian/python-qt4-gl-dbg/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
-	mv $(d_qt4_dbg)/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/QtOpenGL.so \
-		debian/python-qt4-gl-dbg/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
-	mkdir -p debian/python-qt4-sql-dbg/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
-	mv $(d_qt4_dbg)/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/QtSql.so \
-		debian/python-qt4-sql-dbg/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
-	mkdir -p debian/python-qt4-phonon-dbg/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
-	mv $(d_qt4_dbg)/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/phonon.so \
-		debian/python-qt4-phonon-dbg/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
+	mv $(d_qt4_dbg)/usr/lib/python$*/dist-packages/PyQt4/pyqtconfig.py \
+		$(d_qt4_dbg)/usr/lib/python$*/dist-packages/PyQt4/pyqtconfig_d.py
+	mkdir -p debian/python-qt4-gl-dbg/usr/lib/python$*/dist-packages/PyQt4
+	mv $(d_qt4_dbg)/usr/lib/python$*/dist-packages/PyQt4/QtOpenGL.so \
+		debian/python-qt4-gl-dbg/usr/lib/python$*/dist-packages/PyQt4
+	mkdir -p debian/python-qt4-sql-dbg/usr/lib/python$*/dist-packages/PyQt4
+	mv $(d_qt4_dbg)/usr/lib/python$*/dist-packages/PyQt4/QtSql.so \
+		debian/python-qt4-sql-dbg/usr/lib/python$*/dist-packages/PyQt4
+	mkdir -p debian/python-qt4-phonon-dbg/usr/lib/python$*/dist-packages/PyQt4
+	mv $(d_qt4_dbg)/usr/lib/python$*/dist-packages/PyQt4/phonon.so \
+		debian/python-qt4-phonon-dbg/usr/lib/python$*/dist-packages/PyQt4
 
 	if [ -e $(d_qt4_dbg)$(call py_dbusmoddir,$*)/qt.so ]; then \
 		mkdir -p debian/python-qt4-dbus-dbg/$(call py_dbusmoddir,$*);\