[Python-modules-commits] r28227 - in packages/sip4/trunk/debian (changelog rules)

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

    Date: Tuesday, March 18, 2014 @ 06:49:27
  Author: mitya57-guest
Revision: 28227

debian/rules: Drop Python 2.5 compatibility code.

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

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2014-03-18 06:47:03 UTC (rev 28226)
+++ packages/sip4/trunk/debian/changelog	2014-03-18 06:49:27 UTC (rev 28227)
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Bump API version to 11.0.
+  * debian/rules: Drop Python 2.5 compatibility code.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Tue, 18 Mar 2014 10:40:51 +0400
 

Modified: packages/sip4/trunk/debian/rules
===================================================================
--- packages/sip4/trunk/debian/rules	2014-03-18 06:47:03 UTC (rev 28226)
+++ packages/sip4/trunk/debian/rules	2014-03-18 06:49:27 UTC (rev 28227)
@@ -25,14 +25,6 @@
 PYTHONS	:= $(shell pyversions -vr) $(shell py3versions -vr)
 PYTHON3S := $(shell py3versions -vr)
 
--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
-
 .PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
 
 configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
@@ -42,7 +34,7 @@
 	mkdir -p build-$*
 	cd build-$* \
 		&& python$* ../configure.py \
-			-d /usr/lib/python$*/$(call py_sitename,$*) \
+			-d /usr/lib/python$*/dist-packages \
 			-u STRIP="" CFLAGS="${CFLAGS} ${CPPFLAGS}" CFLAGS_RELEASE="" \
 			CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" CXXFLAGS_RELEASE="" \
 			LFLAGS="${LDFLAGS}" LFLAGS_RELEASE=""
@@ -53,7 +45,7 @@
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* \
 		&& python$*-dbg ../configure.py \
-			-d /usr/lib/python$*/$(call py_sitename,$*) \
+			-d /usr/lib/python$*/dist-packages \
 			-e /usr/include/python$*_d \
 			-u CFLAGS="${CFLAGS} ${CPPFLAGS}" CFLAGS_RELEASE="" \
 			CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" CXXFLAGS_RELEASE="" \
@@ -139,17 +131,17 @@
 install-arch-2%:
 	$(MAKE) -C build-2$* install DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C dbg-build-2$* install DESTDIR=$(CURDIR)/debian/python-sip-dbg
-	mkdir -p debian/python-sip/usr/lib/python2$*/$(call py_sitename,2$*)/
-	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip/usr/lib/python2$*/$(call py_sitename,2$*)/
-	install -m 644 -o root -g root build-2$*/sipconfig.py debian/python-sip/usr/lib/python2$*/$(call py_sitename,2$*)/sipconfig_nd.py
-	install -m 644 -o root -g root dbg-build-2$*/sipconfig.py debian/python-sip-dbg/usr/lib/python2$*/$(call py_sitename,2$*)/sipconfig_d.py
+	mkdir -p debian/python-sip/usr/lib/python2$*/dist-packages/
+	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip/usr/lib/python2$*/dist-packages/
+	install -m 644 -o root -g root build-2$*/sipconfig.py debian/python-sip/usr/lib/python2$*/dist-packages/sipconfig_nd.py
+	install -m 644 -o root -g root dbg-build-2$*/sipconfig.py debian/python-sip-dbg/usr/lib/python2$*/dist-packages/sipconfig_d.py
 	mkdir -p debian/python-sip-dev/usr/include/python2$*
 	install -m 644 -o root -g root siplib/sip.h debian/python-sip-dev/usr/include/python2$*/
 	mkdir -p debian/python-sip-dev/usr/include/python2$*_d
 	ln -s ../python2$*/sip.h \
 	    debian/python-sip-dev/usr/include/python2$*_d/sip.h
-	mkdir -p debian/python-sip-dev/usr/lib/python2$*/$(call py_sitename,2$*)
-	install -m 644 -o root -g root sipdistutils.py debian/python-sip-dev/usr/lib/python2$*/$(call py_sitename,2$*)
+	mkdir -p debian/python-sip-dev/usr/lib/python2$*/dist-packages
+	install -m 644 -o root -g root sipdistutils.py debian/python-sip-dev/usr/lib/python2$*/dist-packages
 
 
 # Must not depend on anything. This is to be called by