[pkg-freevo-commits] r118 - in packages/freevo/tags: . 1.8.0-1/debian 1.8.0-1/debian/patches

mennucc1 at alioth.debian.org mennucc1 at alioth.debian.org
Tue Mar 25 17:59:05 UTC 2008


Author: mennucc1
Date: 2008-03-25 17:59:04 +0000 (Tue, 25 Mar 2008)
New Revision: 118

Added:
   packages/freevo/tags/1.8.0-1/
   packages/freevo/tags/1.8.0-1/debian/NEWS
   packages/freevo/tags/1.8.0-1/debian/changelog
   packages/freevo/tags/1.8.0-1/debian/control
   packages/freevo/tags/1.8.0-1/debian/freevo.config
   packages/freevo/tags/1.8.0-1/debian/freevo.postinst
   packages/freevo/tags/1.8.0-1/debian/freevo.templates
   packages/freevo/tags/1.8.0-1/debian/patches/config_py.diff
   packages/freevo/tags/1.8.0-1/debian/patches/local_conf_py_example_remarks.diff
   packages/freevo/tags/1.8.0-1/debian/rules
Removed:
   packages/freevo/tags/1.8.0-1/debian/changelog
   packages/freevo/tags/1.8.0-1/debian/control
   packages/freevo/tags/1.8.0-1/debian/freevo.config
   packages/freevo/tags/1.8.0-1/debian/freevo.postinst
   packages/freevo/tags/1.8.0-1/debian/freevo.templates
   packages/freevo/tags/1.8.0-1/debian/patches/config_py.diff
   packages/freevo/tags/1.8.0-1/debian/patches/local_conf_py_example_remarks.diff
   packages/freevo/tags/1.8.0-1/debian/rules
Log:
add tagged 1.8.0-1


Copied: packages/freevo/tags/1.8.0-1 (from rev 107, packages/freevo/trunk)

Copied: packages/freevo/tags/1.8.0-1/debian/NEWS (from rev 116, packages/freevo/trunk/debian/NEWS)
===================================================================
--- packages/freevo/tags/1.8.0-1/debian/NEWS	                        (rev 0)
+++ packages/freevo/tags/1.8.0-1/debian/NEWS	2008-03-25 17:59:04 UTC (rev 118)
@@ -0,0 +1,27 @@
+freevo (1.8.0) unstable; urgency=low
+
+  * A significant change to the TV recording has been the replacement of the
+    record_schedule.xml with two files, schedule.pickle and
+    favorites.pickle. This means that unless the record_schedule.xml has
+    been saved to a safe place during the installation then you will lose
+    you favorites.
+
+    The Debian package will try to convert your schedule automatically;
+    if this fails, do the following:
+
+    cp .../record_schedule.xml ~/record_schedule.xml~oldformat
+    freevo recordserver stop
+    freevo convert_favorites ~/record_schedule.xml~oldformat
+    freevo recordserver start
+    freevo schedulefavorites
+
+  * Other changes include the renaming of configuration variables;
+    to correct these do the following: use
+      freevo convert_config /etc/freevo/local_conf.py
+    to see the list of changes, and
+      freevo convert_config /etc/freevo/local_conf.py -w
+    to apply them.
+
+ -- A Mennucc1 <mennucc1 at debian.org>  Tue, 25 Mar 2008 14:34:07 +0100
+
+

Deleted: packages/freevo/tags/1.8.0-1/debian/changelog
===================================================================
--- packages/freevo/trunk/debian/changelog	2008-03-18 10:06:22 UTC (rev 107)
+++ packages/freevo/tags/1.8.0-1/debian/changelog	2008-03-25 17:59:04 UTC (rev 118)
@@ -1,130 +0,0 @@
-freevo (1.8.0~rc2-1) UNRELEASED; urgency=low
-
-  * New upstream release
-  * Update freevo.templates for correct creation off template.pot
-  * Fill out required fields in debian/po/template.pot
-  * Update german translation
-  * Add fr.po and pt.po
-  * Correct a little typo in README.debian
-  * Add debian/srcipts and move freevo.wrapper, freevo+log
-    into them for a better clearness
-  * Add freevo-doc.install and debian/rules: Use DEB_DH_INSTALL_ARGS
-    instead rm for exclusion off copyright files
-  * Add conflict freevo-common to package freevo-data for users 
-    they upgrade from geole.info
-  * Change my e-mail address
-  * corrected some lintian warnings
-
- -- Georg W. Leonhardt <leonhardt at geole.info>  Son, 16 Mar 2008 16:43:48 +0100
-
-freevo (1.8.0~rc1-1) unstable; urgency=low
-
-  * added  /usr/share/doc/freevo/README.Debian.gz 
-    with a lot of explanations (you should read that!)
-  * standard version to 3.7.3.0 and debian/control review
-  * correct typos in templates, and avoid asking things twice
-  * added many debconf questions re: data dirs, services to start...
-  * do not run 'freevo cache' in postinst (it takes ~ 40min)
-  * corrected most lintian warnings
-  * added /etc/init.d scripts
-  * fixed all permissions, so that services run as 'freevo' user
-  * rename .deb from freevo-common to freevo-data
-  
-  [Georg W. Leonhardt]
-  * New upstream release
-  * Add debian/freevo-common.linda-overrides and update debian/rules because
-    ethopool.ttf are free
-  * Bump versions off kaa-* dependencies
-  * Add initial manpage
-  * Add debian/watch
-  * Cleaning freevo.dir and remove freevo-common.dir
-  * Replace shipit vera*.tff / dejavu*.ttf with symlinks against system fonts
-  * debian/control: Add dependencies for ttf-bitstream-vera and ttf-dejavu
-
- -- A Mennucc1 <mennucc1 at debian.org>  Thu, 24 Jan 2008 22:57:16 +0100
-
-freevo (1.7.3-1) UNRELEASED; urgency=low
-
-  * New upstream release
-  * Add ucf support for automated handling of python_local.conf
-  * Extend templates, postinst and config to set paths of multimedia
-    files in python_local.conf and update german translation
-  * Refresh nocheck patch
-  * Add local_conf.py.example patch for bump version 5.17 to 5.2
-
- -- Georg W. Leonhardt <repo at geole.info>  Sun, 26 Aug 2007 19:28:45 +0200
-
-freevo (1.7.2-3) UNRELEASED; urgency=low
-
-  * Clean/update rules, freevo.install, freevo.desktop
-  * Remove freevo-doc.install
-  * Add freevo.xpm
-
- -- Georg W. Leonhardt <repo at geole.info>  Wed,  4 Jul 2007 14:19:32 +0200
-
-freevo (1.7.2-2) UNRELEASED; urgency=low
-
-  * Move README and TODO to usr/share/doc/freevo
-  * Change typo in control: Conflicts: python-lirc > Conflicts: freevo-lirc
-    in packages freevo-lirc
-  * Remove local_conf.py.patch from debian/patches
-
- -- Georg W. Leonhardt <repo at geole.info>  Tue,  3 Jul 2007 11:03:28 +0200
-
-freevo (1.7.2-1) UNRELEASED; urgency=low
-
-  * New upstream release
-  * Change build system to CDBS with pycentral
-
- -- Georg W. Leonhardt <repo at geole.info>  Sun,  1 Jul 2007 18:56:04 +0200
-
-freevo (1.7.1-1) UNRELEASED; urgency=low
-
-  * New upstream release.
-  * Add dependency debconf for package freevo
-  * Add dependency python for package freevo
-  * Add long descrition for package freevo-lirc
-  * Add Section: doc for package freevo-doc
-  * Add aquafusion icon licence to copyright and exclude file from deb
-  * Change Replaces: to Conflicts:
-  * Update freevo.templates
-
- -- Georg W. Leonhardt <repo at geole.info>  Fri, 11 May 2007 19:33:28 +0200
-
-freevo (1.7.0-3) UNRELEASED; urgency=low
-
-  * add dh_installinit for freevo/web/record server
-  * remove temporaly uncomplete ucf support
-  * change entries into freevo.templates
-
- -- Georg W. Leonhardt <repo at geole.info>  Mon, 16 Apr 2007 16:51:41 +0200
-
-freevo (1.7.0-2) UNRELEASED; urgency=low
-
-  * add ucf (not complete)
-  * add new entries into freevo.templates
-
- -- Georg W. Leonhardt <repo at geole.info>  Thu, 09 Mar 2007 19:23:31 +0100 
-
-freevo (1.7.0-1) UNRELEASED; urgency=low
-
-  * New upstream release.
-  * Set dh_compat to 5
-  * Replace python-mmpython with python-kaa*
-  * Add separeted packages for python-freevo, freevo-lirc, freevo-doc
-  * Add german translation for debconf
-
- -- Georg W. Leonhardt <repo at geole.info>  Wed, 07 Mar 2007 17:19:26 +0100
-
-freevo (1.6.0-1) UNRELEASED; urgency=low
-
-  [ Cyril Lacoux (Yack) ]
-  * New upstream release. (Closes: #398937)
-  * Added support for pysupport
-  * Changed all dependencie from python2.3-module to python-module
-
-  [ Julien Danjou ]
-  * Add quilt support
-
- -- Julien Danjou <acid at debian.org>  Mon, 20 Nov 2006 12:05:49 +0100
-

Copied: packages/freevo/tags/1.8.0-1/debian/changelog (from rev 117, packages/freevo/trunk/debian/changelog)
===================================================================
--- packages/freevo/tags/1.8.0-1/debian/changelog	                        (rev 0)
+++ packages/freevo/tags/1.8.0-1/debian/changelog	2008-03-25 17:59:04 UTC (rev 118)
@@ -0,0 +1,142 @@
+freevo (1.8.0-1) unstable; urgency=low
+
+  [ Georg W. Leonhardt ]
+  * New upstream release
+  * Update freevo.templates for correct creation of template.pot
+  * Fill out required fields in debian/po/template.pot
+  * [INTL:fr] French debconf templates translation",
+    thanks to Steve Petruzzello (Closes: #470242).
+  * [INTL:pt] Updated Portuguese translation for debconf messages,
+    thanks to Traduz - Portuguese Translation Team (Closes: #469927).
+  * [INTL:de] initial German debconf translation,
+    thanks to Helge Kreutzmann (Closes: #470819).
+  * Correct a little typo in README.debian
+  * Add debian/srcipts and move freevo.wrapper, freevo+log
+    into them for a better clearness
+  * Add freevo-doc.install and debian/rules: Use DEB_DH_INSTALL_ARGS
+    instead rm for exclusion off copyright files
+  * Add conflict freevo-common to package freevo-data for users 
+    they upgrade from geole.info
+  * Change my e-mail address
+  * Corrected some lintian warnings
+
+  [ A Mennucc1 ]
+  
+  * Add versioned dependency on kaa-base 0.4.0
+  * Bug fix: "python-xml removal: please drop/replace (build)
+    dependencies", thanks to Matthias Klose (Closes: #468586).
+  * Convert record_schedule.xml in freevo.postinst.
+
+ -- A Mennucc1 <mennucc1 at debian.org>  Tue, 25 Mar 2008 14:34:07 +0100
+
+freevo (1.8.0~rc1-1) unstable; urgency=low
+
+  * added  /usr/share/doc/freevo/README.Debian.gz 
+    with a lot of explanations (you should read that!)
+  * standard version to 3.7.3.0 and debian/control review
+  * correct typos in templates, and avoid asking things twice
+  * added many debconf questions re: data dirs, services to start...
+  * do not run 'freevo cache' in postinst (it takes ~ 40min)
+  * corrected most lintian warnings
+  * added /etc/init.d scripts
+  * fixed all permissions, so that services run as 'freevo' user
+  * rename .deb from freevo-common to freevo-data
+  
+  [Georg W. Leonhardt]
+  * New upstream release
+  * Add debian/freevo-common.linda-overrides and update debian/rules because
+    ethopool.ttf are free
+  * Bump versions off kaa-* dependencies
+  * Add initial manpage
+  * Add debian/watch
+  * Cleaning freevo.dir and remove freevo-common.dir
+  * Replace shipit vera*.tff / dejavu*.ttf with symlinks against system fonts
+  * debian/control: Add dependencies for ttf-bitstream-vera and ttf-dejavu
+
+ -- A Mennucc1 <mennucc1 at debian.org>  Thu, 24 Jan 2008 22:57:16 +0100
+
+freevo (1.7.3-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Add ucf support for automated handling of python_local.conf
+  * Extend templates, postinst and config to set paths of multimedia
+    files in python_local.conf and update german translation
+  * Refresh nocheck patch
+  * Add local_conf.py.example patch for bump version 5.17 to 5.2
+
+ -- Georg W. Leonhardt <repo at geole.info>  Sun, 26 Aug 2007 19:28:45 +0200
+
+freevo (1.7.2-3) UNRELEASED; urgency=low
+
+  * Clean/update rules, freevo.install, freevo.desktop
+  * Remove freevo-doc.install
+  * Add freevo.xpm
+
+ -- Georg W. Leonhardt <repo at geole.info>  Wed,  4 Jul 2007 14:19:32 +0200
+
+freevo (1.7.2-2) UNRELEASED; urgency=low
+
+  * Move README and TODO to usr/share/doc/freevo
+  * Change typo in control: Conflicts: python-lirc > Conflicts: freevo-lirc
+    in packages freevo-lirc
+  * Remove local_conf.py.patch from debian/patches
+
+ -- Georg W. Leonhardt <repo at geole.info>  Tue,  3 Jul 2007 11:03:28 +0200
+
+freevo (1.7.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Change build system to CDBS with pycentral
+
+ -- Georg W. Leonhardt <repo at geole.info>  Sun,  1 Jul 2007 18:56:04 +0200
+
+freevo (1.7.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Add dependency debconf for package freevo
+  * Add dependency python for package freevo
+  * Add long descrition for package freevo-lirc
+  * Add Section: doc for package freevo-doc
+  * Add aquafusion icon licence to copyright and exclude file from deb
+  * Change Replaces: to Conflicts:
+  * Update freevo.templates
+
+ -- Georg W. Leonhardt <repo at geole.info>  Fri, 11 May 2007 19:33:28 +0200
+
+freevo (1.7.0-3) UNRELEASED; urgency=low
+
+  * add dh_installinit for freevo/web/record server
+  * remove temporaly uncomplete ucf support
+  * change entries into freevo.templates
+
+ -- Georg W. Leonhardt <repo at geole.info>  Mon, 16 Apr 2007 16:51:41 +0200
+
+freevo (1.7.0-2) UNRELEASED; urgency=low
+
+  * add ucf (not complete)
+  * add new entries into freevo.templates
+
+ -- Georg W. Leonhardt <repo at geole.info>  Thu, 09 Mar 2007 19:23:31 +0100 
+
+freevo (1.7.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Set dh_compat to 5
+  * Replace python-mmpython with python-kaa*
+  * Add separeted packages for python-freevo, freevo-lirc, freevo-doc
+  * Add german translation for debconf
+
+ -- Georg W. Leonhardt <repo at geole.info>  Wed, 07 Mar 2007 17:19:26 +0100
+
+freevo (1.6.0-1) UNRELEASED; urgency=low
+
+  [ Cyril Lacoux (Yack) ]
+  * New upstream release. (Closes: #398937)
+  * Added support for pysupport
+  * Changed all dependencie from python2.3-module to python-module
+
+  [ Julien Danjou ]
+  * Add quilt support
+
+ -- Julien Danjou <acid at debian.org>  Mon, 20 Nov 2006 12:05:49 +0100
+

Deleted: packages/freevo/tags/1.8.0-1/debian/control
===================================================================
--- packages/freevo/trunk/debian/control	2008-03-18 10:06:22 UTC (rev 107)
+++ packages/freevo/tags/1.8.0-1/debian/control	2008-03-25 17:59:04 UTC (rev 118)
@@ -1,56 +0,0 @@
-Source: freevo
-Section: graphics
-Priority: optional
-Maintainer: Freevo Debian Dream Team <pkg-freevo-maint at lists.alioth.debian.org>
-Uploaders: Julien Danjou <acid at debian.org>, 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-dev (>= 2.4), python-central (>= 0.5), debhelper (>= 5.0.38), quilt
-Standards-Version: 3.7.3.0
-XS-Python-Version: all
-Vcs-Svn: svn://svn.debian.org/svn/pkg-freevo/freevo/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-freevo/freevo/
-Homepage: http://freevo.org/
-
-Package: freevo
-Architecture: all
-XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends},  python-freevo (= ${binary:Version}), freevo-data (= ${binary:Version}),  mplayer, lsdvd, console-tools, debconf, adduser
-Recommends: cdparanoia, xine-ui, xmltv-util, libxmltv-perl
-Suggests: mencoder, libdvdcss2, lame, msttcorefonts, fbxine, flac, vorbis-tools, fbset, matrox-tools, nvram-wakeup
-Description: A Python based PVR/DVR Framework for Music and Movies
- Freevo is an open-source home theatre PC platform based
- on Linux and a number of open-source audio/video tools.
- MPlayer and/or Xine can be used to play audio and video
- files in most popular formats. Freevo can be used both
- for a standalone PVR computer with a TV+remote,
- as well as on a regular desktop computer using the monitor and keyboard.
-
-Package: python-freevo
-Architecture: all
-Section: python
-XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends},  python-alsaaudio, python-xml, python-libxml2, python-beautifulsoup (>= 3.0.1), python-kaa-imlib2 (>= 0.2.2), python-kaa-metadata (>= 0.7.1), python-elementtree, python-pygame, python-imaging, python-twisted (>= 2.5.0), python-sqlite
-Description: Python modules for Freevo
- This package contains python modules for Freevo
-
-Package: freevo-data
-Architecture: all
-Recommends: freevo (= ${binary:Version})
-Depends: ttf-bitstream-vera, ttf-dejavu
-Conflicts: freevo-media, freevo-common (<< 1.8.0rc2)
-Description: Themes and non-application data for Freevo
- This package contains themes, fonts and other non-application data
- for Freevo.
-
-Package: freevo-lirc
-Architecture: all
-Depends: freevo (= ${binary:Version}), python-pylirc, lirc
-Description: Lirc control for Freevo
- This package add lirc support for Freevo.
-
-Package: freevo-doc
-Section: doc
-Architecture: all
-Recommends: freevo
-Description: Documentation for Freevo
- This package contains documentation files for Freevo.

Copied: packages/freevo/tags/1.8.0-1/debian/control (from rev 117, packages/freevo/trunk/debian/control)
===================================================================
--- packages/freevo/tags/1.8.0-1/debian/control	                        (rev 0)
+++ packages/freevo/tags/1.8.0-1/debian/control	2008-03-25 17:59:04 UTC (rev 118)
@@ -0,0 +1,56 @@
+Source: freevo
+Section: graphics
+Priority: optional
+Maintainer: Freevo Debian Dream Team <pkg-freevo-maint at lists.alioth.debian.org>
+Uploaders: Julien Danjou <acid at debian.org>, 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-dev (>= 2.4), python-central (>= 0.5), debhelper (>= 5.0.38), quilt
+Standards-Version: 3.7.3.0
+XS-Python-Version: all
+Vcs-Svn: svn://svn.debian.org/svn/pkg-freevo/freevo/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-freevo/freevo/
+Homepage: http://freevo.org/
+
+Package: freevo
+Architecture: all
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends},  python-freevo (= ${binary:Version}), freevo-data (= ${binary:Version}),  mplayer, lsdvd, console-tools, debconf, adduser
+Recommends: cdparanoia, xine-ui, xmltv-util, libxmltv-perl
+Suggests: mencoder, libdvdcss2, lame, msttcorefonts, fbxine, flac, vorbis-tools, fbset, matrox-tools, nvram-wakeup
+Description: A Python based PVR/DVR Framework for Music and Movies
+ Freevo is an open-source home theatre PC platform based
+ on Linux and a number of open-source audio/video tools.
+ MPlayer and/or Xine can be used to play audio and video
+ files in most popular formats. Freevo can be used both
+ for a standalone PVR computer with a TV+remote,
+ as well as on a regular desktop computer using the monitor and keyboard.
+
+Package: python-freevo
+Architecture: all
+Section: python
+XB-Python-Version: ${python:Versions}
+Depends:  python (>= 2.4), ${python:Depends},  python-alsaaudio, python-libxml2, python-beautifulsoup (>= 3.0.1), python-kaa-imlib2 (>= 0.2.2), python-kaa-metadata (>= 0.7.1), python-kaa-base (>= 0.4.0), python-elementtree, python-pygame, python-imaging, python-twisted (>= 2.5.0), python-sqlite
+Description: Python modules for Freevo
+ This package contains python modules for Freevo
+
+Package: freevo-data
+Architecture: all
+Recommends: freevo (= ${binary:Version})
+Depends: ttf-bitstream-vera, ttf-dejavu
+Conflicts: freevo-media, freevo-common (<< 1.8.0rc2)
+Description: Themes and non-application data for Freevo
+ This package contains themes, fonts and other non-application data
+ for Freevo.
+
+Package: freevo-lirc
+Architecture: all
+Depends: freevo (= ${binary:Version}), python-pylirc, lirc
+Description: Lirc control for Freevo
+ This package add lirc support for Freevo.
+
+Package: freevo-doc
+Section: doc
+Architecture: all
+Recommends: freevo
+Description: Documentation for Freevo
+ This package contains documentation files for Freevo.

Deleted: packages/freevo/tags/1.8.0-1/debian/freevo.config
===================================================================
--- packages/freevo/trunk/debian/freevo.config	2008-03-18 10:06:22 UTC (rev 107)
+++ packages/freevo/tags/1.8.0-1/debian/freevo.config	2008-03-25 17:59:04 UTC (rev 118)
@@ -1,40 +0,0 @@
-#!/bin/sh -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-db_capb backup
-
-state=1
-while [ "$state" -ge 1 -a "$state" -le 6 ]; do
-	case "$state" in
-	1)	db_input high freevo/display  || true
-		db_input high freevo/geometry || true
-		db_input high freevo/norm || true
-		db_input high freevo/chanlist || true
-		;;
-	2)	db_input high freevo/start_on_boot || true 
-	        db_input high freevo/services || true 
-		;;
-	3)	db_input low freevo/title_video || true
-		db_input low freevo/path_to_video || true
-		;;
-	4)	db_input low freevo/title_audio || true
-		db_input low freevo/path_to_audio || true
-		;;
-	5)	db_input low freevo/title_image || true
-		db_input low freevo/path_to_image || true
-		;;
-	6)	db_input low freevo/title_recordings || true
-		db_input low freevo/path_to_recordings || true
-		;;
-	esac
-
-	if db_go; then
-		state=$(($state + 1))
-	else
-		state=$(($state - 1))
-	fi
-done
-
-db_stop
-exit 0

Copied: packages/freevo/tags/1.8.0-1/debian/freevo.config (from rev 108, packages/freevo/trunk/debian/freevo.config)
===================================================================
--- packages/freevo/tags/1.8.0-1/debian/freevo.config	                        (rev 0)
+++ packages/freevo/tags/1.8.0-1/debian/freevo.config	2008-03-25 17:59:04 UTC (rev 118)
@@ -0,0 +1,39 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+db_capb backup
+
+state=1
+while [ "$state" -ge 1 -a "$state" -le 6 ]; do
+	case "$state" in
+	1)	db_input high freevo/display  || true
+		db_input high freevo/geometry || true
+		db_input high freevo/norm || true
+		db_input high freevo/chanlist || true
+		;;
+	2)	db_input high freevo/start_on_boot || true 
+	        db_input high freevo/services || true 
+		;;
+	3)	db_input low freevo/title_video || true
+		db_input low freevo/path_to_video || true
+		;;
+	4)	db_input low freevo/title_audio || true
+		db_input low freevo/path_to_audio || true
+		;;
+	5)	db_input low freevo/title_image || true
+		db_input low freevo/path_to_image || true
+		;;
+	6)      db_input low freevo/path_to_recordings || true
+		;;
+	esac
+
+	if db_go; then
+		state=$(($state + 1))
+	else
+		state=$(($state - 1))
+	fi
+done
+
+db_stop
+exit 0

Deleted: packages/freevo/tags/1.8.0-1/debian/freevo.postinst
===================================================================
--- packages/freevo/trunk/debian/freevo.postinst	2008-03-18 10:06:22 UTC (rev 107)
+++ packages/freevo/tags/1.8.0-1/debian/freevo.postinst	2008-03-25 17:59:04 UTC (rev 118)
@@ -1,159 +0,0 @@
-#!/bin/sh -e
-
-DAEMON=/usr/bin/freevo
-
-action="$1"
-
-#These variables affect how freevo works, if you want to really set
-# those, put them in /etc/default/freevo . See also /etc/freevo/debconf.sh
-unset OS_LOGDIR FREEVO_LOGDIR OS_STATICDIR FREEVO_STATICDIR OS_CACHEDIR FREEVO_CACHEDIR FREEVO_SHARE FREEVO_CONTRIB FREEVO_SCRIPT FREEVO_CONFIG DISPLAY LD_PRELOAD SDL_VIDEODRIVER FREEVO_LOCALE FREEVO_PYTHON
-
-. /etc/default/freevo
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-write_freevo_conf() {
-	db_get freevo/display
-	display="$RET"
-	db_get freevo/geometry
-	geometry="$RET"
-	db_get freevo/norm
-	norm="$RET"
-	db_get freevo/chanlist
-	chanlist="$RET"
-	$DAEMON.real setup	--geometry="$geometry" \
-			--display="$display" \
-			--tv="$norm" \
-			--chanlist="$chanlist" \
-			--sysfirst > /dev/null
-}
-
-create_dir() {
-    if test ! -e "$1" ; then
-	echo "Creating $2 directory $1 for freevo" 1>&2
-	mkdir --parents "$1"
-	#these two may fail if the dir is in a VFAT mount
-        chown freevo:freevo "$1" || true
-	chmod 775 "$1" || true
-    else
-	if test ! -d "$1" ; then
-	    echo "WARNING: freevo $2 directory should be $1 , " 1>&2
-	    echo "  but this latter exists and is not a directory - freevo will malfunction" 1>&2
-	else
-	  :  #TODO may check permissions and ownership
-	  :  # maybe using find "$1"  -maxdepth 0 -printf '%u' | grep -qx freevo 
-	fi
-    fi
-    su freevo -c "touch \"$1\"/.placeholder" ||	   {
-	echo "WARNING: 'freevo' user cannot create files in $2 directory  $1 , " 1>&2
-	echo "  freevo will malfunction  " 1>&2 ;  }
-}
-
-
-write_local_conf() {
-	create_dir $FREEVO_CACHEDIR cache
-	create_dir $FREEVO_LOGDIR log
-	create_dir $FREEVO_STATICDIR static
-
-	db_get freevo/title_video
-	title_video="$RET"
-	db_get freevo/path_to_video
-	path_to_video="$RET"
-	create_dir "$RET" video
-
-	db_get freevo/title_audio
-	title_audio="$RET"
-	db_get freevo/path_to_audio
-	path_to_audio="$RET"
-	create_dir "$RET" audio
-
-	db_get freevo/title_image
-	title_image="$RET"
-	db_get freevo/path_to_image
-	path_to_image="$RET"
-	create_dir "$RET" image
-
-	db_get freevo/path_to_recordings
-	path_to_recordings="$RET"
-	create_dir "$RET" recordings
-
-	uid=`id -u freevo`
-	gid=`id -g freevo`
-	uidgid () { echo "${1}_UID=$uid" ; echo "${1}_GID=$gid" ;  }
-	(
-	 exec > /etc/freevo/debconf.py
-	 echo '#This file is automatically generated by the freevo Debian package'
-         echo '#To change these values, run "dpkg-reconfigure freevo"'
-         echo '#To override or add to these values, edit /etc/freevo/local_conf.py'
-	 echo "VIDEO_ITEMS = [ ('$title_video', '$path_to_video') ]" 
-	 echo "AUDIO_ITEMS = [ ('$title_audio', '$path_to_audio') ]"
-	 echo "IMAGE_ITEMS = [ ('$title_image', '$path_to_image') ]"
-	 echo "TV_RECORD_DIR = '$path_to_recordings'"
-	 uidgid COMMDETECTSERVER
-	 uidgid ENCODINGSERVER
-	 uidgid RECORDSERVER
-	 uidgid RSSSERVER
-	 uidgid WEBSERVER
-	 echo "#note that FREEVO_UID and FREEVO_GID exist only in Debian code"
-	 uidgid FREEVO
-        )
-
-	db_get freevo/services
-	services=",$RET ,"
-
-	(
-	 exec > /etc/freevo/debconf.sh
-         echo '#This file is automatically generated by the freevo Debian package'
-         echo '#To change these values, run "dpkg-reconfigure freevo"'
-         echo '#To override or add to these values, edit /etc/default/freevo'
-	 uidgid FREEVO
-	 for s in xserver recordserver encodingserver webserver rssserver ; do
-	     S=`echo $s | tr 'a-z' 'A-Z'`
-	     case "$services" in 
-		 *$s*)  echo "START_FREEVO_${S}=1" ;;
-		 *)     echo "START_FREEVO_${S}=0" ;;
-	     esac
-	 done
-	)
-
-	LOCAL_CONF=/etc/freevo/local_conf.py
-	[ -r  $LOCAL_CONF ] || cp $LOCAL_CONF.example $LOCAL_CONF
-
-}
-
-freevo_cache() {
-	su freevo -c '$DAEMON.real cache'
-	find $FREEVO_CACHEDIR -type f -print0 | xargs -0 chmod 0664
-	find $FREEVO_CACHEDIR -type d -print0 | xargs -0 chmod 0775
-}
-
-case "$1" in
-	configure)
-          # creating group
-	  if ! getent group freevo >/dev/null; then
-            addgroup --system freevo
-	  fi
-
-          # creating user
-	  if ! getent passwd freevo > /dev/null ; then
-	    echo "Adding user  'freevo'." 1>&2
-	    adduser --ingroup freevo --quiet --home /home/freevo \
-	        --disabled-login --system freevo
-	  fi
-	  for a in cdrom audio plugdev ; do
-	      adduser --quiet freevo $a
-	  done
-
-	  write_freevo_conf
-	  write_local_conf
-
-	;;
-        abort-upgrade) ;;
-	*)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#

Copied: packages/freevo/tags/1.8.0-1/debian/freevo.postinst (from rev 115, packages/freevo/trunk/debian/freevo.postinst)
===================================================================
--- packages/freevo/tags/1.8.0-1/debian/freevo.postinst	                        (rev 0)
+++ packages/freevo/tags/1.8.0-1/debian/freevo.postinst	2008-03-25 17:59:04 UTC (rev 118)
@@ -0,0 +1,175 @@
+#!/bin/sh -e
+
+DAEMON=/usr/bin/freevo
+
+action="$1"
+
+#These variables affect how freevo works, if you want to really set
+# those, put them in /etc/default/freevo . See also /etc/freevo/debconf.sh
+unset OS_LOGDIR FREEVO_LOGDIR OS_STATICDIR FREEVO_STATICDIR OS_CACHEDIR FREEVO_CACHEDIR FREEVO_SHARE FREEVO_CONTRIB FREEVO_SCRIPT FREEVO_CONFIG DISPLAY LD_PRELOAD SDL_VIDEODRIVER FREEVO_LOCALE FREEVO_PYTHON
+
+. /etc/default/freevo
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+write_freevo_conf() {
+	db_get freevo/display
+	display="$RET"
+	db_get freevo/geometry
+	geometry="$RET"
+	db_get freevo/norm
+	norm="$RET"
+	db_get freevo/chanlist
+	chanlist="$RET"
+	$DAEMON.real setup	--geometry="$geometry" \
+			--display="$display" \
+			--tv="$norm" \
+			--chanlist="$chanlist" \
+			--sysfirst > /dev/null
+}
+
+create_dir() {
+    if test ! -e "$1" ; then
+	echo "Creating $2 directory $1 for freevo" 1>&2
+	mkdir --parents "$1"
+	#these two may fail if the dir is in a VFAT mount
+        chown freevo:freevo "$1" || true
+	chmod 775 "$1" || true
+    else
+	if test ! -d "$1" ; then
+	    echo "WARNING: freevo $2 directory should be $1 , " 1>&2
+	    echo "  but this latter exists and is not a directory - freevo will malfunction" 1>&2
+	else
+	  :  #TODO may check permissions and ownership
+	  :  # maybe using find "$1"  -maxdepth 0 -printf '%u' | grep -qx freevo 
+	fi
+    fi
+    su freevo -c "touch \"$1\"/.placeholder" ||	   {
+	echo "WARNING: 'freevo' user cannot create files in $2 directory  $1 , " 1>&2
+	echo "  freevo will malfunction  " 1>&2 ;  }
+}
+
+
+write_local_conf() {
+	create_dir $FREEVO_CACHEDIR cache
+	create_dir $FREEVO_LOGDIR log
+	create_dir $FREEVO_STATICDIR static
+
+	db_get freevo/title_video
+	title_video="$RET"
+	db_get freevo/path_to_video
+	path_to_video="$RET"
+	create_dir "$RET" video
+
+	db_get freevo/title_audio
+	title_audio="$RET"
+	db_get freevo/path_to_audio
+	path_to_audio="$RET"
+	create_dir "$RET" audio
+
+	db_get freevo/title_image
+	title_image="$RET"
+	db_get freevo/path_to_image
+	path_to_image="$RET"
+	create_dir "$RET" image
+
+	db_get freevo/path_to_recordings
+	path_to_recordings="$RET"
+	create_dir "$RET" recordings
+
+	uid=`id -u freevo`
+	gid=`id -g freevo`
+	uidgid () { echo "${1}_UID=$uid" ; echo "${1}_GID=$gid" ;  }
+	(
+	 exec > /etc/freevo/debconf.py
+	 echo '#This file is automatically generated by the freevo Debian package'
+         echo '#To change these values, run "dpkg-reconfigure freevo"'
+         echo '#To override or add to these values, edit /etc/freevo/local_conf.py'
+	 echo "VIDEO_ITEMS = [ ('$title_video', '$path_to_video') ]" 
+	 echo "AUDIO_ITEMS = [ ('$title_audio', '$path_to_audio') ]"
+	 echo "IMAGE_ITEMS = [ ('$title_image', '$path_to_image') ]"
+	 echo "TV_RECORD_DIR = '$path_to_recordings'"
+	 uidgid COMMDETECTSERVER
+	 uidgid ENCODINGSERVER
+	 uidgid RECORDSERVER
+	 uidgid RSSSERVER
+	 uidgid WEBSERVER
+	 echo "#note that FREEVO_UID and FREEVO_GID exist only in Debian code"
+	 uidgid FREEVO
+        )
+
+	db_get freevo/services
+	services=",$RET ,"
+
+	(
+	 exec > /etc/freevo/debconf.sh
+         echo '#This file is automatically generated by the freevo Debian package'
+         echo '#To change these values, run "dpkg-reconfigure freevo"'
+         echo '#To override or add to these values, edit /etc/default/freevo'
+	 uidgid FREEVO
+	 for s in xserver recordserver encodingserver webserver rssserver ; do
+	     S=`echo $s | tr 'a-z' 'A-Z'`
+	     case "$services" in 
+		 *$s*)  echo "START_FREEVO_${S}=1" ;;
+		 *)     echo "START_FREEVO_${S}=0" ;;
+	     esac
+	 done
+	)
+
+	LOCAL_CONF=/etc/freevo/local_conf.py
+	[ -r  $LOCAL_CONF ] || cp $LOCAL_CONF.example $LOCAL_CONF
+
+}
+
+freevo_cache() {
+	su freevo -c '$DAEMON.real cache'
+	find $FREEVO_CACHEDIR -type f -print0 | xargs -0 chmod 0664
+	find $FREEVO_CACHEDIR -type d -print0 | xargs -0 chmod 0775
+}
+
+update_record_schedule () {
+    a=${FREEVO_STATICDIR}/record_schedule.xml
+    if test -r $a ; then
+     t=`tempfile`
+     echo "Freevo: upgrading $a. (Log in $t)" 1>&2
+     ( exec  >  $t 2> $t
+       mv $a $a~oldformat
+       invoke-rc.d freevo_recordserver stop 
+       su freevo -c "freevo convert_favorites $a~oldformat"  
+       invoke-rc.d freevo_recordserver start
+       su freevo -c "freevo schedulefavorites" 
+     )
+    fi
+}
+
+case "$1" in
+	configure)
+          # creating group
+	  if ! getent group freevo >/dev/null; then
+            addgroup --system freevo
+	  fi
+
+          # creating user
+	  if ! getent passwd freevo > /dev/null ; then
+	    echo "Adding user  'freevo'." 1>&2
+	    adduser --ingroup freevo --quiet --home /home/freevo \
+	        --disabled-login --system freevo
+	  fi
+	  for a in cdrom audio plugdev ; do
+	      adduser --quiet freevo $a
+	  done
+
+	  write_freevo_conf
+	  write_local_conf
+          update_record_schedule
+
+	;;
+        abort-upgrade) ;;
+	*)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#

Deleted: packages/freevo/tags/1.8.0-1/debian/freevo.templates
===================================================================
--- packages/freevo/trunk/debian/freevo.templates	2008-03-18 10:06:22 UTC (rev 107)
+++ packages/freevo/tags/1.8.0-1/debian/freevo.templates	2008-03-25 17:59:04 UTC (rev 118)
@@ -1,155 +0,0 @@
-Template: freevo/display
-Type: select
-_Choices: x11, fbdev, dxr3, mga, directfb, dfbmga, dga
-_Description: Video output:
-
-Template: freevo/geometry
-Type: select
-_Choices: 800x600, 768x576, 640x480
-_Description: Output resolution:
- Choose the resolution to display Freevo at. Most Televisions should be
- configured as 768x576 (NTSC or PAL)
-
-Template: freevo/norm
-Type: select
-_Choices: ntsc, pal, secam
-_Description: TV Standard:
- Please choose your TV standard. North Americans should choose NTSC, most
- Europeans will choose PAL.
-
-Template: freevo/chanlist
-Type: select
-_Choices: us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, europe-east, italy, newzealand, australia, ireland, france, china-bcast, southafrica, argentina
-_Description: Channel List:
- Set the channel list (set of tuning frequencies) that most closely matches
- yours.
-
-Template: freevo/title_video
-_Default: Video folder
-Type: string
-_Description: Title of video folder:
- Set a title for the video folder. This will displayed by freevo in overview.
-
-Template: freevo/path_to_video
-_Default: /home/freevo/video
-Type: string
-_Description: Path to videos:
- Set the path to the video folder. Note: A absolute path is required.
-
-Template: freevo/title_audio
-_Default: Audio folder
-Type: string
-_Description: Title of audio folder:
- Set a title for the audio folder. This will displayed by freevo in overview.
-
-Template: freevo/path_to_audio
-_Default: /home/freevo/audio
-Type: string
-_Description: Path to audio folder:
- Set the path to the audio folder. Note: A absolute path is required.
-
-Template: freevo/title_image
-_Default: Image folder
-Type: string
-_Description: Title of image folder:
- Set a title for the image folder. This will displayed by freevo in overview.
-
-Template: freevo/path_to_image
-_Default: /home/freevo/image
-Type: string
-_Description: Path to image folder:
- Set the path to the image folder. Note: A absolute path is required.
-
-Template: freevo/path_to_recordings
-_Default: /home/freevo/recordings
-Type: string
-_Description: Path to recorded video folder:
- Set the path to the recordings folder. Note: A absolute path is required.
-
-Template: freevo/start_on_boot
-Type: note
-_Description: Start during boot
- Freevo can be started automatically at boot time (inside a dedicated xserver). Also web, encoding, rss and record server can be start automatically on bootup.
-
-Template: freevo/services
-Type: multiselect
-_Choices: xserver, recordserver, encodingserver, webserver, rssserver
-_Default: xserver, recordserver, encodingserver
-_Description: Services to start during boot:
- Choose the services you wish to start on boot.Template: freevo/display
-Type: select
-_Choices: x11, fbdev, dxr3, mga, directfb, dfbmga, dga
-_Description: Video output:
-
-Template: freevo/geometry
-Type: select
-_Choices: 800x600, 768x576, 640x480
-_Description: Output resolution:
- Choose the resolution to display Freevo at. Most Televisions should be
- configured as 768x576 (NTSC or PAL)
-
-Template: freevo/norm
-Type: select
-_Choices: ntsc, pal, secam
-_Description: TV Standard:
- Please choose your TV standard. North Americans should choose NTSC, most
- Europeans will choose PAL.
-
-Template: freevo/chanlist
-Type: select
-_Choices: us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, europe-east, italy, newzealand, australia, ireland, france, china-bcast, southafrica, argentina
-_Description: Channel List:
- Set the channel list (set of tuning frequencies) that most closely matches
- yours.
-
-Template: freevo/title_video
-Type: string
-_Description: Title of video folder:
- Set a title for the video folder. This will displayed by freevo in overview.
-
-Template: freevo/path_to_video
-Type: string
-_Default: /home/freevo/video
-_Description: Path to videos:
- Set the path to the video folder. Note: A absolute path is required.
-
-Template: freevo/title_audio
-Type: string
-_Default: Audio folder
-_Description: Title of audio folder:
- Set a title for the audio folder. This will displayed by freevo in overview.
-
-Template: freevo/path_to_audio
-Type: string
-_Default: /home/freevo/audio
-_Description: Path to audio folder:
- Set the path to the audio folder. Note: A absolute path is required.
-
-Template: freevo/title_image
-Type: string
-_Description: Title of image folder:
- Set a title for the image folder. This will displayed by freevo in overview.
-
-Template: freevo/path_to_image
-_Default: /home/freevo/image
-Type: string
-_Description: Path to image folder:
- Set the path to the image folder. Note: A absolute path is required.
-
-Template: freevo/path_to_recordings
-_Default: /home/freevo/recordings
-Type: string
-_Description: Path to recorded video folder:
- Set the path to the recordings folder. Note: A absolute path is required.
-
-Template: freevo/start_on_boot
-Type: note
-_Description: Start during boot
- Freevo can be started automatically at boot time (inside a dedicated xserver). Also web, encoding, rss and record server can be start automatically on bootup.
-
-Template: freevo/services
-Type: multiselect
-_Choices: xserver, recordserver, encodingserver, webserver, rssserver
-_Default: xserver, recordserver, encodingserver
-_Description: Services to start during boot:
- Choose the services you wish to start on boot.

Copied: packages/freevo/tags/1.8.0-1/debian/freevo.templates (from rev 109, packages/freevo/trunk/debian/freevo.templates)
===================================================================
--- packages/freevo/tags/1.8.0-1/debian/freevo.templates	                        (rev 0)
+++ packages/freevo/tags/1.8.0-1/debian/freevo.templates	2008-03-25 17:59:04 UTC (rev 118)
@@ -0,0 +1,79 @@
+Template: freevo/display
+Type: select
+_Choices: x11, fbdev, dxr3, mga, directfb, dfbmga, dga
+_Description: Video output:
+
+Template: freevo/geometry
+Type: select
+_Choices: 800x600, 768x576, 640x480
+_Description: Output resolution:
+ Choose the resolution to display Freevo at. Most Televisions should be
+ configured as 768x576 (NTSC or PAL)
+
+Template: freevo/norm
+Type: select
+_Choices: ntsc, pal, secam
+_Description: TV Standard:
+ Please choose your TV standard. North Americans should choose NTSC, most
+ Europeans will choose PAL.
+
+Template: freevo/chanlist
+Type: select
+_Choices: us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, europe-east, italy, newzealand, australia, ireland, france, china-bcast, southafrica, argentina
+_Description: Channel List:
+ Set the channel list (set of tuning frequencies) that most closely matches
+ yours.
+
+Template: freevo/title_video
+_Default: Video folder
+Type: string
+_Description: Title of video folder:
+ Set a title for the video folder. This will displayed by freevo in overview.
+
+Template: freevo/path_to_video
+_Default: /home/freevo/video
+Type: string
+_Description: Path to videos:
+ Set the path to the video folder. Note: A absolute path is required.
+
+Template: freevo/title_audio
+_Default: Audio folder
+Type: string
+_Description: Title of audio folder:
+ Set a title for the audio folder. This will displayed by freevo in overview.
+
+Template: freevo/path_to_audio
+_Default: /home/freevo/audio
+Type: string
+_Description: Path to audio folder:
+ Set the path to the audio folder. Note: A absolute path is required.
+
+Template: freevo/title_image
+_Default: Image folder
+Type: string
+_Description: Title of image folder:
+ Set a title for the image folder. This will displayed by freevo in overview.
+
+Template: freevo/path_to_image
+_Default: /home/freevo/image
+Type: string
+_Description: Path to image folder:
+ Set the path to the image folder. Note: A absolute path is required.
+
+Template: freevo/path_to_recordings
+_Default: /home/freevo/recordings
+Type: string
+_Description: Path to recorded video folder:
+ Set the path to the recordings folder. Note: A absolute path is required.
+
+Template: freevo/start_on_boot
+Type: note
+_Description: Start during boot
+ Freevo can be started automatically at boot time (inside a dedicated xserver). Also web, encoding, rss and record server can be start automatically on bootup.
+
+Template: freevo/services
+Type: multiselect
+_Choices: xserver, recordserver, encodingserver, webserver, rssserver
+_Default: xserver, recordserver, encodingserver
+_Description: Services to start during boot:
+ Choose the services you wish to start on boot.

Deleted: packages/freevo/tags/1.8.0-1/debian/patches/config_py.diff
===================================================================
--- packages/freevo/trunk/debian/patches/config_py.diff	2008-03-18 10:06:22 UTC (rev 107)
+++ packages/freevo/tags/1.8.0-1/debian/patches/config_py.diff	2008-03-25 17:59:04 UTC (rev 118)
@@ -1,42 +0,0 @@
---- 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 @@
-     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 '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 @@
- #
- # Config file handling
- #
--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 @@
-     print
-     sys.exit(1)
- 
-+#Debian specific /etc/freevo/debconf.py file, to read configurations
-+# as entered at install time using the debconf interface
-+overridefile = '/etc/freevo/debconf.py'
-+if os.path.isfile(overridefile):
-+    _debug_('Loading debconf configuration file "%s"' % overridefile, DINFO)
-+    execfile(overridefile, globals(), locals())
- 
- #
- # Search for local_conf.py:

Copied: packages/freevo/tags/1.8.0-1/debian/patches/config_py.diff (from rev 110, packages/freevo/trunk/debian/patches/config_py.diff)
===================================================================
--- packages/freevo/tags/1.8.0-1/debian/patches/config_py.diff	                        (rev 0)
+++ packages/freevo/tags/1.8.0-1/debian/patches/config_py.diff	2008-03-25 17:59:04 UTC (rev 118)
@@ -0,0 +1,37 @@
+--- 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 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.'
+@@ -502,7 +503,10 @@
+ #
+ # Config file handling
+ #
+-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']
++ 
+ 
+ 
+ #
+@@ -635,6 +639,12 @@
+     print
+     sys.exit(1)
+ 
++#Debian specific /etc/freevo/debconf.py file, to read configurations
++# as entered at install time using the debconf interface
++overridefile = '/etc/freevo/debconf.py'
++if os.path.isfile(overridefile):
++    _debug_('Loading debconf configuration file "%s"' % overridefile, DINFO)
++    execfile(overridefile, globals(), locals())
+ 
+ #
+ # Search for local_conf.py:

Deleted: packages/freevo/tags/1.8.0-1/debian/patches/local_conf_py_example_remarks.diff
===================================================================
--- packages/freevo/trunk/debian/patches/local_conf_py_example_remarks.diff	2008-03-18 10:06:22 UTC (rev 107)
+++ packages/freevo/tags/1.8.0-1/debian/patches/local_conf_py_example_remarks.diff	2008-03-25 17:59:04 UTC (rev 118)
@@ -1,56 +0,0 @@
---- 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
- # /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 @@
- # This is a list of items (e.g. directories, fxd files). The items themselves
- # can also be a list of (title, file)
- #
-+# WARNING: see Debian specific note at beginning of this file
-+#
- # VIDEO_ITEMS = [
- #     ('action movies', '/freevo/movies/action'),
- #     ('funny stuff', '/freevo/movies/comedy'),
-@@ -706,6 +716,8 @@
- # can also be a list of (title, file)
- #
- # To add webradio support, add fxd/webradio.fxd to this list
-+# 
-+# WARNING: see Debian specific note at beginning of this file
- #
- # AUDIO_ITEMS = [
- #     ('Music Collection', '/freevo/audio/mp3'),
-@@ -753,6 +765,8 @@
- # This is a list of items (e.g. directories, fxd files). The items itself
- # can also be a list of (title, file)
- #
-+# WARNING: see Debian specific note at beginning of this file
-+#
- # IMAGE_ITEMS = [
- #     ('My Photos', '/freevo/images'),
- # ]
-@@ -1189,6 +1203,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

Copied: packages/freevo/tags/1.8.0-1/debian/patches/local_conf_py_example_remarks.diff (from rev 110, packages/freevo/trunk/debian/patches/local_conf_py_example_remarks.diff)
===================================================================
--- packages/freevo/tags/1.8.0-1/debian/patches/local_conf_py_example_remarks.diff	                        (rev 0)
+++ packages/freevo/tags/1.8.0-1/debian/patches/local_conf_py_example_remarks.diff	2008-03-25 17:59:04 UTC (rev 118)
@@ -0,0 +1,53 @@
+--- 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 +634,8 @@
+ # This is a list of items (e.g. directories, fxd files). The items themselves
+ # can also be a list of (title, file)
+ #
++# WARNING: see Debian specific note at beginning of this file
++#
+ # VIDEO_ITEMS = [
+ #     ('action movies', '/freevo/movies/action'),
+ #     ('funny stuff', '/freevo/movies/comedy'),
+@@ -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
++#
+ # AUDIO_ITEMS = [
+ #     ('Music Collection', '/freevo/audio/mp3'),
+ #     '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)
+ #
++# WARNING: see Debian specific note at beginning of this file
++#
+ # IMAGE_ITEMS = [
+ #     ('My Photos', '/freevo/images'),
+ # ]
+@@ -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

Deleted: packages/freevo/tags/1.8.0-1/debian/rules
===================================================================
--- packages/freevo/trunk/debian/rules	2008-03-18 10:06:22 UTC (rev 107)
+++ packages/freevo/tags/1.8.0-1/debian/rules	2008-03-25 17:59:04 UTC (rev 118)
@@ -1,73 +0,0 @@
-#!/usr/bin/make -f
-
-DEB_PYTHON_SYSTEM=pycentral
-DEB_DH_INSTALL_SOURCEDIR=$(CURDIR)/debian/tmp
-
-DEBIAN_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
-UPSTREAM_VERSION:=$(shell echo "$(DEBIAN_VERSION)"| cut -d- -f1 | sed 's/~//')
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-# this is already copied in debian/copyright
-DEB_DH_INSTALL_ARGS= -XAquaFusion_Icons_LICENSE -XCOPYING
-
-install/freevo::
-
-	: # Replace all '#!' calls to python with /usr/bin/python
-	: # and make them executable
-	for i in `find debian/tmp -type f`; do \
-	  sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
-		$$i > $$i.temp; \
-	  if cmp --quiet $$i $$i.temp; then \
-	    rm -f $$i.temp; \
-	  else \
-	    mv -f $$i.temp $$i; \
-	    chmod 755 $$i; \
-	    echo "fixed interpreter: $$i"; \
-	  fi; \
-	done
-
-	mv $(CURDIR)/debian/tmp/usr/share/doc/freevo-$(UPSTREAM_VERSION) \
-		$(CURDIR)/debian/tmp/usr/share/doc/freevo
-
-	mv $(CURDIR)/README \
-		$(CURDIR)/debian/freevo-doc/usr/share/doc/freevo
-	mv $(CURDIR)/TODO \
-		$(CURDIR)/debian/freevo-doc/usr/share/doc/freevo
-
-	mv $(CURDIR)/debian/tmp/usr/bin/freevo  $(CURDIR)/debian/tmp/usr/bin/freevo.real
-	install  $(CURDIR)/debian/scripts/freevo $(CURDIR)/debian/tmp/usr/bin/freevo
-	install  $(CURDIR)/debian/scripts/freevo+log $(CURDIR)/debian/tmp/usr/share/freevo/contrib/freevo+log
-
-	dh_installinit -pfreevo --no-start --name=freevo_xserver
-	dh_installinit -pfreevo --no-start --name=freevo_recordserver
-	dh_installinit -pfreevo --no-start --name=freevo_encodingserver
-	dh_installinit -pfreevo --no-start --name=freevo_webserver
-	dh_installinit -pfreevo --no-start --name=freevo_rssserver
-
-$(patsubst %,install/%,$(DEB_PACKAGES)) ::
-	if [ -e debian/$(cdbs_curpkg).linda-overrides ] ; then \
-	  mkdir -p debian/$(cdbs_curpkg)/usr/share/linda/overrides/ ; \
-	  cp debian/$(cdbs_curpkg).linda-overrides debian/$(cdbs_curpkg)/usr/share/linda/overrides/$(cdbs_curpkg) ; \
-	fi
-
-binary-install/freevo-data::
-	for i in `find debian/freevo-data/usr/share/freevo/fonts -name Vera*`; do \
-		dh_link -pfreevo-data /usr/share/fonts/truetype/ttf-bitstream-vera/`echo $$i | cut -c45-` \
-			usr/share/freevo/fonts/`echo $$i | cut -c45-`;\
-	done
-	for i in `find debian/freevo-data/usr/share/freevo/fonts -name Deja*`; do \
-		dh_link -pfreevo-data /usr/share/fonts/truetype/ttf-dejavu/`echo $$i | cut -c45-` \
-			/usr/share/freevo/fonts/`echo $$i | cut -c45-`; \
-	done
-
-	# Temporaly hacks to fix file permissions
-	chmod a-x debian/freevo-data/usr/share/freevo/skins/main/Tux*
-	chmod a-x debian/freevo-data/usr/share/freevo/icons/themes/geexbox/status/*.png
-	chmod a-x debian/freevo-data/usr/share/freevo/icons/themes/geexbox/mimetypes/*.png
-
-
-clean::
-	rm -f version.pyc

Copied: packages/freevo/tags/1.8.0-1/debian/rules (from rev 112, packages/freevo/trunk/debian/rules)
===================================================================
--- packages/freevo/tags/1.8.0-1/debian/rules	                        (rev 0)
+++ packages/freevo/tags/1.8.0-1/debian/rules	2008-03-25 17:59:04 UTC (rev 118)
@@ -0,0 +1,74 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM=pycentral
+DEB_DH_INSTALL_SOURCEDIR=$(CURDIR)/debian/tmp
+
+DEBIAN_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
+UPSTREAM_VERSION:=$(shell echo "$(DEBIAN_VERSION)"| cut -d- -f1 | sed 's/~//')
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+# this is already copied in debian/copyright
+DEB_DH_INSTALL_ARGS= -XAquaFusion_Icons_LICENSE -XCOPYING
+
+install/freevo::
+
+	: # Replace all '#!' calls to python with /usr/bin/python
+	: # 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,' \
+		"$$i" > "$$i.temp"; \
+	  if cmp --quiet "$$i" "$$i.temp"; then \
+	    rm -f "$$i.temp"; \
+	  else \
+	    mv -f "$$i.temp" "$$i"; \
+	    chmod 755 "$$i"; \
+	    echo "fixed interpreter: $$i"; \
+	  fi; \
+	done
+
+	mv $(CURDIR)/debian/tmp/usr/share/doc/freevo-$(UPSTREAM_VERSION) \
+		$(CURDIR)/debian/tmp/usr/share/doc/freevo
+
+	mv $(CURDIR)/README \
+		$(CURDIR)/debian/freevo-doc/usr/share/doc/freevo
+	mv $(CURDIR)/TODO \
+		$(CURDIR)/debian/freevo-doc/usr/share/doc/freevo
+
+	mv $(CURDIR)/debian/tmp/usr/bin/freevo  $(CURDIR)/debian/tmp/usr/bin/freevo.real
+	install  $(CURDIR)/debian/scripts/freevo $(CURDIR)/debian/tmp/usr/bin/freevo
+	install  $(CURDIR)/debian/scripts/freevo+log $(CURDIR)/debian/tmp/usr/share/freevo/contrib/freevo+log
+
+	dh_installinit -pfreevo --no-start --name=freevo_xserver
+	dh_installinit -pfreevo --no-start --name=freevo_recordserver
+	dh_installinit -pfreevo --no-start --name=freevo_encodingserver
+	dh_installinit -pfreevo --no-start --name=freevo_webserver
+	dh_installinit -pfreevo --no-start --name=freevo_rssserver
+
+$(patsubst %,install/%,$(DEB_PACKAGES)) ::
+	if [ -e debian/$(cdbs_curpkg).linda-overrides ] ; then \
+	  mkdir -p debian/$(cdbs_curpkg)/usr/share/linda/overrides/ ; \
+	  cp debian/$(cdbs_curpkg).linda-overrides debian/$(cdbs_curpkg)/usr/share/linda/overrides/$(cdbs_curpkg) ; \
+	fi
+
+binary-install/freevo-data::
+	for i in `find debian/freevo-data/usr/share/freevo/fonts -name Vera*`; do \
+		dh_link -pfreevo-data /usr/share/fonts/truetype/ttf-bitstream-vera/`echo $$i | cut -c45-` \
+			usr/share/freevo/fonts/`echo $$i | cut -c45-`;\
+	done
+	for i in `find debian/freevo-data/usr/share/freevo/fonts -name Deja*`; do \
+		dh_link -pfreevo-data /usr/share/fonts/truetype/ttf-dejavu/`echo $$i | cut -c45-` \
+			/usr/share/freevo/fonts/`echo $$i | cut -c45-`; \
+	done
+
+	# Temporaly hacks to fix file permissions
+	chmod a-x debian/freevo-data/usr/share/freevo/skins/main/Tux*
+	chmod a-x debian/freevo-data/usr/share/freevo/fonts/Sansumi-DemiBold.ttf \
+		  debian/freevo-data/usr/share/freevo/images/atlantice/back_black.jpg
+	find  debian/freevo-data/usr/share/freevo -type f -name '*.png' -print0 | xargs -0 chmod a-x
+
+
+clean::
+	rm -f version.pyc




More information about the Pkg-freevo-commits mailing list