[Python-apps-commits] r790 - in packages/phenny/trunk/debian (3 files)

[piotr at users.alioth.debian.org]

    Date: Sunday, March 9, 2008 @ 13:36:32
  Author: piotr
Revision: 790

* move python dependency to -Indep
* change hashbang only if default Python version is << 2.5

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

Modified: packages/phenny/trunk/debian/control
===================================================================
--- packages/phenny/trunk/debian/control	2008-03-09 13:11:04 UTC (rev 789)
+++ packages/phenny/trunk/debian/control	2008-03-09 13:36:32 UTC (rev 790)
@@ -4,8 +4,8 @@
 Maintainer: Noah Slater <nslater at bytesexual.org>
 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.0.37.2), python (>= 2.5) | python2.5
-Build-Depends-Indep: help2man, python-support (>= 0.6.4)
+Build-Depends: cdbs (>= 0.4.42), debhelper (>= 5.0.37.2)
+Build-Depends-Indep: help2man, python-support (>= 0.6.4), python (>= 2.5) | 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

Modified: packages/phenny/trunk/debian/patches/python-version.patch
===================================================================
--- packages/phenny/trunk/debian/patches/python-version.patch	2008-03-09 13:11:04 UTC (rev 789)
+++ packages/phenny/trunk/debian/patches/python-version.patch	2008-03-09 13:36:32 UTC (rev 790)
@@ -1,12 +1,6 @@
 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
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.5
- """
- phenny - An IRC Bot
- Copyright 2008, Sean B. Palmer, inamidst.com
 @@ -13,8 +13,8 @@
  dotdir = os.path.expanduser('~/.phenny')
  

Modified: packages/phenny/trunk/debian/rules
===================================================================
--- packages/phenny/trunk/debian/rules	2008-03-09 13:11:04 UTC (rev 789)
+++ packages/phenny/trunk/debian/rules	2008-03-09 13:36:32 UTC (rev 790)
@@ -31,7 +31,11 @@
 	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
-	help2man -N -n "An extensible IRC bot written in Python" ./phenny > phenny.1
+ifeq (old,$(shell dpkg --compare-versions "`pyversions -vd`" lt '2.5' && echo old))
+	# default Python version less than 2.5, lets change the hashbang
+	sed -i -e '1s/env python/python2.5/' debian/phenny/usr/bin/phenny
+endif
+	help2man -N -n "An extensible IRC bot written in Python" debian/phenny/usr/bin/phenny > phenny.1
 
 binary-install/phenny::
 	dh_pysupport -pphenny