[pkg-freevo-commits] r209 - in packages/freevo/trunk/debian: . patches

Andrea Mennucci mennucc1 at alioth.debian.org
Thu Dec 23 18:59:06 UTC 2010 

Author: mennucc1
Date: 2010-12-23 18:59:02 +0000 (Thu, 23 Dec 2010)
New Revision: 209

Added:
   packages/freevo/trunk/debian/patches/force-python2.5.diff
   packages/freevo/trunk/debian/pyversions
Modified:
   packages/freevo/trunk/debian/changelog
   packages/freevo/trunk/debian/control
   packages/freevo/trunk/debian/patches/series
   packages/freevo/trunk/debian/patches/twisted-web-9.diff
   packages/freevo/trunk/debian/rules
Log:
freevo 1.9.0-7

Modified: packages/freevo/trunk/debian/changelog
===================================================================
--- packages/freevo/trunk/debian/changelog	2010-08-30 21:46:43 UTC (rev 208)
+++ packages/freevo/trunk/debian/changelog	2010-12-23 18:59:02 UTC (rev 209)
@@ -1,3 +1,17 @@
+freevo (1.9.0-7) unstable; urgency=high
+
+  * add 'Recommends: freevo' to python-freevo
+  * this version of freevo works fine with python2.5 but 
+    not with newer versions
+    - force /usr/bin/freevo.real to select python2.5
+    - set shebangs in scripts to /usr/bin/python2.5
+    - set pyversions to '2.5' , and B-D to python2.5
+  * all the above should also solve the bug
+    "package fails to upgrade properly from lenny"; thanks to
+    Lucas Nussbaum (Closes: #606782)
+
+ -- A Mennucc1 <mennucc1 at debian.org>  Thu, 23 Dec 2010 10:49:15 +0100
+
 freevo (1.9.0-6) unstable; urgency=low
 
   * fix Problem running imdb plugin from command line,
@@ -2,4 +16,7 @@
     thanks to Alessio Treglia (Closes: #511313).
+  * add a pyversions (>= 2.5) to avoid python-compile with Python 2.4
+    (for people upgrading from lenny)
+  * properly use all of the patch from svn11648
 
- --
+ -- A Mennucc1 <mennucc1 at debian.org>  Wed, 29 Sep 2010 21:43:02 +0200
 

Modified: packages/freevo/trunk/debian/control
===================================================================
--- packages/freevo/trunk/debian/control	2010-08-30 21:46:43 UTC (rev 208)
+++ packages/freevo/trunk/debian/control	2010-12-23 18:59:02 UTC (rev 209)
@@ -4,7 +4,7 @@
 Maintainer: Freevo Debian Dream Team <pkg-freevo-maint at lists.alioth.debian.org>
 Uploaders: Georg W. Leonhardt <leonhardt at geole.info>, A Mennucc1 <mennucc1 at debian.org>
 Build-Depends-Indep: po-debconf
-Build-Depends: cdbs (>= 0.4.48), python-all (>= 2.5), python-support, debhelper (>= 5.0.38), quilt, docbook
+Build-Depends: cdbs (>= 0.4.48), python-support (>= 0.90.0), python2.5, debhelper (>= 5.0.38), quilt, docbook
 Standards-Version: 3.9.1.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-freevo/packages/freevo/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-freevo/packages/freevo/trunk/
@@ -12,7 +12,7 @@
 
 Package: freevo
 Architecture: all
-Depends:  ${misc:Depends}, ${python:Depends},  python-freevo (= ${binary:Version}), freevo-data (= ${binary:Version}),  mplayer, lsdvd, console-tools | kbd, debconf, adduser, xinit
+Depends:  ${misc:Depends}, python-support (>= 0.90.0), python2.5, python-freevo (= ${binary:Version}), freevo-data (= ${binary:Version}),  mplayer, lsdvd, console-tools | kbd, debconf, adduser, xinit
 Recommends: cdparanoia, xine-ui, xmltv-util, libxmltv-perl
 Suggests: mencoder, libdvdcss2, lame, ttf-liberation | ttf-mscorefonts-installer, fbxine, flac, vorbis-tools, fbset, matrox-tools, nvram-wakeup
 Description: home theater framework - binaries
@@ -28,7 +28,8 @@
 Package: python-freevo
 Architecture: all
 Section: python
-Depends: ${misc:Depends}, ${python:Depends},  python-alsaaudio, python-libxml2, python-beautifulsoup (>= 3.0.1), python-html5lib, python-kaa-imlib2 (>= 0.2.2), python-kaa-metadata (>= 0.7.1), python-kaa-base (>= 0.4.0), python-pygame (>> 1.7.1release-4.1+b1), python-imaging, python-twisted (>= 2.5.0), python-sqlite
+Depends: ${misc:Depends}, python-support (>= 0.90.0), python2.5, python-alsaaudio, python-libxml2, python-beautifulsoup (>= 3.0.1), python-html5lib, python-kaa-imlib2 (>= 0.2.2), python-kaa-metadata (>= 0.7.1), python-kaa-base (>= 0.4.0), python-pygame (>> 1.7.1release-4.1+b1), python-imaging, python-twisted (>= 2.5.0), python-sqlite
+Recommends: freevo (= ${binary:Version})
 Description: home theater framework - Python modules
  Freevo is a complete home theater framework. It can operate as a
  Personal Video Recorder system for saving television input to disk, but

Added: packages/freevo/trunk/debian/patches/force-python2.5.diff
===================================================================
--- packages/freevo/trunk/debian/patches/force-python2.5.diff	                        (rev 0)
+++ packages/freevo/trunk/debian/patches/force-python2.5.diff	2010-12-23 18:59:02 UTC (rev 209)
@@ -0,0 +1,16 @@
+--- x/freevo~	2010-12-23 15:09:21.611940008 +0100
++++ x/freevo	2010-12-23 15:25:59.803867580 +0100
+@@ -177,6 +177,13 @@
+     """
+     get the newest version of python [ with freevo installed ]
+     """
++    #A.M.: this version of Freevo does not work with "the newest version",
++    #it needs python2.5
++    if check_freevo:
++        return '/usr/bin/python2.5', '/usr/lib/pymodules/python2.5/freevo'
++    else:
++        return '/usr/bin/python2.5'
++    #A.M. : the rest of the code is unused
+     _debug_('version=%r' % (sys.version))
+     if sys.hexversion >= 0x02040000:
+         # python seems to be ok

Modified: packages/freevo/trunk/debian/patches/series
===================================================================
--- packages/freevo/trunk/debian/patches/series	2010-08-30 21:46:43 UTC (rev 208)
+++ packages/freevo/trunk/debian/patches/series	2010-12-23 18:59:02 UTC (rev 209)
@@ -14,3 +14,4 @@
 imdb-html5lib.patch
 twisted-web-9.diff
 exit_0_if_running.diff
+force-python2.5.diff

Modified: packages/freevo/trunk/debian/patches/twisted-web-9.diff
===================================================================
--- packages/freevo/trunk/debian/patches/twisted-web-9.diff	2010-08-30 21:46:43 UTC (rev 208)
+++ packages/freevo/trunk/debian/patches/twisted-web-9.diff	2010-12-23 18:59:02 UTC (rev 209)
@@ -1,5 +1,56 @@
 #Bug: http://sourceforge.net/tracker/?func=detail&aid=2936634&group_id=46652&atid=446895
 #Author: A Mennucc
+--- x/src/www/htdocs/vlcwin.rpy	(revision 11647)
++++ x/src/www/htdocs/vlcwin.rpy	(revision 11648)
+@@ -33,9 +33,9 @@
+ import time
+ 
+ from www.web_types import HTMLResource, FreevoResource
+-from twisted.web.woven import page
++
++import config
+ import util
+-import config
+ import kaa.metadata as metadata
+ from twisted.web import static
+ 
+Index: x/src/www/htdocs/proginfo.rpy
+===================================================================
+--- x/src/www/htdocs/proginfo.rpy	(revision 11647)
++++ x/src/www/htdocs/proginfo.rpy	(revision 11648)
+@@ -33,7 +33,6 @@
+ import time
+ 
+ from www.web_types import HTMLResource, FreevoResource
+-from twisted.web.woven import page
+ 
+ import util.tv_util as tv_util
+ import util
+Index: x/src/www/htdocs/guidechannel.rpy
+===================================================================
+--- x/src/www/htdocs/guidechannel.rpy	(revision 11647)
++++ x/src/www/htdocs/guidechannel.rpy	(revision 11648)
+@@ -33,7 +33,6 @@
+ import time
+ import datetime
+ 
+-from twisted.web.woven import page
+ from twisted.web import static
+ 
+ import util.tv_util as tv_util
+Index: x/src/www/htdocs/fileinfo.rpy
+===================================================================
+--- x/src/www/htdocs/fileinfo.rpy	(revision 11647)
++++ x/src/www/htdocs/fileinfo.rpy	(revision 11648)
+@@ -32,8 +32,6 @@
+ import sys, os, stat, string, urllib
+ import time
+ 
+-from www.web_types import HTMLResource, FreevoResource
+-from twisted.web.woven import page
+ import util
+ import config
+ import kaa.metadata as metadata
 --- x/src/www/web_types.py.orig	2010-01-21 23:11:54.930969214 +0100
 +++ x/src/www/web_types.py	2010-01-21 23:23:34.342726782 +0100
 @@ -36,7 +36,6 @@
@@ -34,8 +85,8 @@
  class FreevoResource(Resource):
      """
      Base class of webpages which handels the authentication.
---- freevo/src/www/htdocs/guide.rpy~	2009-02-19 18:59:44.000000000 +0100
-+++ freevo/src/www/htdocs/guide.rpy	2010-01-21 23:29:00.274594734 +0100
+--- x/src/www/htdocs/guide.rpy~	2009-02-19 18:59:44.000000000 +0100
++++ x/src/www/htdocs/guide.rpy	2010-01-21 23:29:00.274594734 +0100
 @@ -32,7 +32,6 @@
  import sys, string
  import time

Added: packages/freevo/trunk/debian/pyversions
===================================================================
--- packages/freevo/trunk/debian/pyversions	                        (rev 0)
+++ packages/freevo/trunk/debian/pyversions	2010-12-23 18:59:02 UTC (rev 209)
@@ -0,0 +1 @@
+2.5

Modified: packages/freevo/trunk/debian/rules
===================================================================
--- packages/freevo/trunk/debian/rules	2010-08-30 21:46:43 UTC (rev 208)
+++ packages/freevo/trunk/debian/rules	2010-12-23 18:59:02 UTC (rev 209)
@@ -22,10 +22,10 @@
 
 install/freevo::
 
-	: # Replace all '#!' calls to python with /usr/bin/python
+	: # Replace all '#!' calls to python with /usr/bin/python2.5
 	: # and make them executable
-	for i in debian/tmp/usr/bin/freevo `find debian/tmp -type f -name "*py" `; do \
-	  sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
+	for i in debian/tmp/usr/bin/freevo debian/tmp/usr/share/freevo/htdocs/downloadurl `find debian/tmp -type f -name "*py" ` ; do \
+	  sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python2.5 \1,' \
 		"$$i" > "$$i.temp"; \
 	  if cmp --quiet "$$i" "$$i.temp"; then \
 	    rm -f "$$i.temp"; \

More information about the Pkg-freevo-commits mailing list