[pkg-freevo-commits] r110 - packages/freevo/trunk/debian/patches

[mennucc1 at alioth.debian.org]

Author: mennucc1
Date: 2008-03-25 14:30:49 +0000 (Tue, 25 Mar 2008)
New Revision: 110

Modified:
   packages/freevo/trunk/debian/patches/config_py.diff
   packages/freevo/trunk/debian/patches/local_conf_py_example_remarks.diff
Log:
update patches for freevo 1.8.0


Modified: packages/freevo/trunk/debian/patches/config_py.diff
===================================================================
--- packages/freevo/trunk/debian/patches/config_py.diff	2008-03-25 14:28:35 UTC (rev 109)
+++ packages/freevo/trunk/debian/patches/config_py.diff	2008-03-25 14:30:49 UTC (rev 110)
@@ -1,33 +1,28 @@
---- freevo-1.8.0~rc1/src/config.py.orig	2007-12-10 17:33:43.000000000 +0100
-+++ freevo-1.8.0~rc1/src/config.py	2008-01-19 18:42:24.000000000 +0100
-@@ -275,10 +275,11 @@
+--- freevo-1.8.0/src/config.py	2008-03-19 08:06:04.000000000 +0100
++++ freevo-1.8.0/src/config.py	2008-03-25 14:42:47.000000000 +0100
+@@ -293,7 +293,8 @@
      print 'about the parameter. Based on the information in that file, Freevo will guess'
      print 'some settings for your system. This takes place in a file called '
      print '\'freevo_config.py\'. Since this file may change from time to time, you should'
 -    print 'not edit this file. After freevo_config.py is loaded, Freevo will look for a file'
-+    print 'not edit this file. After freevo_config.py is loaded, Freevo will '
-+    print 'load the Debian specific /etc/freevo/debconf.py, and then it will look for a file'
++    print 'not edit this file. After freevo_config.py is loaded, Freevo will load'
++    print 'load the Debian specific \'/etc/freevo/debconf.py\', and then it will look for a file'
      print 'called \'local_conf.py\'. You can overwrite the variables from \'freevo_config.py\''
      print 'in here. There is an example for \'local_conf.py\' called \'local_conf.py.example\''
--    print 'in the Freevo distribution.'
-+    print 'in /etc/freevo '
-     print
-     print 'If you need more help, use the internal webserver to get more information'
-     print 'how to setup Freevo. To do this, you need to set'
-@@ -478,9 +479,9 @@
+     print 'in the Freevo distribution.'
+@@ -502,7 +503,10 @@
  #
  # Config file handling
  #
--cfgfilepath = ['.', os.path.expanduser('~/.freevo'), '/etc/freevo',
--                '/usr/local/etc/freevo']
--
+-cfgfilepath = ['.', os.path.expanduser('~/.freevo'), '/etc/freevo', '/usr/local/etc/freevo']
 +# Debian change : '.' may lead to unpredictable behaviours,
 +#  '/usr/local/etc/freevo' is redundant
 +cfgfilepath = [ os.path.expanduser('~/.freevo'), '/etc/freevo']
++ 
  
+ 
  #
- # Default settings
-@@ -608,6 +609,12 @@
+@@ -635,6 +639,12 @@
      print
      sys.exit(1)
  

Modified: packages/freevo/trunk/debian/patches/local_conf_py_example_remarks.diff
===================================================================
--- packages/freevo/trunk/debian/patches/local_conf_py_example_remarks.diff	2008-03-25 14:28:35 UTC (rev 109)
+++ packages/freevo/trunk/debian/patches/local_conf_py_example_remarks.diff	2008-03-25 14:30:49 UTC (rev 110)
@@ -1,23 +1,20 @@
---- freevo/local_conf.py.example.orig	2008-01-19 17:58:03.000000000 +0100
-+++ freevo/local_conf.py.example	2008-01-19 18:09:27.000000000 +0100
-@@ -10,7 +10,15 @@
- # freevo_config.py. freevo_config.py, which is usually installed in
+--- freevo-1.8.0/local_conf.py.example	2008-03-12 08:24:34.000000000 +0100
++++ freevo-1.8.0/local_conf.py.example	2008-03-25 14:50:23.000000000 +0100
+@@ -11,6 +11,13 @@
  # /usr/share/freevo, contains all the core settings.  To change the settings copy
  # this file to ~/.freevo/local_conf.py or /etc/freevo/local_conf.py
--# 
-+#
-+
+ #
 +# Debian specific note:
 +# the file /etc/freevo/debconf.py is loaded after freevo_config.py
 +# and before local_conf.py . It imports the variables 
 +# VIDEO_ITEMS AUDIO_ITEMS IMAGE_ITEMS TV_RECORD_DIR
 +# as are set using the debconf.
 +# Those variables may then be augmented here, by using the += operator.
-+
++#
  # It does not contain all the possible settings that you can change, see
  # freevo_config.py for all the possible settings. Also it does not contain
  # settings for the plug-ins, plug-ins contain their configuration information and
-@@ -627,6 +635,8 @@
+@@ -627,6 +634,8 @@
  # This is a list of items (e.g. directories, fxd files). The items themselves
  # can also be a list of (title, file)
  #
@@ -26,16 +23,16 @@
  # VIDEO_ITEMS = [
  #     ('action movies', '/freevo/movies/action'),
  #     ('funny stuff', '/freevo/movies/comedy'),
-@@ -706,6 +716,8 @@
- # can also be a list of (title, file)
+@@ -707,6 +716,8 @@
  #
  # To add webradio support, add fxd/webradio.fxd to this list
-+# 
-+# WARNING: see Debian specific note at beginning of this file
  #
++# WARNING: see Debian specific note at beginning of this file
++#
  # AUDIO_ITEMS = [
  #     ('Music Collection', '/freevo/audio/mp3'),
-@@ -753,6 +765,8 @@
+ #     'fxd/webradio.fxd',
+@@ -753,6 +764,8 @@
  # This is a list of items (e.g. directories, fxd files). The items itself
  # can also be a list of (title, file)
  #
@@ -44,13 +41,13 @@
  # IMAGE_ITEMS = [
  #     ('My Photos', '/freevo/images'),
  # ]
-@@ -1189,6 +1203,9 @@
+@@ -1155,6 +1168,9 @@
  # This is where recorded video is written.
  #
  # XXX the path doesn't work from the www cgi scripts!
 +#
 +# WARNING: see Debian specific note at beginning of this file
-+#
++# 
  # TV_RECORD_DIR = None
  
  # This will enable duplicate recording detection