[Python-modules-commits] r6801 - in packages/pastescript/trunk/debian (3 files)

[piotr at users.alioth.debian.org]

    Date: Thursday, October 30, 2008 @ 18:59:46
  Author: piotr
Revision: 6801

* Update patches/02_rename_templates_dir patch and debian/rules to handle
  new directory name
* Add lintian override for license.txt_tmpl (template detected as extra
  license file)

Modified:
  packages/pastescript/trunk/debian/changelog
  packages/pastescript/trunk/debian/patches/02_rename_templates_dir.dpatch
  packages/pastescript/trunk/debian/rules

Modified: packages/pastescript/trunk/debian/changelog
===================================================================
--- packages/pastescript/trunk/debian/changelog	2008-10-30 07:27:25 UTC (rev 6800)
+++ packages/pastescript/trunk/debian/changelog	2008-10-30 18:59:46 UTC (rev 6801)
@@ -1,9 +1,13 @@
 pastescript (1.7-1) unstable; urgency=low
 
   * New upstream release
+  * Update patches/02_rename_templates_dir patch and debian/rules to handle
+    new directory name
+  * Add lintian override for license.txt_tmpl (template detected as extra
+    license file)
   * Add bash completion for paster
 
- -- Piotr Ożarowski <piotr at debian.org>  Wed, 29 Oct 2008 23:04:47 +0100
+ -- Piotr Ożarowski <piotr at debian.org>  Thu, 30 Oct 2008 19:41:02 +0100
 
 pastescript (1.6.3-1) unstable; urgency=low
 

Modified: packages/pastescript/trunk/debian/patches/02_rename_templates_dir.dpatch
===================================================================
--- packages/pastescript/trunk/debian/patches/02_rename_templates_dir.dpatch	2008-10-30 07:27:25 UTC (rev 6800)
+++ packages/pastescript/trunk/debian/patches/02_rename_templates_dir.dpatch	2008-10-30 18:59:46 UTC (rev 6801)
@@ -4,14 +4,14 @@
 ## DP: paster's templates are outside site-packages in Debian
 
 @DPATCH@
-diff -urNad pastescript-1.6.1~/paste/script/templates.py pastescript-1.6.1/paste/script/templates.py
---- pastescript-1.6.1~/paste/script/templates.py	2008-01-06 18:45:37.000000000 +0100
-+++ pastescript-1.6.1/paste/script/templates.py	2008-01-06 20:07:37.000000000 +0100
-@@ -184,7 +184,7 @@
+diff -urNad pastescript-1.7~/paste/script/templates.py pastescript-1.7/paste/script/templates.py
+--- pastescript-1.7~/paste/script/templates.py	2008-10-29 03:51:41.000000000 +0100
++++ pastescript-1.7/paste/script/templates.py	2008-10-30 19:16:52.723091740 +0100
+@@ -185,7 +185,7 @@
  
  class BasicPackage(Template):
  
--    _template_dir = 'templates/basic_package'
+-    _template_dir = 'paster-templates/basic_package'
 +    _template_dir = '/usr/share/paster_templates/basic_package'
      summary = "A basic setuptools-enabled package"
      vars = [

Modified: packages/pastescript/trunk/debian/rules
===================================================================
--- packages/pastescript/trunk/debian/rules	2008-10-30 07:27:25 UTC (rev 6800)
+++ packages/pastescript/trunk/debian/rules	2008-10-30 18:59:46 UTC (rev 6801)
@@ -14,7 +14,7 @@
 	dh_testroot
 	rm -rf dist build
 	find . -name '*\.py[co]' -delete
-	dh_clean build-docs $(PYVERS:%=install-python%)
+	dh_clean build-docs $(PYVERS:%=install-python%) install-stamp
 
 build: patch build-docs
 
@@ -27,7 +27,18 @@
 	cp docs/*ini $(PKGDIR)/usr/share/doc/python-pastescript/docs/
 	touch $@
 
-install: build $(PYVERS:%=install-python%)
+install: build install-stamp
+
+install-stamp: $(PYVERS:%=install-python%)
+	dh_installdirs
+	cp -r $(CURDIR)/paste/script/paster-templates/* $(PKGDIR)/usr/share/paster_templates/
+	install -m 644 debian/paster.bash_completion $(PKGDIR)/etc/bash_completion.d/paster
+	dh_link usr/share/doc/python-pastescript/docs /usr/share/doc/python-paste/docs/script
+	# it's a template only, not an extra license file
+	echo "python-pastescript: extra-license-file usr/share/paster_templates/basic_package/docs/license.txt_tmpl" \
+		>> $(PKGDIR)/usr/share/lintian/overrides/python-pastescript
+	touch $@
+
 install-python%: patch
 	python$* setup.py install \
 		--single-version-externally-managed \
@@ -42,22 +53,14 @@
 	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/* \
-		   $(PKGDIR)/usr/share/paster_templates/;\
-	fi
-	rm -rf $(PKGDIR)/usr/lib/python$*/site-packages/paste/script/templates/
 
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
 	dh_installchangelogs -i docs/news.txt
 	dh_installdocs -i
-	dh_link usr/share/doc/python-pastescript/docs /usr/share/doc/python-paste/docs/script
 	dh_installman -i 
 	dh_install scripts/paster /usr/bin/
-	install -m 644 debian/paster.bash_completion $(PKGDIR)/etc/bash_completion.d/paster
 	dh_pysupport -i -X/usr/bin/paster
 	dh_compress -i -X.py
 	dh_fixperms -i