[Python-apps-commits] r6093 - in packages/phenny/trunk/debian (4 files)

[piotr at users.alioth.debian.org]

    Date: Sunday, September 12, 2010 @ 14:48:13
  Author: piotr
Revision: 6093

* Team upload.
* Drop 05_python-version.dpatch, set minimum required version via
  XS-Python-Version and use unversioned interpreter in shebang
  Closes: #596311

Modified:
  packages/phenny/trunk/debian/changelog
  packages/phenny/trunk/debian/control
  packages/phenny/trunk/debian/patches/00list
Deleted:
  packages/phenny/trunk/debian/patches/05_python-version.dpatch

Modified: packages/phenny/trunk/debian/changelog
===================================================================
--- packages/phenny/trunk/debian/changelog	2010-09-06 23:26:15 UTC (rev 6092)
+++ packages/phenny/trunk/debian/changelog	2010-09-12 14:48:13 UTC (rev 6093)
@@ -1,3 +1,12 @@
+phenny (2~hg28-2) unstable; urgency=low
+
+  * Team upload.
+  * Drop 05_python-version.dpatch, set minimum required version via
+    XS-Python-Version and use unversioned interpreter in shebang
+    Closes: #596311
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 12 Sep 2010 16:41:19 +0200
+
 phenny (2~hg28-1) unstable; urgency=low
 
   [ Noah Slater ]

Modified: packages/phenny/trunk/debian/control
===================================================================
--- packages/phenny/trunk/debian/control	2010-09-06 23:26:15 UTC (rev 6092)
+++ packages/phenny/trunk/debian/control	2010-09-12 14:48:13 UTC (rev 6093)
@@ -5,10 +5,11 @@
 Uploaders: Noah Slater <nslater at tumbolia.org>
 Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 7.2.11), dpatch
-Build-Depends-Indep: help2man, python-support (>= 0.6.4), python2.5
+Build-Depends-Indep: help2man, python-support (>= 0.6.4), python
 Homepage: http://inamidst.com/phenny/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/phenny/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/phenny/trunk/
+XS-Python-Version: >= 2.5
 
 Package: phenny
 Architecture: all

Modified: packages/phenny/trunk/debian/patches/00list
===================================================================
--- packages/phenny/trunk/debian/patches/00list	2010-09-06 23:26:15 UTC (rev 6092)
+++ packages/phenny/trunk/debian/patches/00list	2010-09-12 14:48:13 UTC (rev 6093)
@@ -2,7 +2,6 @@
 02_expand-home
 03_module-home
 04_module-import
-05_python-version
 06_catch-exception
 07_command-option
 08_default-configuration

Deleted: packages/phenny/trunk/debian/patches/05_python-version.dpatch
===================================================================
--- packages/phenny/trunk/debian/patches/05_python-version.dpatch	2010-09-06 23:26:15 UTC (rev 6092)
+++ packages/phenny/trunk/debian/patches/05_python-version.dpatch	2010-09-12 14:48:13 UTC (rev 6093)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_python-version.dpatch by  <nslater at tumbolia.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use and check for the correct version of Python.
-
- at DPATCH@
-diff -urNad phenny-2~hg28~/phenny phenny-2~hg28/phenny
---- phenny-2~hg28~/phenny	2009-04-27 19:32:51.000000000 +0100
-+++ phenny-2~hg28/phenny	2009-05-04 18:29:04.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.5
- """
- phenny - An IRC Bot
- Copyright 2008, Sean B. Palmer, inamidst.com
-@@ -17,8 +17,8 @@
- dotdir = os.path.expanduser('~/.phenny')
- 
- def check_python_version(): 
--   if sys.version_info < (2, 4): 
--      error = 'Error: Requires Python 2.4 or later, from www.python.org'
-+   if sys.version_info < (2, 5):
-+      error = 'Error: Requires Python 2.5 or later, from www.python.org'
-       print >> sys.stderr, error
-       sys.exit(1)
-