Author: branden
Date: 2006-08-01 12:48:26 -0400 (Tue, 01 Aug 2006)
New Revision: 2622
Modified:
branches/7.1/app/xterm/debian/NEWS
branches/7.1/app/xterm/debian/README
branches/7.1/app/xterm/debian/copyright
branches/7.1/app/xterm/debian/rules
branches/7.1/app/xterm/debian/xterm.README.Debian
branches/7.1/app/xterm/debian/xterm.menu
branches/7.1/app/xterm/debian/xterm.postinst
branches/7.1/app/xterm/debian/xterm.preinst
branches/7.1/app/xterm/debian/xterm.prerm
Log:
Restore svn:keywords property.
Update Vim modeline.
Reflow maintainer scripts to indent at four spaces.
Modified: branches/7.1/app/xterm/debian/NEWS
===================================================================
--- branches/7.1/app/xterm/debian/NEWS 2006-08-01 16:45:19 UTC (rev 2621)
+++ branches/7.1/app/xterm/debian/NEWS 2006-08-01 16:48:26 UTC (rev 2622)
@@ -15,4 +15,4 @@
$Id$
-# vim:set ai et sts=2 sw=2 tw=78:
+# vim:set ai et sw=2 ts=2 tw=78:
Property changes on: branches/7.1/app/xterm/debian/NEWS
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: branches/7.1/app/xterm/debian/README
===================================================================
--- branches/7.1/app/xterm/debian/README 2006-08-01 16:45:19 UTC (rev
2621)
+++ branches/7.1/app/xterm/debian/README 2006-08-01 16:48:26 UTC (rev
2622)
@@ -93,4 +93,4 @@
This contains Debian-specific programs and documentation that we include
in our xterm binary packages; for instance, our UTF-8 wrapper.
-vim:set ai et sw=2 sts=2 tw=80:
+vim:set ai et sw=2 ts=2 tw=80:
Property changes on: branches/7.1/app/xterm/debian/README
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: branches/7.1/app/xterm/debian/copyright
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: branches/7.1/app/xterm/debian/rules
===================================================================
--- branches/7.1/app/xterm/debian/rules 2006-08-01 16:45:19 UTC (rev 2621)
+++ branches/7.1/app/xterm/debian/rules 2006-08-01 16:48:26 UTC (rev 2622)
@@ -190,4 +190,4 @@
exit 1; \
fi
-# vim:set noet ai sts=8 sw=8 tw=0:
+# vim:set ai noet sw=8 ts=8 tw=0:
Property changes on: branches/7.1/app/xterm/debian/rules
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: branches/7.1/app/xterm/debian/xterm.README.Debian
===================================================================
--- branches/7.1/app/xterm/debian/xterm.README.Debian 2006-08-01 16:45:19 UTC
(rev 2621)
+++ branches/7.1/app/xterm/debian/xterm.README.Debian 2006-08-01 16:48:26 UTC
(rev 2622)
@@ -45,6 +45,6 @@
consistent with the Linux virtual console (and therefore with the behavior
of DEC VT 220 terminals).
-$Id: xterm.README.Debian 405 2005-07-24 04:46:38Z dnusinow $
+$Id$
-vim:set ai et sts=4 sw=4 tw=80:
+vim:set ai et sw=4 ts=4 tw=80:
Property changes on: branches/7.1/app/xterm/debian/xterm.README.Debian
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: branches/7.1/app/xterm/debian/xterm.menu
===================================================================
--- branches/7.1/app/xterm/debian/xterm.menu 2006-08-01 16:45:19 UTC (rev
2621)
+++ branches/7.1/app/xterm/debian/xterm.menu 2006-08-01 16:48:26 UTC (rev
2622)
@@ -1,4 +1,4 @@
-# $Id: xterm.menu 189 2005-06-11 00:04:27Z branden $
+# $Id$
?package(xterm):\
needs="x11"\
Property changes on: branches/7.1/app/xterm/debian/xterm.menu
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: branches/7.1/app/xterm/debian/xterm.postinst
===================================================================
--- branches/7.1/app/xterm/debian/xterm.postinst 2006-08-01 16:45:19 UTC
(rev 2621)
+++ branches/7.1/app/xterm/debian/xterm.postinst 2006-08-01 16:48:26 UTC
(rev 2622)
@@ -5,35 +5,32 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-# $Id: xterm.postinst.in 189 2005-06-11 00:04:27Z branden $
+# $Id$
set -e
-THIS_PACKAGE=xterm
-THIS_SCRIPT=postinst
-
update-alternatives --install /usr/bin/x-terminal-emulator \
- x-terminal-emulator /usr/bin/xterm 20 --slave \
- /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \
- /usr/share/man/man1/xterm.1x.gz
+ x-terminal-emulator /usr/bin/xterm 20 --slave \
+ /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \
+ /usr/share/man/man1/xterm.1x.gz
update-alternatives --install /usr/bin/x-terminal-emulator \
- x-terminal-emulator /usr/bin/uxterm 20 --slave \
- /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \
- /usr/share/man/man1/uxterm.1x.gz
+ x-terminal-emulator /usr/bin/uxterm 20 --slave \
+ /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \
+ /usr/share/man/man1/uxterm.1x.gz
update-alternatives --install /usr/bin/x-terminal-emulator \
- x-terminal-emulator /usr/bin/koi8rxterm 20 --slave \
- /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \
- /usr/share/man/man1/koi8rxterm.1x.gz
+ x-terminal-emulator /usr/bin/koi8rxterm 20 --slave \
+ /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \
+ /usr/share/man/man1/koi8rxterm.1x.gz
update-alternatives --install /usr/bin/x-terminal-emulator \
- x-terminal-emulator /usr/bin/lxterm 30 --slave \
- /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \
- /usr/share/man/man1/lxterm.1x.gz
+ x-terminal-emulator /usr/bin/lxterm 30 --slave \
+ /usr/share/man/man1/x-terminal-emulator.1x.gz x-terminal-emulator.1x.gz \
+ /usr/share/man/man1/lxterm.1x.gz
#DEBHELPER#
exit 0
-# vim:set ai et sts=2 sw=2 tw=0:
+# vim:set ai et sw=4 ts=4 tw=80:
Property changes on: branches/7.1/app/xterm/debian/xterm.postinst
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: branches/7.1/app/xterm/debian/xterm.preinst
===================================================================
--- branches/7.1/app/xterm/debian/xterm.preinst 2006-08-01 16:45:19 UTC (rev
2621)
+++ branches/7.1/app/xterm/debian/xterm.preinst 2006-08-01 16:48:26 UTC (rev
2622)
@@ -5,40 +5,37 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-# $Id: xterm.preinst.in 189 2005-06-11 00:04:27Z branden $
+# $Id$
set -e
-THIS_PACKAGE=xterm
-THIS_SCRIPT=preinst
-
-#INCLUDE_SHELL_LIB#
-
if [ "$1" = "upgrade" ] || [ "$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
+ 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
- if dpkg --compare-versions "$2" lt "204"; then
- # clean up after older alternative that used different path
- if update-alternatives --display x-terminal-emulator |
- fgrep -q /usr/X11R6/bin/xterm; then
-
- update-alternatives --remove x-terminal-emulator
/usr/X11R6/bin/koi8rxterm
- update-alternatives --remove x-terminal-emulator /usr/X11R6/bin/uxterm
- update-alternatives --remove x-terminal-emulator /usr/X11R6/bin/xterm
- update-alternatives --remove x-terminal-emulator /usr/X11R6/bin/lxterm
-
+ if dpkg --compare-versions "$2" lt "204"; then
+ # Clean up after older alternative that used different path.
+ if update-alternatives --display x-terminal-emulator |
+ fgrep -q /usr/X11R6/bin/xterm; then
+ update-alternatives --remove x-terminal-emulator \
+ /usr/X11R6/bin/koi8rxterm
+ update-alternatives --remove x-terminal-emulator \
+ /usr/X11R6/bin/uxterm
+ update-alternatives --remove x-terminal-emulator \
+ /usr/X11R6/bin/xterm
+ update-alternatives --remove x-terminal-emulator \
+ /usr/X11R6/bin/lxterm
+ fi
fi
- fi
fi
#DEBHELPER#
exit 0
-# vim:set ai et sts=2 sw=2 tw=0:
+# vim:set ai et sw=4 ts=4 tw=80:
Property changes on: branches/7.1/app/xterm/debian/xterm.preinst
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: branches/7.1/app/xterm/debian/xterm.prerm
===================================================================
--- branches/7.1/app/xterm/debian/xterm.prerm 2006-08-01 16:45:19 UTC (rev
2621)
+++ branches/7.1/app/xterm/debian/xterm.prerm 2006-08-01 16:48:26 UTC (rev
2622)
@@ -5,24 +5,19 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-# $Id: xterm.prerm.in 189 2005-06-11 00:04:27Z branden $
+# $Id$
set -e
-THIS_PACKAGE=xterm
-THIS_SCRIPT=prerm
-
-#INCLUDE_SHELL_LIB#
-
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
- update-alternatives --remove x-terminal-emulator /usr/bin/koi8rxterm
- update-alternatives --remove x-terminal-emulator /usr/bin/uxterm
- update-alternatives --remove x-terminal-emulator /usr/bin/xterm
- update-alternatives --remove x-terminal-emulator /usr/bin/lxterm
+ update-alternatives --remove x-terminal-emulator /usr/bin/koi8rxterm
+ update-alternatives --remove x-terminal-emulator /usr/bin/uxterm
+ update-alternatives --remove x-terminal-emulator /usr/bin/xterm
+ update-alternatives --remove x-terminal-emulator /usr/bin/lxterm
fi
#DEBHELPER#
exit 0
-# vim:set ai et sts=2 sw=2 tw=0:
+# vim:set ai et sw=4 ts=4 tw=80:
Property changes on: branches/7.1/app/xterm/debian/xterm.prerm
___________________________________________________________________
Name: svn:keywords
+ Id
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
