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

[piotr at users.alioth.debian.org]

    Date: Wednesday, January 11, 2012 @ 21:23:32
  Author: piotr
Revision: 19999

* New upstream release
* ipython_0.11_compatibility patch removed (merged upstream)
* Minimum required versions of most dependencies updated
* python-markupsafe added to Depends

Modified:
  packages/pylons/trunk/debian/changelog
  packages/pylons/trunk/debian/control
  packages/pylons/trunk/debian/patches/series
Deleted:
  packages/pylons/trunk/debian/patches/ipython_0.11_compatibility.patch

Modified: packages/pylons/trunk/debian/changelog
===================================================================
--- packages/pylons/trunk/debian/changelog	2012-01-11 21:23:21 UTC (rev 19998)
+++ packages/pylons/trunk/debian/changelog	2012-01-11 21:23:32 UTC (rev 19999)
@@ -1,3 +1,12 @@
+pylons (1.0.1~rc1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * ipython_0.11_compatibility patch removed (merged upstream)
+  * Minimum required versions of most dependencies updated
+  * python-markupsafe added to Depends
+
+ -- Piotr Ożarowski <piotr at debian.org>  Tue, 10 Jan 2012 22:56:49 +0100
+
 pylons (1.0-2) unstable; urgency=low
 
   * Add ipython_0.11_compatibility patch (thanks to Julian Taylor)

Modified: packages/pylons/trunk/debian/control
===================================================================
--- packages/pylons/trunk/debian/control	2012-01-11 21:23:21 UTC (rev 19998)
+++ packages/pylons/trunk/debian/control	2012-01-11 21:23:32 UTC (rev 19999)
@@ -12,14 +12,15 @@
 
 Package: python-pylons
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-routes (>= 1.12),
- python-paste (>= 1.7.2), python-pastedeploy (>= 1.3.3), python-pastescript (>= 1.7.3-5~),
- python-webob (>= 0.9.6.1), python-weberror (>= 0.10.1), python-webtest (>= 1.1),
- python-beaker (>= 1.3), python-mako (>= 0.2.4), python-tempita (>= 0.2),
- python-formencode (>= 1.2.1), python-webhelpers (>= 0.6.4), python-decorator (>= 2.3.2),
- python-simplejson (>= 2.0.8), python-nose (>= 0.10.4), python-pkg-resources
+Depends: ${python:Depends}, ${misc:Depends}, python-routes (>= 1.12.3),
+ python-paste (>= 1.7.5.1), python-pastedeploy (>= 1.5.0), python-pastescript (>= 1.7.4.2),
+ python-webob (>= 1.1.1), python-weberror (>= 0.10.3), python-webtest (>= 1.3.1),
+ python-beaker (>= 1.5.4), python-mako (>= 0.5.0), python-tempita (>= 0.5.1),
+ python-formencode (>= 1.2.4), python-webhelpers (>= 0.6.4), python-decorator (>= 3.3.2),
+ python-simplejson (>= 2.2.1), python-nose (>= 1.1.2), python-pkg-resources,
+ python-markupsafe (>= 0.15)
 Recommends: python-sqlalchemy (>= 0.5) | python-sqlobject
-Suggests: python-jinja2, python-genshi (>= 0.4.4), python-cheetah (>= 1.0-1.1),
+Suggests: python-jinja2, python-genshi (>= 0.6), python-cheetah (>= 1.0-1.1),
  python-kid (>= 0.9.1-3), python-myghty (>= 1.1), python-pygments (>= 0.7),
  python-migrate, python-docutils (>= 0.4),
  ipython, libapache2-mod-wsgi

Deleted: packages/pylons/trunk/debian/patches/ipython_0.11_compatibility.patch
===================================================================
--- packages/pylons/trunk/debian/patches/ipython_0.11_compatibility.patch	2012-01-11 21:23:21 UTC (rev 19998)
+++ packages/pylons/trunk/debian/patches/ipython_0.11_compatibility.patch	2012-01-11 21:23:32 UTC (rev 19999)
@@ -1,22 +0,0 @@
-Index: pylons-0.10/pylons/commands.py
-===================================================================
---- pylons-0.10.orig/pylons/commands.py	2011-07-24 15:28:25.708719706 +0200
-+++ pylons-0.10/pylons/commands.py	2011-07-24 15:28:31.848719709 +0200
-@@ -514,10 +514,14 @@
-                 raise ImportError()
- 
-             # try to use IPython if possible
--            from IPython.Shell import IPShellEmbed
-+            try:
-+                from IPython.frontend.terminal.embed import InteractiveShellEmbed
-+                shell = InteractiveShellEmbed(banner2=banner)
-+            except ImportError:
-+                from IPython.Shell import IPShellEmbed
-+                shell = IPShellEmbed(argv=self.args)
-+                shell.set_banner(shell.IP.BANNER + '\n\n' + banner)
- 
--            shell = IPShellEmbed(argv=self.args)
--            shell.set_banner(shell.IP.BANNER + '\n\n' + banner)
-             try:
-                 shell(local_ns=locs, global_ns={})
-             finally:

Modified: packages/pylons/trunk/debian/patches/series
===================================================================
--- packages/pylons/trunk/debian/patches/series	2012-01-11 21:23:21 UTC (rev 19998)
+++ packages/pylons/trunk/debian/patches/series	2012-01-11 21:23:32 UTC (rev 19999)
@@ -1,2 +1 @@
 move_data_outside_site-packages.patch
-ipython_0.11_compatibility.patch