[pkg-freevo-commits] r212 - in packages/freevo/trunk/debian: . patches
Andrea Mennucci
mennucc1 at alioth.debian.org
Sat Jan 1 16:12:41 UTC 2011
Author: mennucc1
Date: 2011-01-01 16:12:36 +0000 (Sat, 01 Jan 2011)
New Revision: 212
Modified:
packages/freevo/trunk/debian/NEWS
packages/freevo/trunk/debian/README.Debian
packages/freevo/trunk/debian/changelog
packages/freevo/trunk/debian/freevo.default
packages/freevo/trunk/debian/patches/twisted-web-9.diff
packages/freevo/trunk/debian/rules
Log:
1.9.0-9
Modified: packages/freevo/trunk/debian/NEWS
===================================================================
--- packages/freevo/trunk/debian/NEWS 2010-12-28 11:07:28 UTC (rev 211)
+++ packages/freevo/trunk/debian/NEWS 2011-01-01 16:12:36 UTC (rev 212)
@@ -1,23 +1,24 @@
freevo (1.9.0-8) unstable; urgency=low
- * When installing freevo, it adds a user 'freevo' to the system.
- In older versions of freevo, the home directory was set to '/home/freevo' ;
- from this version on, it is '/var/lib/freevo' (see bug 608035).
- When upgrading freevo from older versions, the situation is complex:
- - the home directory is left unchanged, .i.e. '/home/freevo' still contains
- music, images, TV recordings (in that respect, all will work as before);
- if you want to change that, use 'dpkg-reconfigure freevo'.
- - But the directories /var/lib/freevo/cache /var/lib/freevo/log
- /var/lib/freevo/static are created and used instead of
- /home/freevo/cache , /home/freevo/log , /home/freevo/static
- This leaves some data in /home/freevo totally unused. You have to ways out.
- 1) edit /etc/default/freevo so that FREEVO_CACHEDIR FREEVO_LOGDIR FREEVO_STATICDIR
- point to /home/freevo/cache , /home/freevo/log , /home/freevo/static
- 2) move the data from /home/freevo/cache , /home/freevo/log , /home/freevo/static
- to /var/lib/freevo/cache /var/lib/freevo/log /var/lib/freevo/static
-
- -- A Mennucc1 <mennucc1 at debian.org> Tue, 28 Dec 2010 09:58:54 +0100
+ * When installing freevo for the first time, it adds a user 'freevo' to
+ the system. In older versions of freevo, the home directory was set
+ to '/home/freevo' ; from version 1.9.0-8 on, it is '/var/lib/freevo'
+ (see bug 608035). That base space contains the directories for
+ 'video' 'audio' 'image' 'recordings' 'cache' 'static' 'log' .
+ The first four are managed using 'debconf' so to change them
+ you should use 'dpkg-reconfigure freevo'; instead 'cache' 'static' 'log'
+ are decided in /etc/default/freevo .
+ When upgrading freevo from older versions, the situation is as follows:
+ - the home directory is left unchanged, .i.e. '/home/freevo'
+ - debconf variables are unchanged, so '/home/freevo' will still
+ contains music, images, TV recordings (in that respect, all will work
+ as before); if you want to change that, use 'dpkg-reconfigure freevo'.
+ - The configuration file /etc/default/freevo will still choose the
+ versions inside /home/freevo if they exist.
+ All the above is to ease upgrade and transition.
+ -- A Mennucc1 <mennucc1 at debian.org> Fri, 31 Dec 2010 17:55:38 +0100
+
freevo (1.8.0-1) unstable; urgency=low
A significant change to the TV recording has been the replacement of the
Modified: packages/freevo/trunk/debian/README.Debian
===================================================================
--- packages/freevo/trunk/debian/README.Debian 2010-12-28 11:07:28 UTC (rev 211)
+++ packages/freevo/trunk/debian/README.Debian 2011-01-01 16:12:36 UTC (rev 212)
@@ -83,7 +83,7 @@
"freevo .deb"), an user 'freevo' is created, and a group 'freevo' as
well. The user 'freevo' has home directory /var/lib/freevo
(unless an older version was installed before, in that case it is
-/home/freevo ) .
+/home/freevo - see NEWS for details).
You should add normal users to the 'freevo' group:
in this way, they will share all the data, that is,
@@ -94,8 +94,9 @@
When you have installed freevo, there were many debconf
questions (the number is depending on your debconf setting).
If you did not change the default directories, then all data related
-to freevo will be stored inside /var/lib/freevo . For example, the
-default video directory is /var/lib/freevo/video/ .
+to freevo will be stored inside /var/lib/freevo (unless an older
+version was installed before, in that case it is
+/home/freevo - see NEWS for details).
To find out the chosen directories , read the config files
/etc/default/freevo
@@ -254,4 +255,4 @@
BTW, to use 'nvram-wakeup', you should add 'nvram' to the list of
modules in /etc/modules so that it is loaded at boot.
- -- A Mennucc <mennucc1 at debian.org>, Mon, 27 Dec 2010 23:40:50 +0100
+ -- A Mennucc <mennucc1 at debian.org>, Fri, 31 Dec 2010 17:59:23 +0100
Modified: packages/freevo/trunk/debian/changelog
===================================================================
--- packages/freevo/trunk/debian/changelog 2010-12-28 11:07:28 UTC (rev 211)
+++ packages/freevo/trunk/debian/changelog 2011-01-01 16:12:36 UTC (rev 212)
@@ -1,3 +1,16 @@
+freevo (1.9.0-9) unstable; urgency=medium
+
+ * Better transition: if freevo is installed anew, it will put all its
+ data in /var/lib/freevo (as per bug #606782); whereas if it is upgraded
+ from versions <1.9.0-8 then it will work as before, that is, it will
+ use all the data in /home/freevo , until the user does all changes
+ (see NEWS for details).
+ * be sure that /usr/share/freevo/icons/themes/geexbox/mimetypes/folder.png
+ exists and is a proper symlink
+ * add small change in upstream SVN 11664 to debian/patches/twisted-web-9.diff
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sat, 01 Jan 2011 14:12:56 +0100
+
freevo (1.9.0-8) unstable; urgency=low
* found the culprit of bug 606782, so closes: #606782 once and forall
Modified: packages/freevo/trunk/debian/freevo.default
===================================================================
--- packages/freevo/trunk/debian/freevo.default 2010-12-28 11:07:28 UTC (rev 211)
+++ packages/freevo/trunk/debian/freevo.default 2011-01-01 16:12:36 UTC (rev 212)
@@ -1,19 +1,32 @@
# Defaults for freevo initscript
-# sourced by /etc/init.d/freevo
+# sourced by /etc/init.d/freevo* and the freevo postinst script
#######
-# If you change this you should run "dpkg-reconfigure freevo"
-# and know what you are doing
+#Due to bug #606782, the default base was changed from /home to /var/lib,
+#so this script tries to choose the best one
+#Note that the directories you set as FREEVO_CACHEDIR FREEVO_LOGDIR FREEVO_STATICDIR
+#are automatically created when freevo is (re)configured, e.g. using 'dpkg-reconfigure freevo'
+
# Cache dir. Warning: it will be 'rm -rf' on package purge
-export FREEVO_CACHEDIR=/var/lib/freevo/cache
+if test -d /home/freevo/cache ; then
+ export FREEVO_CACHEDIR=/home/freevo/cache
+else
+ export FREEVO_CACHEDIR=/var/lib/freevo/cache
+fi
-export FREEVO_LOGDIR=/var/lib/freevo/log
+if test -d /home/freevo/log ; then
+ export FREEVO_LOGDIR=/home/freevo/log
+else
+ export FREEVO_LOGDIR=/var/lib/freevo/log
+fi
-#this is where record_schedule.xml is stored
-export FREEVO_STATICDIR=/var/lib/freevo/static
+if test -d /home/freevo/static ;then
+ export FREEVO_STATICDIR=/home/freevo/static
+else
+ export FREEVO_STATICDIR=/var/lib/freevo/static
+fi
-
########
# If you set any of the following, it will override /etc/freevo/debconf.sh
Modified: packages/freevo/trunk/debian/patches/twisted-web-9.diff
===================================================================
--- packages/freevo/trunk/debian/patches/twisted-web-9.diff 2010-12-28 11:07:28 UTC (rev 211)
+++ packages/freevo/trunk/debian/patches/twisted-web-9.diff 2011-01-01 16:12:36 UTC (rev 212)
@@ -1,5 +1,6 @@
#Bug: http://sourceforge.net/tracker/?func=detail&aid=2936634&group_id=46652&atid=446895
#Author: A Mennucc
+#Comment: from upstream SVN 11648 and then 11664
--- x/src/www/htdocs/vlcwin.rpy (revision 11647)
+++ x/src/www/htdocs/vlcwin.rpy (revision 11648)
@@ -33,9 +33,9 @@
@@ -42,11 +43,10 @@
===================================================================
--- 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
+@@ -33,7 +33,6 @@
import time
--from www.web_types import HTMLResource, FreevoResource
+ from www.web_types import HTMLResource, FreevoResource
-from twisted.web.woven import page
import util
import config
Modified: packages/freevo/trunk/debian/rules
===================================================================
--- packages/freevo/trunk/debian/rules 2010-12-28 11:07:28 UTC (rev 211)
+++ packages/freevo/trunk/debian/rules 2011-01-01 16:12:36 UTC (rev 212)
@@ -51,6 +51,10 @@
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
+ #clean up dreaded folder.png problem
+ rm debian/tmp/usr/share/freevo/icons/themes/geexbox/mimetypes/folder.png
+ ln -sv folder_image.png debian/tmp/usr/share/freevo/icons/themes/geexbox/mimetypes/folder.png
+
dh_installinit -pfreevo --no-start --name=freevo_xserver
dh_installinit -pfreevo --no-start --name=freevo_recordserver
dh_installinit -pfreevo --no-start --name=freevo_encodingserver
More information about the Pkg-freevo-commits
mailing list