Author: branden
Date: 2003-07-30 12:02:05 -0500 (Wed, 30 Jul 2003)
New Revision: 334
Removed:
branches/4.3.0/sid/debian/xprt.links
Modified:
branches/4.3.0/sid/debian/xbase-clients.links
branches/4.3.0/sid/debian/xdm.links
branches/4.3.0/sid/debian/xdm.postinst.in
branches/4.3.0/sid/debian/xdm.postrm.in
branches/4.3.0/sid/debian/xdm.prerm.in
branches/4.3.0/sid/debian/xfree86-common.postinst.in
branches/4.3.0/sid/debian/xfs.postinst.in
branches/4.3.0/sid/debian/xfs.postrm.in
branches/4.3.0/sid/debian/xfs.prerm.in
Log:
merge revisions 320--322 and 327 from trunk
debian/{xbase-clients.links,xdm.links,xdm.postinst.in,xdm.postrm.in,
xdm.prerm.in,xfree86-common.postinst.in,xfs.postinst.in,xfs.postrm.in,
xfs.prerm.in}: synced
debian/xprt.links: deleted
Modified: branches/4.3.0/sid/debian/xbase-clients.links
==============================================================================
--- branches/4.3.0/sid/debian/xbase-clients.links 2003-07-30 16:50:44 UTC
(rev 333)
+++ branches/4.3.0/sid/debian/xbase-clients.links 2003-07-30 17:02:05 UTC
(rev 334)
@@ -1,7 +1,4 @@
etc/X11/xinit usr/X11R6/lib/X11/xinit
etc/X11/xsm usr/X11R6/lib/X11/xsm
usr/X11R6/bin/xkbcomp etc/X11/xkb/xkbcomp
-usr/share/man/man7/undocumented.7.gz usr/X11R6/man/man1/xkbbell.1x.gz
-usr/share/man/man7/undocumented.7.gz usr/X11R6/man/man1/xkbvleds.1x.gz
-usr/share/man/man7/undocumented.7.gz usr/X11R6/man/man1/xkbwatch.1x.gz
var/lib/xkb etc/X11/xkb/compiled
Modified: branches/4.3.0/sid/debian/xdm.links
==============================================================================
--- branches/4.3.0/sid/debian/xdm.links 2003-07-30 16:50:44 UTC (rev 333)
+++ branches/4.3.0/sid/debian/xdm.links 2003-07-30 17:02:05 UTC (rev 334)
@@ -1,2 +1 @@
etc/X11/xdm usr/X11R6/lib/X11/xdm
-usr/share/man/man7/undocumented.7.gz usr/X11R6/man/man1/chooser.1x.gz
Modified: branches/4.3.0/sid/debian/xdm.postinst.in
==============================================================================
--- branches/4.3.0/sid/debian/xdm.postinst.in 2003-07-30 16:50:44 UTC (rev
333)
+++ branches/4.3.0/sid/debian/xdm.postinst.in 2003-07-30 17:02:05 UTC (rev
334)
@@ -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: branches/4.3.0/sid/debian/xdm.postrm.in
==============================================================================
--- branches/4.3.0/sid/debian/xdm.postrm.in 2003-07-30 16:50:44 UTC (rev
333)
+++ branches/4.3.0/sid/debian/xdm.postrm.in 2003-07-30 17:02:05 UTC (rev
334)
@@ -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: branches/4.3.0/sid/debian/xdm.prerm.in
==============================================================================
--- branches/4.3.0/sid/debian/xdm.prerm.in 2003-07-30 16:50:44 UTC (rev
333)
+++ branches/4.3.0/sid/debian/xdm.prerm.in 2003-07-30 17:02:05 UTC (rev
334)
@@ -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: branches/4.3.0/sid/debian/xfree86-common.postinst.in
==============================================================================
--- branches/4.3.0/sid/debian/xfree86-common.postinst.in 2003-07-30
16:50:44 UTC (rev 333)
+++ branches/4.3.0/sid/debian/xfree86-common.postinst.in 2003-07-30
17:02:05 UTC (rev 334)
@@ -45,7 +45,7 @@
"/etc/X11/Xsession.d/40xfree86-common_xmodmap.xfree86-common-old."
fi
-if [ -e /etc/init.d/$THIS_PACKAGE ]; then
+if [ -e /etc/init.d/xfree86-common ]; then
update-rc.d $THIS_PACKAGE start 70 S .
fi
Modified: branches/4.3.0/sid/debian/xfs.postinst.in
==============================================================================
--- branches/4.3.0/sid/debian/xfs.postinst.in 2003-07-30 16:50:44 UTC (rev
333)
+++ branches/4.3.0/sid/debian/xfs.postinst.in 2003-07-30 17:02:05 UTC (rev
334)
@@ -33,7 +33,7 @@
done
if [ -e /etc/init.d/xfs ]; then
- update-rc.d xfs defaults
+ update-rc.d $THIS_PACKAGE defaults
fi
# restarting the daemon may cause output to stdout
@@ -49,7 +49,7 @@
NOSTART=yes
fi
-[ -n "$NOSTART" ] || invoke-rc.d xfs start || true
+[ -n "$NOSTART" ] || invoke-rc.d $THIS_PACKAGE start || true
#DEBHELPER#
Modified: branches/4.3.0/sid/debian/xfs.postrm.in
==============================================================================
--- branches/4.3.0/sid/debian/xfs.postrm.in 2003-07-30 16:50:44 UTC (rev
333)
+++ branches/4.3.0/sid/debian/xfs.postrm.in 2003-07-30 17:02:05 UTC (rev
334)
@@ -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: branches/4.3.0/sid/debian/xfs.prerm.in
==============================================================================
--- branches/4.3.0/sid/debian/xfs.prerm.in 2003-07-30 16:50:44 UTC (rev
333)
+++ branches/4.3.0/sid/debian/xfs.prerm.in 2003-07-30 17:02:05 UTC (rev
334)
@@ -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
Deleted: branches/4.3.0/sid/debian/xprt.links
==============================================================================
--- branches/4.3.0/sid/debian/xprt.links 2003-07-30 16:50:44 UTC (rev
333)
+++ branches/4.3.0/sid/debian/xprt.links 2003-07-30 17:02:05 UTC (rev
334)
@@ -1 +0,0 @@
-usr/share/man/man7/undocumented.7.gz usr/X11R6/man/man1/Xprt.1x.gz
