[Python-modules-commits] r18941 - in packages/sphinx/branches/1.1/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Saturday, October 15, 2011 @ 17:08:14
  Author: jwilk
Revision: 18941

Merge 1.0 -> 1.1.

Modified:
  packages/sphinx/branches/1.1/debian/changelog
  packages/sphinx/branches/1.1/debian/control
Deleted:
  packages/sphinx/branches/1.1/debian/pyversions

Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================
--- packages/sphinx/branches/1.1/debian/changelog	2011-10-15 17:05:39 UTC (rev 18940)
+++ packages/sphinx/branches/1.1/debian/changelog	2011-10-15 17:08:14 UTC (rev 18941)
@@ -39,8 +39,9 @@
     + Use a for loop in debian/rules to install all sphinx-* scripts.
     + Use ‘set -x’ for all for loops.
     + Run nosetests with --verbose --no-skip.
+  * Use XS-Python-Version instead of debian/pyversions.
 
- -- Jakub Wilk <jwilk at debian.org>  Sat, 15 Oct 2011 18:04:21 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 15 Oct 2011 19:03:26 +0200
 
 sphinx (1.0.8+dfsg-2) unstable; urgency=low
 

Modified: packages/sphinx/branches/1.1/debian/control
===================================================================
--- packages/sphinx/branches/1.1/debian/control	2011-10-15 17:05:39 UTC (rev 18940)
+++ packages/sphinx/branches/1.1/debian/control	2011-10-15 17:08:14 UTC (rev 18941)
@@ -13,6 +13,7 @@
   xvfb, xauth, python-webkit, libjs-jquery (>= 1.4), libjs-underscore,
   texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended,
   perl
+XS-Python-Version: >= 2.5
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sphinx/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sphinx/trunk/

Deleted: packages/sphinx/branches/1.1/debian/pyversions
===================================================================
--- packages/sphinx/branches/1.1/debian/pyversions	2011-10-15 17:05:39 UTC (rev 18940)
+++ packages/sphinx/branches/1.1/debian/pyversions	2011-10-15 17:08:14 UTC (rev 18941)
@@ -1 +0,0 @@
-2.5-