X Strike Force SVN commit: rev 501 - trunk/debian
Author: branden
Date: 2003-09-10 07:12:22 -0500 (Wed, 10 Sep 2003)
New Revision: 501
Added:
trunk/debian/xterm.preinst.in
Modified:
trunk/debian/changelog
trunk/debian/xterm.postinst.in
Log:
debian/xterm.{preinst,postinst}.in: migrate removal of obsolete old xterm
alternative to the package preinst script where it belongs
- update copryight notices
- add $Id$ expandos
- set svn:keywords property to "Id"
- wrap lines at 80 columns
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-09-10 12:05:34 UTC (rev 500)
+++ trunk/debian/changelog 2003-09-10 12:12:22 UTC (rev 501)
@@ -90,8 +90,11 @@
- debian/{xfree86-common,xbase-clients}.postrm.in: use
remove_conffile_rollback()
- -- Branden Robinson <branden@debian.org> Wed, 10 Sep 2003 06:59:21 -0500
+ * debian/xterm.{preinst,postinst}.in: migrate removal of obsolete old xterm
+ alternative to the package preinst script where it belongs
+ -- Branden Robinson <branden@debian.org> Wed, 10 Sep 2003 07:10:14 -0500
+
xfree86 (4.2.1-11) unstable; urgency=medium
* urgency set to medium because bug #206790 bites a lot of people (but,
Modified: trunk/debian/xterm.postinst.in
===================================================================
--- trunk/debian/xterm.postinst.in 2003-09-10 12:05:34 UTC (rev 500)
+++ trunk/debian/xterm.postinst.in 2003-09-10 12:12:22 UTC (rev 501)
@@ -1,10 +1,12 @@
#!/bin/sh
# Debian xterm package post-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998--2001, 2003 Branden Robinson.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+# $Id$
+
set -e
THIS_PACKAGE=xterm
@@ -12,17 +14,16 @@
#INCLUDE_SHELL_LIB#
-update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /usr/X11R6/bin/xterm 20 \
- --slave /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /usr/X11R6/man/man1/xterm.1x.gz
+update-alternatives --install /usr/bin/x-terminal-emulator \
+ x-terminal-emulator /usr/X11R6/bin/xterm 20 --slave \
+ /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
+ /usr/X11R6/man/man1/xterm.1x.gz
-update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /usr/X11R6/bin/uxterm 20 \
- --slave /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /usr/X11R6/man/man1/uxterm.1x.gz
+update-alternatives --install /usr/bin/x-terminal-emulator \
+ x-terminal-emulator /usr/X11R6/bin/uxterm 20 --slave \
+ /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
+ /usr/X11R6/man/man1/uxterm.1x.gz
-# clean up after older alternative that used different path
-if update-alternatives --display x-terminal-emulator | grep -q /usr/bin/X11/xterm; then
- update-alternatives --remove x-terminal-emulator /usr/bin/X11/xterm
-fi
-
#DEBHELPER#
exit 0
Property changes on: trunk/debian/xterm.postinst.in
___________________________________________________________________
Name: svn:keywords
+ Id
Added: trunk/debian/xterm.preinst.in
===================================================================
--- trunk/debian/xterm.preinst.in 2003-09-10 12:05:34 UTC (rev 500)
+++ trunk/debian/xterm.preinst.in 2003-09-10 12:12:22 UTC (rev 501)
@@ -0,0 +1,31 @@
+#!/bin/sh
+# Debian xterm package pre-installation script
+# Copyright 2003 Branden Robinson.
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id$
+
+set -e
+
+THIS_PACKAGE=xterm
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "upgrade" -o "$1" = "install" ]; then
+ if dpkg --compare-versions "$2" lt "4.0.1-1"; then
+ # clean up after older alternative that used different path
+ if update-alternatives --display x-terminal-emulator | \
+ fgrep -q /usr/bin/X11/xterm; then
+ update-alternatives --remove x-terminal-emulator /usr/bin/X11/xterm
+ fi
+ fi
+fi
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=0:
Property changes on: trunk/debian/xterm.preinst.in
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: