[Python-modules-commits] r5485 - in packages/pastescript/trunk/debian (4 files)

[piotr at users.alioth.debian.org]

    Date: Tuesday, May 27, 2008 @ 22:09:24
  Author: piotr
Revision: 5485

* Revert my last changes in paster script:
  + paster has to be a Python script or --reload will not work
    (closes: #482968)
  + don't depend on all supported Python versions, override lintian errors
    for now (until I'll find a better solution)

Modified:
  packages/pastescript/trunk/debian/changelog
  packages/pastescript/trunk/debian/dirs
  packages/pastescript/trunk/debian/paster
  packages/pastescript/trunk/debian/rules

Modified: packages/pastescript/trunk/debian/changelog
===================================================================
--- packages/pastescript/trunk/debian/changelog	2008-05-27 22:07:33 UTC (rev 5484)
+++ packages/pastescript/trunk/debian/changelog	2008-05-27 22:09:24 UTC (rev 5485)
@@ -1,3 +1,13 @@
+pastescript (1.6.2-4) unstable; urgency=low
+
+  * Revert my last changes in paster script:
+    + paster has to be a Python script or --reload will not work
+      (closes: #482968)
+    + don't depend on all supported Python versions, override lintian errors
+      for now (until I'll find a better solution)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Tue, 27 May 2008 23:25:11 +0200
+
 pastescript (1.6.2-3) unstable; urgency=low
 
   * Replace python-setuptools with python-pkg-resources in Depends

Modified: packages/pastescript/trunk/debian/dirs
===================================================================
--- packages/pastescript/trunk/debian/dirs	2008-05-27 22:07:33 UTC (rev 5484)
+++ packages/pastescript/trunk/debian/dirs	2008-05-27 22:09:24 UTC (rev 5485)
@@ -1,3 +1,4 @@
 /usr/bin
 /usr/share/paster_templates
 /usr/share/doc/python-pastescript/docs
+/usr/share/lintian/overrides

Modified: packages/pastescript/trunk/debian/paster
===================================================================
--- packages/pastescript/trunk/debian/paster	2008-05-27 22:07:33 UTC (rev 5484)
+++ packages/pastescript/trunk/debian/paster	2008-05-27 22:09:24 UTC (rev 5485)
@@ -8,5 +8,5 @@
 	echo "Please install python$VERSION package" >&2
 	exit 1
 else
-	exec python$VERSION -c "import sys; sys.argv[0] = 'paster$VERSION'; from paste.script import command; command.run()" $@
+	exec python$VERSION -c "import sys; sys.argv[0] = '/usr/bin/paster$VERSION'; from paste.script import command; command.run()" $@
 fi

Modified: packages/pastescript/trunk/debian/rules
===================================================================
--- packages/pastescript/trunk/debian/rules	2008-05-27 22:07:33 UTC (rev 5484)
+++ packages/pastescript/trunk/debian/rules	2008-05-27 22:09:24 UTC (rev 5485)
@@ -37,8 +37,11 @@
 	# python-support's namespace feature will handle this
 	rm -f $(PKGDIR)/usr/lib/python$*/site-packages/paste/__init__.py
 	# create /usr/bin/pasterX.Y symlink
-	dh_link /usr/bin/paster /usr/bin/paster$*
+	install -m 755 $(CURDIR)/scripts/paster $(PKGDIR)/usr/bin/paster$*
+	sed -i -e '1s,usr/bin/.*,usr/bin/python$*,' $(PKGDIR)/usr/bin/paster$*
 	dh_link /usr/share/man/man1/paster.1.gz /usr/share/man/man1/paster$*.1.gz
+	echo "python-pastescript: python-script-but-no-python-dep ./usr/bin/paster$*" \
+		>> $(PKGDIR)/usr/share/lintian/overrides/python-pastescript
 	# move templates outside site-packages
 	if [ ! -d $(PKGDIR)/usr/share/paster_templates/basic_package ]; then \
 		mv $(PKGDIR)/usr/lib/python$*/site-packages/paste/script/templates/* \
@@ -53,8 +56,8 @@
 	dh_installdocs -i
 	dh_link usr/share/doc/python-pastescript/docs /usr/share/doc/python-paste/docs/script
 	dh_installman -i 
-	dh_install debian/paster /usr/bin/
-	dh_pysupport -i
+	dh_install scripts/paster /usr/bin/
+	dh_pysupport -i -X/usr/bin/paster
 	dh_compress -i -X.py
 	dh_fixperms -i
 	dh_installdeb -i