[Python-modules-commits] r18223 - in packages/pastescript/trunk/debian (7 files)

Sun Aug 21 17:33:23 UTC 2011

Date: Sunday, August 21, 2011 @ 17:33:21
  Author: piotr
Revision: 18223

* New upstream release
  - installs "tests" module into global namespace, removed in Debian package
  - no longer provides paste.script.wsgiserver (python-cherrypy removed from
    Suggests)
  - 01_disable_ez_setup.patch removed, no longer needed
* Add debian/paster.py script as upstream doesn't ship scripts dir anymore
* Let dh_sphinxdoc handle documentation files, python-sphinx build
  dependency bumped to 1.0.7+dfsg-1

Added:
  packages/pastescript/trunk/debian/paster.py
  packages/pastescript/trunk/debian/python-pastescript.pyremove
Modified:
  packages/pastescript/trunk/debian/changelog
  packages/pastescript/trunk/debian/control
  packages/pastescript/trunk/debian/patches/series
  packages/pastescript/trunk/debian/rules
Deleted:
  packages/pastescript/trunk/debian/patches/01_disable_ez_setup.patch

Modified: packages/pastescript/trunk/debian/changelog
===================================================================

--- packages/pastescript/trunk/debian/changelog	2011-08-20 18:47:32 UTC (rev 18222)
+++ packages/pastescript/trunk/debian/changelog	2011-08-21 17:33:21 UTC (rev 18223)
@@ -1,3 +1,16 @@
+pastescript (1.7.4.2-1) unstable; urgency=low
+
+  * New upstream release
+    - installs "tests" module into global namespace, removed in Debian package
+    - no longer provides paste.script.wsgiserver (python-cherrypy removed from
+      Suggests)
+    - 01_disable_ez_setup.patch removed, no longer needed
+  * Add debian/paster.py script as upstream doesn't ship scripts dir anymore
+  * Let dh_sphinxdoc handle documentation files, python-sphinx build
+    dependency bumped to 1.0.7+dfsg-1
+
+ -- Piotr OÅ¼arowski <piotr at debian.org>  Sat, 20 Aug 2011 20:49:59 +0200
+
 pastescript (1.7.3-7) unstable; urgency=low
 
   * Convert to dh_python2

Modified: packages/pastescript/trunk/debian/control
===================================================================
--- packages/pastescript/trunk/debian/control	2011-08-20 18:47:32 UTC (rev 18222)
+++ packages/pastescript/trunk/debian/control	2011-08-21 17:33:21 UTC (rev 18223)
@@ -5,7 +5,7 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: python-all (>= 2.6.6-3~),
- python-setuptools (>= 0.6b3-1~), python-sphinx, python-paste, python-pastedeploy
+ python-setuptools (>= 0.6b3-1~), python-sphinx (>= 1.0.7+dfsg-1~), python-paste, python-pastedeploy
 Standards-Version: 3.9.2
 Homepage: http://pythonpaste.org/script/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pastescript/trunk/
@@ -14,10 +14,10 @@
 
 Package: python-pastescript
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-paste (>= 1.3),
- python-pastedeploy, python-setuptools | python-distribute
-Suggests: python-cherrypy3 | python-cherrypy, python-flup (>= 0.5-1),
- python-cheetah (>= 1.0-1.1), libjs-jquery
+Depends: ${python:Depends}, ${misc:Depends},
+ python-paste (>= 1.3), python-pastedeploy,
+ python-setuptools | python-distribute
+Suggests: python-flup (>= 0.5-1), python-cheetah (>= 1.0-1.1), ${sphinxdoc:Depends}
 Description: serving web applications, creating file layouts for Python packages
  Paster is pluggable command-line frontend,
  including commands to setup package file layouts

Added: packages/pastescript/trunk/debian/paster.py
===================================================================
--- packages/pastescript/trunk/debian/paster.py	                        (rev 0)
+++ packages/pastescript/trunk/debian/paster.py	2011-08-21 17:33:21 UTC (rev 18223)
@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+from paste.script import command
+command.run()


Property changes on: packages/pastescript/trunk/debian/paster.py
___________________________________________________________________
Added: svn:executable
   + *

Deleted: packages/pastescript/trunk/debian/patches/01_disable_ez_setup.patch
===================================================================
--- packages/pastescript/trunk/debian/patches/01_disable_ez_setup.patch	2011-08-20 18:47:32 UTC (rev 18222)
+++ packages/pastescript/trunk/debian/patches/01_disable_ez_setup.patch	2011-08-21 17:33:21 UTC (rev 18223)
@@ -1,13 +0,0 @@
-# 01_disable_ez_setup.dpatch by Piotr OÅ¼arowski <piotr at debian.org>
-#
-# this patch disables ez_setup which is checking if proper setuptools
-# version is installed (we're forcing correct version via Build-Depends:)
-
---- pastescript-1.7.3.orig/setup.py
-+++ pastescript-1.7.3/setup.py
-@@ -1,5 +1,3 @@
--import ez_setup
--ez_setup.use_setuptools()
- from setuptools import setup, find_packages
- import re, os
- 

Modified: packages/pastescript/trunk/debian/patches/series
===================================================================
--- packages/pastescript/trunk/debian/patches/series	2011-08-20 18:47:32 UTC (rev 18222)
+++ packages/pastescript/trunk/debian/patches/series	2011-08-21 17:33:21 UTC (rev 18223)
@@ -1,3 +1,2 @@
 03_try_to_find_templates_in_system_dir.patch
 02_rename_templates_dir.patch
-01_disable_ez_setup.patch

Added: packages/pastescript/trunk/debian/python-pastescript.pyremove
===================================================================
--- packages/pastescript/trunk/debian/python-pastescript.pyremove	                        (rev 0)
+++ packages/pastescript/trunk/debian/python-pastescript.pyremove	2011-08-21 17:33:21 UTC (rev 18223)
@@ -0,0 +1 @@
+tests

Modified: packages/pastescript/trunk/debian/rules
===================================================================
--- packages/pastescript/trunk/debian/rules	2011-08-20 18:47:32 UTC (rev 18222)
+++ packages/pastescript/trunk/debian/rules	2011-08-21 17:33:21 UTC (rev 18223)
@@ -14,14 +14,13 @@
 	dh_clean build-docs $(PYVERS:%=install-python%) install-stamp PasteScript.egg-info/PKG-INFO
 
 build: build-docs
+build-indep: build-docs
+build-arch:
 
 build-docs:
 	dh_testdir
 	dh_installdirs
 	PYTHONPATH=. sphinx-build -N -q -E -b html docs/ $(PKGDIR)/usr/share/doc/python-pastescript/docs/
-	rm -rf $(PKGDIR)/usr/share/doc/python-pastescript/docs/.doctrees
-	dh_link /usr/share/javascript/jquery/jquery.js \
-		/usr/share/doc/python-pastescript/docs/_static/jquery.js
 	touch $@
 
 install: build install-stamp
@@ -46,7 +45,7 @@
 	rm -f $(PKGDIR)$(call py_libdir,$*)/PasteScript-*/namespace_packages.txt
 	rm -rf $(PKGDIR)$(call py_libdir,$*)/paste/script/paster-templates
 	# create /usr/bin/pasterX.Y symlink
-	install -m 755 $(CURDIR)/scripts/paster $(PKGDIR)/usr/bin/paster$*
+	install -m 755 $(CURDIR)/debian/paster.py $(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
 
@@ -55,8 +54,9 @@
 	dh_testroot -i
 	dh_installchangelogs -i docs/news.txt
 	dh_installdocs -i
+	dh_sphinxdoc -i
 	dh_installman -i
-	dh_install scripts/paster /usr/bin/
+	install -m 755 $(CURDIR)/debian/paster.py $(PKGDIR)/usr/bin/paster
 	dh_python2 -i
 	dh_compress -i -X.py -X.js
 	dh_fixperms -i


