[pkg-freevo-commits] r154 - in packages/freevo/trunk/debian: . patches
Andrea Mennucci
mennucc1 at alioth.debian.org
Tue Apr 14 19:51:47 UTC 2009
Author: mennucc1
Date: 2009-04-14 19:51:47 +0000 (Tue, 14 Apr 2009)
New Revision: 154
Removed:
packages/freevo/trunk/debian/patches/idlebar
packages/freevo/trunk/debian/patches/no_numeric
Modified:
packages/freevo/trunk/debian/changelog
packages/freevo/trunk/debian/freevo.freevo_encodingserver.init
packages/freevo/trunk/debian/freevo.freevo_recordserver.init
packages/freevo/trunk/debian/freevo.freevo_rssserver.init
packages/freevo/trunk/debian/freevo.freevo_webserver.init
packages/freevo/trunk/debian/freevo.freevo_xserver.init
packages/freevo/trunk/debian/freevo.template.init
packages/freevo/trunk/debian/patches/series
packages/freevo/trunk/debian/rules
Log:
Changes for forthcoming 1.8.4.
WARNING: this depends on kaa SVN
Modified: packages/freevo/trunk/debian/changelog
===================================================================
--- packages/freevo/trunk/debian/changelog 2009-04-14 12:33:49 UTC (rev 153)
+++ packages/freevo/trunk/debian/changelog 2009-04-14 19:51:47 UTC (rev 154)
@@ -1,3 +1,9 @@
+freevo (1.8.4~svn11415-0) experimental; urgency=low
+
+ * SVN snapshot
+
+ -- A Mennucc1 <mennucc1 at debian.org> Tue, 14 Apr 2009 15:34:24 +0200
+
freevo (1.8.3-1) unstable; urgency=low
* freevo+log: source $HOME/.freevo/xinitrc if available
Modified: packages/freevo/trunk/debian/freevo.freevo_encodingserver.init
===================================================================
--- packages/freevo/trunk/debian/freevo.freevo_encodingserver.init 2009-04-14 12:33:49 UTC (rev 153)
+++ packages/freevo/trunk/debian/freevo.freevo_encodingserver.init 2009-04-14 19:51:47 UTC (rev 154)
@@ -44,7 +44,7 @@
start_freevo_encodingserver() {
if /usr/bin/which mencoder >/dev/null ; then
log_action_msg "Starting Freevo Home Theatre PC Platform (encodingserver)"
- $DAEMON encodingserver start
+ $DAEMON --daemon encodingserver
log_action_end_msg $?
else
log_warning_msg "Not starting Freevo encodingserver ; it needs 'mencoder'."
@@ -53,15 +53,15 @@
stop_freevo_encodingserver() {
log_action_msg "Stopping Freevo Home Theatre PC Platform (encodingserver)"
- $DAEMON encodingserver stop
+ $DAEMON --stop encodingserver
log_action_end_msg $?
}
restart_freevo_encodingserver() {
log_action_msg "Restarting Freevo Home Theatre PC Platform (encodingserver)"
- $DAEMON encodingserver stop
+ $DAEMON --stop encodingserver
sleep 5
- $DAEMON encodingserver start
+ $DAEMON --daemon encodingserver
log_action_end_msg $?
}
Modified: packages/freevo/trunk/debian/freevo.freevo_recordserver.init
===================================================================
--- packages/freevo/trunk/debian/freevo.freevo_recordserver.init 2009-04-14 12:33:49 UTC (rev 153)
+++ packages/freevo/trunk/debian/freevo.freevo_recordserver.init 2009-04-14 19:51:47 UTC (rev 154)
@@ -42,21 +42,21 @@
start_freevo_recordserver() {
log_action_msg "Starting Freevo Home Theatre PC Platform (recordserver)"
- $DAEMON recordserver start
+ $DAEMON --daemon recordserver
log_action_end_msg $?
}
stop_freevo_recordserver() {
log_action_msg "Stopping Freevo Home Theatre PC Platform (recordserver)"
- $DAEMON recordserver stop
+ $DAEMON --stop recordserver
log_action_end_msg $?
}
restart_freevo_recordserver() {
log_action_msg "Restarting Freevo Home Theatre PC Platform (recordserver)"
- $DAEMON recordserver stop
+ $DAEMON --stop recordserver
sleep 5
- $DAEMON recordserver start
+ $DAEMON --daemon recordserver
log_action_end_msg $?
}
Modified: packages/freevo/trunk/debian/freevo.freevo_rssserver.init
===================================================================
--- packages/freevo/trunk/debian/freevo.freevo_rssserver.init 2009-04-14 12:33:49 UTC (rev 153)
+++ packages/freevo/trunk/debian/freevo.freevo_rssserver.init 2009-04-14 19:51:47 UTC (rev 154)
@@ -43,21 +43,21 @@
start_freevo_rssserver() {
log_action_msg "Starting Freevo Home Theatre PC Platform (rssserver)"
- $DAEMON rssserver start
+ $DAEMON --daemon rssserver
log_action_end_msg $?
}
stop_freevo_rssserver() {
log_action_msg "Stopping Freevo Home Theatre PC Platform (rssserver)"
- $DAEMON rssserver stop
+ $DAEMON --stop rssserver
log_action_end_msg $?
}
restart_freevo() {
log_action_msg "Restarting Freevo Home Theatre PC Platform (rssserver)"
- $DAEMON rssserver stop
+ $DAEMON --stop rssserver
sleep 5
- $DAEMON rssserver start
+ $DAEMON --daemon rssserver
log_action_end_msg $?
}
Modified: packages/freevo/trunk/debian/freevo.freevo_webserver.init
===================================================================
--- packages/freevo/trunk/debian/freevo.freevo_webserver.init 2009-04-14 12:33:49 UTC (rev 153)
+++ packages/freevo/trunk/debian/freevo.freevo_webserver.init 2009-04-14 19:51:47 UTC (rev 154)
@@ -43,21 +43,21 @@
start_freevo_webserver() {
log_action_msg "Starting Freevo Home Theatre PC Platform (webserver)"
- $DAEMON webserver start
+ $DAEMON --daemon webserver
log_action_end_msg $?
}
stop_freevo_webserver() {
log_action_msg "Stopping Freevo Home Theatre PC Platform (webserver)"
- $DAEMON webserver stop
+ $DAEMON --stop webserver
log_action_end_msg $?
}
restart_freevo_webserver() {
log_action_msg "Restarting Freevo Home Theatre PC Platform (webserver)"
- $DAEMON webserver stop
+ $DAEMON --stop webserver
sleep 5
- $DAEMON webserver start
+ $DAEMON --daemon webserver
log_action_end_msg $?
}
Modified: packages/freevo/trunk/debian/freevo.freevo_xserver.init
===================================================================
--- packages/freevo/trunk/debian/freevo.freevo_xserver.init 2009-04-14 12:33:49 UTC (rev 153)
+++ packages/freevo/trunk/debian/freevo.freevo_xserver.init 2009-04-14 19:51:47 UTC (rev 154)
@@ -53,13 +53,13 @@
stop_freevo() {
log_action_msg "Stopping Freevo Home Theatre PC Platform (frontend)"
- su --shell /bin/sh freevo -c "$DAEMON stop"
+ su --shell /bin/sh freevo -c "$DAEMON --stop"
log_action_end_msg $?
}
restart_freevo() {
log_action_msg "Restarting Freevo Home Theatre PC Platform (frontend)"
- su --shell /bin/sh freevo -c "$DAEMON stop"
+ su --shell /bin/sh freevo -c "$DAEMON --stop"
sleep 5
startx_freevo
log_action_end_msg $?
Modified: packages/freevo/trunk/debian/freevo.template.init
===================================================================
--- packages/freevo/trunk/debian/freevo.template.init 2009-04-14 12:33:49 UTC (rev 153)
+++ packages/freevo/trunk/debian/freevo.template.init 2009-04-14 19:51:47 UTC (rev 154)
@@ -43,21 +43,21 @@
start_freevo_ at service@() {
log_action_msg "Starting Freevo Home Theatre PC Platform (@service@)"
- $DAEMON @service@ start
+ $DAEMON --daemon @service@
log_action_end_msg $?
}
stop_freevo_ at service@() {
log_action_msg "Stopping Freevo Home Theatre PC Platform (@service@)"
- $DAEMON @service@ stop
+ $DAEMON --stop @service@
log_action_end_msg $?
}
restart_freevo() {
log_action_msg "Restarting Freevo Home Theatre PC Platform (@service@)"
- $DAEMON @service@ stop
+ $DAEMON --stop @service@
sleep 5
- $DAEMON @service@ start
+ $DAEMON --daemon @service@
log_action_end_msg $?
}
Deleted: packages/freevo/trunk/debian/patches/idlebar
===================================================================
--- packages/freevo/trunk/debian/patches/idlebar 2009-04-14 12:33:49 UTC (rev 153)
+++ packages/freevo/trunk/debian/patches/idlebar 2009-04-14 19:51:47 UTC (rev 154)
@@ -1,10 +0,0 @@
---- freevo/src/plugins/idlebar/encoding.py~ 2008-11-16 18:44:29.000000000 +0100
-+++ freevo/src/plugins/idlebar/encoding.py 2008-12-04 23:02:48.000000000 +0100
-@@ -39,6 +39,7 @@
- from util.marmalade import jellyToXML, unjellyFromXML
- from gui import Progressbar
- import rc
-+from video.encodingclient import EncodingClientActions
-
-
- def returnFromJelly(status, response):
Deleted: packages/freevo/trunk/debian/patches/no_numeric
===================================================================
--- packages/freevo/trunk/debian/patches/no_numeric 2009-04-14 12:33:49 UTC (rev 153)
+++ packages/freevo/trunk/debian/patches/no_numeric 2009-04-14 19:51:47 UTC (rev 154)
@@ -1,11 +0,0 @@
---- freevo/src/main.py~ 2008-12-01 03:42:54.000000000 +0100
-+++ freevo/src/main.py 2008-12-12 19:49:26.000000000 +0100
-@@ -44,7 +44,7 @@
- # now load other modules to check if all requirements are installed
- import pygame
- import twisted
-- import Numeric
-+ #import Numeric
-
- import kaa
- import kaa.metadata as metadata
Modified: packages/freevo/trunk/debian/patches/series
===================================================================
--- packages/freevo/trunk/debian/patches/series 2009-04-14 12:33:49 UTC (rev 153)
+++ packages/freevo/trunk/debian/patches/series 2009-04-14 19:51:47 UTC (rev 154)
@@ -5,12 +5,3 @@
umask.diff
config_py.diff
local_conf_py_example_remarks.diff
-idlebar
-no_numeric
-#
-#slice encoding, from SVN
-#encodingclient.py.diff
-#encodingcore.py.diff
-#encodingserver.py.diff
-#reencode.py.diff
-#
Modified: packages/freevo/trunk/debian/rules
===================================================================
--- packages/freevo/trunk/debian/rules 2009-04-14 12:33:49 UTC (rev 153)
+++ packages/freevo/trunk/debian/rules 2009-04-14 19:51:47 UTC (rev 154)
@@ -4,7 +4,8 @@
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/~//')
+UPSTREAM_VERSION:=1.8.4-svn
+#$(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
More information about the Pkg-freevo-commits
mailing list