[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force SVN commit: rev 321 - trunk/debian



Author: branden
Date: 2003-07-29 15:43:51 -0500 (Tue, 29 Jul 2003)
New Revision: 321

Modified:
   trunk/debian/changelog
   trunk/debian/xdm.postinst.in
   trunk/debian/xdm.postrm.in
   trunk/debian/xdm.prerm.in
   trunk/debian/xfs.postinst.in
   trunk/debian/xfs.postrm.in
   trunk/debian/xfs.prerm.in
Log:
debian/{xdm,xfs}.{posinst,postrm,prerm}.in: use $THIS_PACKAGE variable to
  drive calls to update-rc.d and invoke-rc.d


Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	2003-07-29 20:34:28 UTC (rev 320)
+++ trunk/debian/changelog	2003-07-29 20:43:51 UTC (rev 321)
@@ -39,8 +39,11 @@
   * debian/xprt.links: remove Xprt(1x)'s link to undocumented manpage; that
     practice is no longer countenanced by Debian Policy
 
- -- Branden Robinson <branden@debian.org>  Tue, 29 Jul 2003 15:32:39 -0500
+  * debian/{xdm,xfs}.{posinst,postrm,prerm}.in: use $THIS_PACKAGE variable to
+    drive calls to update-rc.d and invoke-rc.d
 
+ -- Branden Robinson <branden@debian.org>  Tue, 29 Jul 2003 15:42:29 -0500
+
 xfree86 (4.2.1-9) unstable; urgency=high
 
   * urgency due to xterm security fixes; see below

Modified: trunk/debian/xdm.postinst.in
==============================================================================
--- trunk/debian/xdm.postinst.in	2003-07-29 20:34:28 UTC (rev 320)
+++ trunk/debian/xdm.postinst.in	2003-07-29 20:43:51 UTC (rev 321)
@@ -80,10 +80,10 @@
 fi
 
 if [ -e /etc/init.d/xdm ]; then
-  update-rc.d xdm defaults 99 01
+  update-rc.d $THIS_PACKAGE defaults 99 01
 fi
 
-[ -n "$NOSTART" ] || invoke-rc.d xdm start || true
+[ -n "$NOSTART" ] || invoke-rc.d $THIS_PACKAGE start || true
 
 #DEBHELPER#
 

Modified: trunk/debian/xdm.postrm.in
==============================================================================
--- trunk/debian/xdm.postrm.in	2003-07-29 20:34:28 UTC (rev 320)
+++ trunk/debian/xdm.postrm.in	2003-07-29 20:43:51 UTC (rev 321)
@@ -22,7 +22,7 @@
 #DEBHELPER#
 
 if [ "$1" = "purge" ]; then
-  update-rc.d xdm remove
+  update-rc.d $THIS_PACKAGE remove
   for DIR in /etc/X11/xdm /var/lib/xdm; do
     if [ -d $DIR ]; then
       rm -r $DIR

Modified: trunk/debian/xdm.prerm.in
==============================================================================
--- trunk/debian/xdm.prerm.in	2003-07-29 20:34:28 UTC (rev 320)
+++ trunk/debian/xdm.prerm.in	2003-07-29 20:43:51 UTC (rev 321)
@@ -70,7 +70,7 @@
 fi
 
 if [ -n "$STOP" ]; then
-  invoke-rc.d xdm stop || true
+  invoke-rc.d $THIS_PACKAGE stop || true
 else
   if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then
     touch /var/run/xdm.upgrade

Modified: trunk/debian/xfs.postinst.in
==============================================================================
--- trunk/debian/xfs.postinst.in	2003-07-29 20:34:28 UTC (rev 320)
+++ trunk/debian/xfs.postinst.in	2003-07-29 20:43:51 UTC (rev 321)
@@ -30,7 +30,7 @@
 done
 
 if [ -e /etc/init.d/xfs ]; then
-  update-rc.d xfs defaults
+  update-rc.d $THIS_PACKAGE defaults
 fi
 
 NOSTART=
@@ -43,7 +43,7 @@
   NOSTART=yes
 fi
 
-[ -n "$NOSTART" ] || invoke-rc.d xfs start || true
+[ -n "$NOSTART" ] || invoke-rc.d $THIS_PACKAGE start || true
 
 #DEBHELPER#
 

Modified: trunk/debian/xfs.postrm.in
==============================================================================
--- trunk/debian/xfs.postrm.in	2003-07-29 20:34:28 UTC (rev 320)
+++ trunk/debian/xfs.postrm.in	2003-07-29 20:43:51 UTC (rev 321)
@@ -26,7 +26,7 @@
 #DEBHELPER#
 
 if [ "$1" = "purge" ]; then
-  update-rc.d xfs remove
+  update-rc.d $THIS_PACKAGE remove
   if [ -d /etc/X11/fs ]; then
     rm -r /etc/X11/fs
   fi

Modified: trunk/debian/xfs.prerm.in
==============================================================================
--- trunk/debian/xfs.prerm.in	2003-07-29 20:34:28 UTC (rev 320)
+++ trunk/debian/xfs.prerm.in	2003-07-29 20:43:51 UTC (rev 321)
@@ -28,7 +28,7 @@
 fi
 
 if [ -n "$STOP" ]; then
-  invoke-rc.d xfs stop || true
+  invoke-rc.d $THIS_PACKAGE stop || true
 else
   touch /var/run/xfs.upgrade
 fi



Reply to: