[Python-modules-commits] r9874 - in packages/pastescript/trunk/debian (changelog control rules)

[piotr at users.alioth.debian.org]

    Date: Friday, September 25, 2009 @ 20:38:31
  Author: piotr
Revision: 9874

* python-setuptools replaced with python-pkg-resources dependency
  (closes: #546434)
* debian/rules cleanups:
  - $py_setup_install_args aka --install-layout=deb replaced with
    --install-lib
  - python.mk (optional) include removed
* Standards-Version bumped to 3.8.3 (no changes needed)

Modified:
  packages/pastescript/trunk/debian/changelog
  packages/pastescript/trunk/debian/control
  packages/pastescript/trunk/debian/rules

Modified: packages/pastescript/trunk/debian/changelog
===================================================================
--- packages/pastescript/trunk/debian/changelog	2009-09-25 13:34:13 UTC (rev 9873)
+++ packages/pastescript/trunk/debian/changelog	2009-09-25 20:38:31 UTC (rev 9874)
@@ -1,3 +1,15 @@
+pastescript (1.7.3-4) unstable; urgency=low
+
+  * python-setuptools replaced with python-pkg-resources dependency
+    (closes: #546434)
+  * debian/rules cleanups:
+    - $py_setup_install_args aka --install-layout=deb replaced with
+      --install-lib
+    - python.mk (optional) include removed
+  * Standards-Version bumped to 3.8.3 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Fri, 25 Sep 2009 21:51:18 +0200
+
 pastescript (1.7.3-3) unstable; urgency=low
 
   * Prepare for Python 2.6:

Modified: packages/pastescript/trunk/debian/control
===================================================================
--- packages/pastescript/trunk/debian/control	2009-09-25 13:34:13 UTC (rev 9873)
+++ packages/pastescript/trunk/debian/control	2009-09-25 20:38:31 UTC (rev 9874)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 5), dpatch
 Build-Depends-Indep: python-all (>= 2.3.5-11), python-support (>= 0.6.4),
  python-setuptools (>= 0.6b3-1~), python-sphinx, python-paste, python-pastedeploy
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://pythonpaste.org/script/
 XS-Python-Version: >= 2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pastescript/trunk/
@@ -15,7 +15,7 @@
 Package: python-pastescript
 Architecture: all
 Depends: ${python:Depends}, python-paste (>= 1.6-1),
- python-pastedeploy (>= 1.3.1-2), python-setuptools (>= 0.6b3)
+ python-pastedeploy (>= 1.3.1-2), python-pkg-resources
 Recommends: python-flup (>= 0.5-1), python-cheetah (>= 1.0-1.1)
 Suggests: python-cherrypy3 | python-cherrypy, libjs-jquery
 Description: serving web applications, creating file layouts for Python packages

Modified: packages/pastescript/trunk/debian/rules
===================================================================
--- packages/pastescript/trunk/debian/rules	2009-09-25 13:34:13 UTC (rev 9873)
+++ packages/pastescript/trunk/debian/rules	2009-09-25 20:38:31 UTC (rev 9874)
@@ -8,16 +8,6 @@
 
 include /usr/share/dpatch/dpatch.make
 
-# if $py_setup_install_args will contain "--install-layout=deb" dist-packages
-# will be used instead of site-packages for Python >= 2.6;
-# --install-layout=deb and python.mk are available since python >= 2.5.4-1~,
-# here's backwards compatible code:
--include /usr/share/python/python.mk
-ifeq (,$(py_libdir))
-    py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
-endif
-
-
 clean: unpatch
 	dh_testdir
 	dh_testroot
@@ -51,12 +41,13 @@
 	touch $@
 
 install-python%: patch
-	python$* setup.py install --root $(PKGDIR) \
-		--single-version-externally-managed $(py_setup_install_args)
+	python$* setup.py install --root $(PKGDIR) --prefix=/usr/ \
+		--install-lib=/usr/lib/python$*/site-packages \
+		--single-version-externally-managed
 	# pth file is not needed since all paste* packages are installed in the same directory
-	rm -f $(PKGDIR)/$(call py_libdir,$*)/PasteScript-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
+	rm -f $(PKGDIR)/usr/lib/python$*/site-packages/PasteScript-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
 	# python-support's namespace feature will handle this
-	rm -f $(PKGDIR)$(call py_libdir,$*)/paste/__init__.py
+	rm -f $(PKGDIR)/usr/lib/python$*/site-packages/paste/__init__.py
 	# create /usr/bin/pasterX.Y symlink
 	install -m 755 $(CURDIR)/scripts/paster $(PKGDIR)/usr/bin/paster$*
 	sed -i -e '1s,usr/bin/.*,usr/bin/python$*,' $(PKGDIR)/usr/bin/paster$*