[interchange-cvs] interchange - racke modified 6 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Fri May 19 09:58:49 EDT 2006
User: racke
Date: 2006-05-19 13:58:49 GMT
Modified: debian Tag: STABLE_5_4-branch changelog
Modified: interchange-ui.postinst interchange-ui.postrm
Modified: interchange-ui.preinst interchange-ui.prerm
Modified: interchange.prerm
Log:
use invoke-rc.d to run init scripts if command is available
Revision Changes Path
No revision
No revision
2.67.2.6 +4 -2 interchange/debian/changelog
rev 2.67.2.6, prev_rev 2.67.2.5
Index: changelog
===================================================================
RCS file: /var/cvs/interchange/debian/changelog,v
retrieving revision 2.67.2.5
retrieving revision 2.67.2.6
diff -u -r2.67.2.5 -r2.67.2.6
--- changelog 17 May 2006 19:57:34 -0000 2.67.2.5
+++ changelog 19 May 2006 13:58:48 -0000 2.67.2.6
@@ -1,12 +1,14 @@
-interchange (5.4.0-1.2) unstable; urgency=low
+interchange (5.4.1-0.1) unstable; urgency=low
* fix reference to removed interchange/debug Debconf template which
causes initial installs to fail (Closes: #367704)
+ * use invoke-rc.d to run init scripts if command is available
+ (Closes: #367724, thanks to Lars Wirzenius <liw at iki.fi> for the report
* fix outdated reference in POTFILES.in (Closes: #349816, thanks to
Thomas Huriaux <thomas.huriaux at gmail.com> for the patch)
* run debconf-updatepo from clean target
- -- Stefan Hornburg (Racke) <racke at linuxia.de> Mon, 15 May 2006 18:39:11 +0200
+ -- Stefan Hornburg (Racke) <racke at linuxia.de> Fri, 19 May 2006 15:51:08 +0200
interchange (5.4.0-1) unstable; urgency=low
2.5.6.1 +6 -2 interchange/debian/interchange-ui.postinst
rev 2.5.6.1, prev_rev 2.5
Index: interchange-ui.postinst
===================================================================
RCS file: /var/cvs/interchange/debian/interchange-ui.postinst,v
retrieving revision 2.5
retrieving revision 2.5.6.1
diff -u -r2.5 -r2.5.6.1
--- interchange-ui.postinst 7 Dec 2003 02:00:02 -0000 2.5
+++ interchange-ui.postinst 19 May 2006 13:58:48 -0000 2.5.6.1
@@ -1,6 +1,6 @@
#! /bin/sh -e
#
-# Copyright 2001 by Stefan Hornburg (Racke) <racke at linuxia.de>
+# Copyright 2001,2006 by Stefan Hornburg (Racke) <racke at linuxia.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -58,7 +58,11 @@
fi
if [ -x /etc/init.d/interchange ]; then
- /etc/init.d/interchange start
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d interchange start
+ else
+ /etc/init.d/interchange start
+ fi
fi
# Don't wait on Interchange to close file handles
1.3.8.1 +11 -3 interchange/debian/interchange-ui.postrm
rev 1.3.8.1, prev_rev 1.3
Index: interchange-ui.postrm
===================================================================
RCS file: /var/cvs/interchange/debian/interchange-ui.postrm,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -u -r1.3 -r1.3.8.1
--- interchange-ui.postrm 14 Jan 2003 15:21:40 -0000 1.3
+++ interchange-ui.postrm 19 May 2006 13:58:48 -0000 1.3.8.1
@@ -1,6 +1,6 @@
#! /bin/sh -e
#
-# Copyright 2001 by Stefan Hornburg (Racke) <racke at linuxia.de>
+# Copyright 2001,2006 by Stefan Hornburg (Racke) <racke at linuxia.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,7 +25,11 @@
# the server first
if [ -x /etc/init.d/interchange ]; then
- /etc/init.d/interchange stop
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d interchange stop
+ else
+ /etc/init.d/interchange stop
+ fi
fi
if [ -x /usr/sbin/interchangeconfig ]; then
@@ -58,7 +62,11 @@
fi
if [ -x /etc/init.d/interchange ]; then
- /etc/init.d/interchange start
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d interchange start
+ else
+ /etc/init.d/interchange start
+ fi
fi
# Don't wait on Interchange to close file handles
1.5.8.1 +6 -2 interchange/debian/interchange-ui.preinst
rev 1.5.8.1, prev_rev 1.5
Index: interchange-ui.preinst
===================================================================
RCS file: /var/cvs/interchange/debian/interchange-ui.preinst,v
retrieving revision 1.5
retrieving revision 1.5.8.1
diff -u -r1.5 -r1.5.8.1
--- interchange-ui.preinst 14 Jan 2003 15:21:40 -0000 1.5
+++ interchange-ui.preinst 19 May 2006 13:58:48 -0000 1.5.8.1
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# Copyright 2001,2003 by Stefan Hornburg (Racke) <racke at linuxia.de>
+# Copyright 2001,2003,2006 by Stefan Hornburg (Racke) <racke at linuxia.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,11 @@
# the server first
if [ -x /etc/init.d/interchange ] ; then
- /etc/init.d/interchange stop
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d interchange stop
+ else
+ /etc/init.d/interchange stop
+ fi
fi
# We use the file /var/run/interchange-install to record
1.3.10.1 +6 -2 interchange/debian/interchange-ui.prerm
rev 1.3.10.1, prev_rev 1.3
Index: interchange-ui.prerm
===================================================================
RCS file: /var/cvs/interchange/debian/interchange-ui.prerm,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -r1.3 -r1.3.10.1
--- interchange-ui.prerm 13 Aug 2001 19:32:15 -0000 1.3
+++ interchange-ui.prerm 19 May 2006 13:58:48 -0000 1.3.10.1
@@ -1,6 +1,6 @@
#! /bin/sh -e
#
-# Copyright 2001 by Stefan Hornburg (Racke) <racke at linuxia.de>
+# Copyright 2001,2006 by Stefan Hornburg (Racke) <racke at linuxia.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,11 @@
# If only interchange-ui is removed, we need to stop
# the server first
-/etc/init.d/interchange stop
+if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d interchange stop
+else
+ /etc/init.d/interchange stop
+fi
/usr/sbin/interchangeconfig UI= USE_FOUNDATION=
1.2.10.1 +7 -3 interchange/debian/interchange.prerm
rev 1.2.10.1, prev_rev 1.2
Index: interchange.prerm
===================================================================
RCS file: /var/cvs/interchange/debian/interchange.prerm,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -r1.2 -r1.2.10.1
--- interchange.prerm 13 Aug 2001 19:32:49 -0000 1.2
+++ interchange.prerm 19 May 2006 13:58:48 -0000 1.2.10.1
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# Copyright 2001 by Stefan Hornburg (Racke) <racke at linuxia.de>
+# Copyright 2001,2006 by Stefan Hornburg (Racke) <racke at linuxia.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,9 +18,13 @@
# MA 02111-1307 USA.
# Stop the server first
+if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d interchange stop
+else
+ /etc/init.d/interchange stop
+fi
-/etc/init.d/interchange stop
-
+# Keep track of installation status
echo interchange >> /var/run/interchange-install
#DEBHELPER#
More information about the interchange-cvs
mailing list