[Python-modules-commits] r10639 - in packages/pylons/trunk/debian (4 files)

[piotr at users.alioth.debian.org]

    Date: Tuesday, December 1, 2009 @ 21:03:10
  Author: piotr
Revision: 10639

* don't forget about controllers in the patch
* bump Standards-Version to 3.8.3 (no changes needed)

Added:
  packages/pylons/trunk/debian/README.source
Modified:
  packages/pylons/trunk/debian/changelog
  packages/pylons/trunk/debian/control
  packages/pylons/trunk/debian/patches/move_data_outside_site-packages.patch

Added: packages/pylons/trunk/debian/README.source
===================================================================
--- packages/pylons/trunk/debian/README.source	                        (rev 0)
+++ packages/pylons/trunk/debian/README.source	2009-12-01 21:03:10 UTC (rev 10639)
@@ -0,0 +1,2 @@
+This package uses the patch management system quilt as documented in
+/usr/share/doc/quilt/README.source.

Modified: packages/pylons/trunk/debian/changelog
===================================================================
--- packages/pylons/trunk/debian/changelog	2009-11-30 23:52:01 UTC (rev 10638)
+++ packages/pylons/trunk/debian/changelog	2009-12-01 21:03:10 UTC (rev 10639)
@@ -3,8 +3,9 @@
   * Move templates to /usr/share/paster_templates (closes: #526767)
     - depend on python-pastescript >= 1.7.3-5
   * Move media files to /usr/share/python-pylons/
+  * Bump Standards-Version to 3.8.3 (no changes needed)
 
- -- Piotr Ożarowski <piotr at debian.org>  Mon, 02 Nov 2009 22:12:36 +0100
+ -- Piotr Ożarowski <piotr at debian.org>  Mon, 30 Nov 2009 00:26:47 +0100
 
 pylons (0.9.7-1) unstable; urgency=low
 

Modified: packages/pylons/trunk/debian/control
===================================================================
--- packages/pylons/trunk/debian/control	2009-11-30 23:52:01 UTC (rev 10638)
+++ packages/pylons/trunk/debian/control	2009-12-01 21:03:10 UTC (rev 10639)
@@ -4,9 +4,9 @@
 Maintainer: Oleksandr Moskalenko <malex at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
  Piotr Ożarowski <piotr at debian.org>
-Build-Depends: debhelper (>= 5), python-all-dev, python-setuptools (>= 0.6b3-1~), quilt
-Build-Depends-Indep: python-support (>= 0.6.4)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5), quilt
+Build-Depends-Indep: python-support (>= 0.6.4), python-all, python-setuptools
+Standards-Version: 3.8.3
 XS-Python-Version: all
 Homepage: http://pylonshq.com/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pylons/trunk/

Modified: packages/pylons/trunk/debian/patches/move_data_outside_site-packages.patch
===================================================================
--- packages/pylons/trunk/debian/patches/move_data_outside_site-packages.patch	2009-11-30 23:52:01 UTC (rev 10638)
+++ packages/pylons/trunk/debian/patches/move_data_outside_site-packages.patch	2009-12-01 21:03:10 UTC (rev 10639)
@@ -1,3 +1,8 @@
+# moves non *.py files outside site-packages
+#
+# note that paster is modified in Debian to look for templates in
+# /usr/share/paster_templates/ so this part of the code doesn't have to
+# be patched
 Index: pylons-0.9.7/setup.py
 ===================================================================
 --- pylons-0.9.7.orig/setup.py
@@ -11,3 +16,38 @@
      test_suite='nose.collector',
      tests_require=tests_require,
      install_requires=[
+Index: pylons-0.9.7/pylons/middleware.py
+===================================================================
+--- pylons-0.9.7.orig/pylons/middleware.py
++++ pylons-0.9.7/pylons/middleware.py
+@@ -24,7 +24,7 @@ __all__ = ['ErrorDocuments', 'ErrorHandl
+ 
+ log = logging.getLogger(__name__)
+ 
+-media_path = os.path.join(os.path.dirname(__file__), 'media')
++media_path = '/usr/share/python-pylons/media/'
+ 
+ head_html = """\
+ <link rel="stylesheet" href="{{prefix}}/media/pylons/style/itraceback.css" \
+Index: pylons-0.9.7/pylons/commands.py
+===================================================================
+--- pylons-0.9.7.orig/pylons/commands.py
++++ pylons-0.9.7/pylons/commands.py
+@@ -169,7 +169,7 @@ class ControllerCommand(Command):
+     def command(self):
+         """Main command to create controller"""
+         try:
+-            file_op = FileOp(source_dir=('pylons', 'templates'))
++            file_op = FileOp(source_dir='/usr/share/paster_templates/pylons/')
+             try:
+                 name, directory = file_op.parse_path_name_args(self.args[0])
+             except:
+@@ -276,7 +276,7 @@ class RestControllerCommand(Command):
+     def command(self):
+         """Main command to create controller"""
+         try:
+-            file_op = FileOp(source_dir=('pylons', 'templates'))
++            file_op = FileOp(source_dir='/usr/share/paster_templates/pylons/')
+             try:
+                 singularname, singulardirectory = \
+                     file_op.parse_path_name_args(self.args[0])