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

[Andrea Mennucci]

Author: mennucc1
Date: 2010-08-10 15:22:32 +0000 (Tue, 10 Aug 2010)
New Revision: 206

Added:
   packages/freevo/trunk/debian/patches/exit_0_if_running.diff
Modified:
   packages/freevo/trunk/debian/changelog
   packages/freevo/trunk/debian/control
   packages/freevo/trunk/debian/freevo.freevo_xserver.init
   packages/freevo/trunk/debian/patches/series
Log:
all init scripts exit succesfully if the daemon is already running

Modified: packages/freevo/trunk/debian/changelog
===================================================================
--- packages/freevo/trunk/debian/changelog	2010-08-10 13:28:31 UTC (rev 205)
+++ packages/freevo/trunk/debian/changelog	2010-08-10 15:22:32 UTC (rev 206)
@@ -4,6 +4,8 @@
     thanks to Joe Dalton (Closes: #588753).
   * fix lintian warnings:
     -  depend on python-all , not python-all-dev
+  * update standards version to 3.9.1.0
+    - all init scripts exit succesfully if the daemon is already running
 
  --
 

Modified: packages/freevo/trunk/debian/control
===================================================================
--- packages/freevo/trunk/debian/control	2010-08-10 13:28:31 UTC (rev 205)
+++ packages/freevo/trunk/debian/control	2010-08-10 15:22:32 UTC (rev 206)
@@ -5,7 +5,7 @@
 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
-Standards-Version: 3.8.0.0
+Standards-Version: 3.9.1.0
 XS-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/svn/pkg-freevo/packages/freevo/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-freevo/packages/freevo/trunk/

Modified: packages/freevo/trunk/debian/freevo.freevo_xserver.init
===================================================================
--- packages/freevo/trunk/debian/freevo.freevo_xserver.init	2010-08-10 13:28:31 UTC (rev 205)
+++ packages/freevo/trunk/debian/freevo.freevo_xserver.init	2010-08-10 15:22:32 UTC (rev 206)
@@ -42,7 +42,7 @@
 test "${NOMOUSE}" = "true" && export SDL_NOMOUSE=true
 
 startx_freevo() {
- openvt -c 9 -- su --shell /bin/sh freevo -c  "startx  $DAEMONLOG   -- :1 vt9  -quiet"
+ openvt -f -c 9 -- su --shell /bin/sh freevo -c  "startx  $DAEMONLOG   -- :1 vt9  -quiet"
 }
 
 start_freevo() {

Added: packages/freevo/trunk/debian/patches/exit_0_if_running.diff
===================================================================
--- packages/freevo/trunk/debian/patches/exit_0_if_running.diff	                        (rev 0)
+++ packages/freevo/trunk/debian/patches/exit_0_if_running.diff	2010-08-10 15:22:32 UTC (rev 206)
@@ -0,0 +1,14 @@
+Index: freevo-1.9.0/freevo
+===================================================================
+--- freevo-1.9.0.orig/freevo	2010-08-10 17:11:52.000000000 +0200
++++ freevo-1.9.0/freevo	2010-08-10 17:13:13.000000000 +0200
+@@ -657,7 +657,8 @@
+             sys.exit("Can't find helper %s" % name)
+ 
+ if check and getpid(name, python + proc)[1]:
+-    sys.exit("%s still running, run '%s --stop' to stop" % (name, name))
++    sys.stderr.write("%s is already running.\n" % name)
++    sys.exit(0)
+ 
+ if opts.profile:
+     if sys.hexversion > 0x02050000:

Modified: packages/freevo/trunk/debian/patches/series
===================================================================
--- packages/freevo/trunk/debian/patches/series	2010-08-10 13:28:31 UTC (rev 205)
+++ packages/freevo/trunk/debian/patches/series	2010-08-10 15:22:32 UTC (rev 206)
@@ -13,4 +13,4 @@
 encodingcore_report_failures.diff
 imdb-html5lib.patch
 twisted-web-9.diff
-
+exit_0_if_running.diff