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

[nslater-guest at users.alioth.debian.org]

    Date: Sunday, March 30, 2008 @ 22:41:14
  Author: nslater-guest
Revision: 885

Corrected Python 2.5 Depends and Build-Depends-Indep. Closes: #471617

Modified:
  packages/phenny/trunk/debian/changelog
  packages/phenny/trunk/debian/control
  packages/phenny/trunk/debian/patches/python-version.patch
  packages/phenny/trunk/debian/rules

Modified: packages/phenny/trunk/debian/changelog
===================================================================
--- packages/phenny/trunk/debian/changelog	2008-03-29 20:50:22 UTC (rev 884)
+++ packages/phenny/trunk/debian/changelog	2008-03-30 22:41:14 UTC (rev 885)
@@ -1,9 +1,10 @@
-phenny (2~hg11-2) UNRELEASED; urgency=low
+phenny (2~hg11-2) unstable; urgency=low
 
   * Added announce (NOTICE) functionality.
   * General standards improvement.
+  * Corrected Python 2.5 Depends and Build-Depends-Indep. Closes: #471617
 
- -- Noah Slater <nslater at bytesexual.org>  Fri, 21 Mar 2008 01:47:49 +0000
+ -- Noah Slater <nslater at bytesexual.org>  Sun, 30 Mar 2008 21:59:02 +0100
 
 phenny (2~hg11-1) unstable; urgency=low
 

Modified: packages/phenny/trunk/debian/control
===================================================================
--- packages/phenny/trunk/debian/control	2008-03-29 20:50:22 UTC (rev 884)
+++ packages/phenny/trunk/debian/control	2008-03-30 22:41:14 UTC (rev 885)
@@ -5,14 +5,14 @@
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Standards-Version: 3.7.3
 Build-Depends: cdbs (>= 0.4.42), debhelper (>= 5)
-Build-Depends-Indep: help2man, python-support (>= 0.6.4), python (>= 2.5) | python2.5
+Build-Depends-Indep: help2man, python-support (>= 0.6.4), python2.5
 Homepage: http://inamidst.com/phenny/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/phenny/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-apps/packages/phenny/trunk/?op=log
 
 Package: phenny
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python (>= 2.5) | python2.5
+Depends: ${python:Depends}, ${misc:Depends}
 Description: extensible IRC bot written in Python
  Phenny is a lightweight IRC bot with the usual facilities that one expects such
  as a Wordnet interface and thesaurus lookups. Modularly extensible with Python

Modified: packages/phenny/trunk/debian/patches/python-version.patch
===================================================================
--- packages/phenny/trunk/debian/patches/python-version.patch	2008-03-29 20:50:22 UTC (rev 884)
+++ packages/phenny/trunk/debian/patches/python-version.patch	2008-03-30 22:41:14 UTC (rev 885)
@@ -1,7 +1,13 @@
-diff -Nur phenny-2~hg9.orig/phenny phenny-2~hg9.orig.new/phenny
---- phenny-2~hg9.orig/phenny	2008-03-08 15:51:58.000000000 +0000
-+++ phenny-2~hg9.orig.new/phenny	2008-03-08 15:52:19.000000000 +0000
-@@ -13,8 +13,8 @@
+diff -Nur phenny-2~hg11.orig/phenny phenny-2~hg11.orig.new/phenny
+--- phenny-2~hg11.orig/phenny	2008-03-30 22:01:49.000000000 +0100
++++ phenny-2~hg11.orig.new/phenny	2008-03-30 22:02:09.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(): 

Modified: packages/phenny/trunk/debian/rules
===================================================================
--- packages/phenny/trunk/debian/rules	2008-03-29 20:50:22 UTC (rev 884)
+++ packages/phenny/trunk/debian/rules	2008-03-30 22:41:14 UTC (rev 885)
@@ -14,12 +14,14 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+DEB_PYTHON_COMPILE_VERSION = 2.5
+
 REPOSITORY_URI = static-http://inamidst.com/phenny/
 
 PACKAGE_NAME = phenny
 PACKAGE_VERSION = $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*~hg([^-]+).*,\1,p')
-PACKAGE_DIRECTORY=$(PACKAGE_NAME)-2~hg$(PACKAGE_VERSION).orig
-PACKAGE_FILENAME=$(PACKAGE_NAME)_2~hg$(PACKAGE_VERSION).orig.tar.gz
+PACKAGE_DIRECTORY = $(PACKAGE_NAME)-2~hg$(PACKAGE_VERSION).orig
+PACKAGE_FILENAME = $(PACKAGE_NAME)_2~hg$(PACKAGE_VERSION).orig.tar.gz
 
 clean::
 	find . -name '*\.pyc' -delete
@@ -31,9 +33,6 @@
 	chmod -R 644 debian/phenny/usr/share/python-support/phenny/phenny/*.py
 	chmod -R 644 debian/phenny/usr/share/python-support/phenny/phenny/modules/*.py
 	cp phenny debian/phenny/usr/bin
-ifeq (old,$(shell dpkg --compare-versions "`pyversions -vd`" lt '2.5' && echo old))
-	sed -i -e '1s/env python/python2.5/' debian/phenny/usr/bin/phenny # only add hashbang if needed
-endif
 	help2man -N -n "an extensible IRC bot written in Python" debian/phenny/usr/bin/phenny > phenny.1
 
 binary-install/phenny::