[Python-apps-commits] r3720 - in packages/sabnzbdplus/trunk/debian (6 files)

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

    Date: Saturday, September 12, 2009 @ 19:50:48
  Author: jcfp-guest
Revision: 3720

Prepare for 2.6

Added:
  packages/sabnzbdplus/trunk/debian/patches/05_force_python_version.dpatch
Modified:
  packages/sabnzbdplus/trunk/debian/README.source
  packages/sabnzbdplus/trunk/debian/changelog
  packages/sabnzbdplus/trunk/debian/patches/00list
  packages/sabnzbdplus/trunk/debian/pyversions
  packages/sabnzbdplus/trunk/debian/rules

Modified: packages/sabnzbdplus/trunk/debian/README.source
===================================================================
--- packages/sabnzbdplus/trunk/debian/README.source	2009-09-10 21:25:59 UTC (rev 3719)
+++ packages/sabnzbdplus/trunk/debian/README.source	2009-09-12 19:50:48 UTC (rev 3720)
@@ -9,3 +9,17 @@
  * add it to debian/patches/00list
 
 See /usr/share/doc/dpatch/README.source.gz for more information.
+
+
+== Python 2.6 ==
+
+Some parts of the program do not work properly with Python 2.6
+yet, especially code written by various third parties and used
+by the developers. Upstream is aware of these issues and trying
+to make future releases 2.6-compatible, see:
+
+http://trac2.assembla.com/SABnzbd/ticket/247
+
+In the meantime, the packaging will restrict the supported
+Python versions to 2.5 and the main executable patched to point
+to /usr/bin/python2.5 rather than /usr/bin/python.

Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog	2009-09-10 21:25:59 UTC (rev 3719)
+++ packages/sabnzbdplus/trunk/debian/changelog	2009-09-12 19:50:48 UTC (rev 3720)
@@ -2,10 +2,15 @@
 
   * New upstream release.
   * Bumped Standards-Version to 3.8.3 (no changes needed).
-  * Adding patch:
+  * Adding patches:
     + debian/patches/08_disable_new_version_check.dpatch: disable new
       version check and remove the associated setting from all web
       interfaces. (Closes: #530628)
+    + debian/patches/05_force_python_version.dpatch: program doesn't
+      support Python 2.6 yet: force use of Python 2.5.
+  * Minor changes in debian/pyversions and debian/rules regarding
+    the exclusive use of Python 2.5.
+  * Documenting Python 2.6 compatibility issue in debian/README.source.
   * Updated man page.
   * Make the init script run later, so that all networking is already
     configured at startup. (LP: #402045)

Modified: packages/sabnzbdplus/trunk/debian/patches/00list
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/00list	2009-09-10 21:25:59 UTC (rev 3719)
+++ packages/sabnzbdplus/trunk/debian/patches/00list	2009-09-12 19:50:48 UTC (rev 3720)
@@ -1,5 +1,6 @@
 01_remove_script_headers.dpatch
 02_find_parts_in_usr_share.dpatch
 04_use_config_when_daemon.dpatch
+05_force_python_version.dpatch
 07_use_system_configobj.dpatch
 08_disable_new_version_check.dpatch

Added: packages/sabnzbdplus/trunk/debian/patches/05_force_python_version.dpatch
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/05_force_python_version.dpatch	                        (rev 0)
+++ packages/sabnzbdplus/trunk/debian/patches/05_force_python_version.dpatch	2009-09-12 19:50:48 UTC (rev 3720)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_force_python_version.dpatch by JCF Ploemen (jcfp) <linux at jp.pp.ru>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change the shebang line to point to /usr/bin/python2.5.
+
+ at DPATCH@
+diff -urNad sabnzbdplus-0.4.7~/SABnzbd.py sabnzbdplus-0.4.7/SABnzbd.py
+--- sabnzbdplus-0.4.7~/SABnzbd.py	2009-02-21 11:45:21.000000000 +0100
++++ sabnzbdplus-0.4.7/SABnzbd.py	2009-03-02 23:05:06.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python -OO
++#!/usr/bin/python2.5 -OO
+ # Copyright 2008-2009 The SABnzbd-Team <team at sabnzbd.org>
+ #
+ # This program is free software; you can redistribute it and/or


Property changes on: packages/sabnzbdplus/trunk/debian/patches/05_force_python_version.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/sabnzbdplus/trunk/debian/pyversions
===================================================================
--- packages/sabnzbdplus/trunk/debian/pyversions	2009-09-10 21:25:59 UTC (rev 3719)
+++ packages/sabnzbdplus/trunk/debian/pyversions	2009-09-12 19:50:48 UTC (rev 3720)
@@ -1 +1 @@
-2.4-2.5
+2.5

Modified: packages/sabnzbdplus/trunk/debian/rules
===================================================================
--- packages/sabnzbdplus/trunk/debian/rules	2009-09-10 21:25:59 UTC (rev 3719)
+++ packages/sabnzbdplus/trunk/debian/rules	2009-09-12 19:50:48 UTC (rev 3720)
@@ -47,7 +47,7 @@
 	dh_installdocs -i
 	dh_installman -i
 	dh_link -i
-	dh_pysupport -i
+	dh_pysupport -i -V2.5
 	dh_installinit -i -- defaults 98 02
 	dh_compress -i
 	dh_fixperms -i