Author: branden
Date: 2003-10-27 18:58:52 -0500 (Mon, 27 Oct 2003)
New Revision: 733
Added:
people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.dirs
people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.postrm.in
people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.preinst.in
Modified:
people/branden/xlibs-and-xbase-clients-split/debian/changelog
people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.postinst.in
people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.prerm.in
Log:
Merge revision 732 from branches/4.3.0/sid.
Modified: people/branden/xlibs-and-xbase-clients-split/debian/changelog
===================================================================
--- people/branden/xlibs-and-xbase-clients-split/debian/changelog 2003-10-27
23:54:50 UTC (rev 732)
+++ people/branden/xlibs-and-xbase-clients-split/debian/changelog 2003-10-27
23:58:52 UTC (rev 733)
@@ -37,8 +37,23 @@
package containing libXmuu.so.1 will be called "libxmuu1", not "libxmuu6".
- debian/xlibs.shlibs
- -- Branden Robinson <[EMAIL PROTECTED]> Mon, 27 Oct 2003 16:29:12 -0500
+ * Move correction of old /usr/X11R6/lib/X11/locale symlink problem from
+ xlibs package to xlibs-data, and convert from simple remove-in-preinst
+ approach to prepare-preinst/commit-postinst/rollback-postrm model.
+ Correct mis-self-identification of xlibs-data's maintainer scripts (caused
+ by sloppy cut-and-pasting), correct and update their copyright
+ information, and use debhelper to ship the
+ /usr/X11R6/lib/X11/icons/default directory instead of creating it behind
+ the packaging system's back in xlibs-data's postinst.
+ - debian/xlibs-data.dirs
+ - debian/xlibs-data.postinst.in
+ - debian/xlibs-data.postrm.in
+ - debian/xlibs-data.preinst.in
+ - debian/xlibs-data.prerm.in
+ - debian/xlibs.preinst.in
+ -- Branden Robinson <[EMAIL PROTECTED]> Mon, 27 Oct 2003 18:47:24 -0500
+
xfree86 (4.3.0-0pre1v4) experimental; urgency=low
* Add missing symbolic links for libXTrap. [ISHIKAWA Mutsumi]
Added: people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.dirs
===================================================================
--- people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.dirs 2003-10-27
23:54:50 UTC (rev 732)
+++ people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.dirs 2003-10-27
23:58:52 UTC (rev 733)
@@ -0,0 +1 @@
+usr/X11R6/lib/X11/icons/default
Modified: people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.postinst.in
===================================================================
--- people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.postinst.in
2003-10-27 23:54:50 UTC (rev 732)
+++ people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.postinst.in
2003-10-27 23:58:52 UTC (rev 733)
@@ -1,24 +1,33 @@
#!/bin/sh
-# Debian xterm package post-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Debian xlibs-data package post-installation script
+# Copyright 2003 Daniel Stone, 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=xlibs-data
THIS_SCRIPT=postinst
-# source debconf library
-. /usr/share/debconf/confmodule
+#INCLUDE_SHELL_LIB#
-if [ ! -d /usr/X11R6/lib/X11/icons/default ]; then
- mkdir -p /usr/X11R6/lib/X11/icons/default
+# finish cleanup started in preinst
+LINK="/usr/X11R6/lib/X11/locale"
+if [ -e "$LINK.dpkg-tmp" ]; then
+ observe "committing removal of obsolete symbolic link $LINK"
+ rm "$LINK.dpkg-tmp"
fi
-update-alternatives --install /usr/X11R6/lib/X11/icons/default/index.theme
x-cursor-theme /etc/X11/cursors/core.theme 30
-for i in redglass whiteglass handhelds; do
- update-alternatives --install /usr/X11R6/lib/X11/icons/default/index.theme
x-cursor-theme /etc/X11/cursors/$i.theme 20
+
+# register available X cursor themes with update-alternatives
+update-alternatives --install /usr/X11R6/lib/X11/icons/default/index.theme \
+ x-cursor-theme /etc/X11/cursors/core.theme 30
+for THEME in redglass whiteglass handhelds; do
+ update-alternatives --install /usr/X11R6/lib/X11/icons/default/index.theme \
+ x-cursor-theme "/etc/X11/cursors/$THEME.theme" \
+ 20
done
#DEBHELPER#
Property changes on:
people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.postinst.in
___________________________________________________________________
Name: svn:keywords
+ Id
Added: people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.postrm.in
===================================================================
--- people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.postrm.in
2003-10-27 23:54:50 UTC (rev 732)
+++ people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.postrm.in
2003-10-27 23:58:52 UTC (rev 733)
@@ -0,0 +1,30 @@
+#!/bin/sh
+# Debian xlibs-data package post-removal 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=xlibs-data
+THIS_SCRIPT=postrm
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then
+ # revert cleanup started in preinst
+ LINK="/usr/X11R6/lib/X11/locale"
+ if [ -e "$LINK.dpkg-tmp" ]; then
+ observe "rolling back removal of obsolete symbolic link $LINK"
+ mv "$LINK.dpkg-tmp" "$LINK"
+ fi
+fi
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=0:
Property changes on:
people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.postrm.in
___________________________________________________________________
Name: svn:keywords
+ Id
Added: people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.preinst.in
===================================================================
--- people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.preinst.in
2003-10-27 23:54:50 UTC (rev 732)
+++ people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.preinst.in
2003-10-27 23:58:52 UTC (rev 733)
@@ -0,0 +1,30 @@
+#!/bin/sh
+# Debian xlibs-data 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=xlibs-data
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "install" -o "$1" = "upgrade" ]; then
+ # clean up after a mess made in 3.3.2.3a-2 to 3.3.2.3a-7
+ LINK="/usr/X11R6/lib/X11/locale"
+ if [ -L "$LINK" ]; then
+ observe "preparing obsolete symbolic link $LINK for removal"
+ mv "$LINK" "$LINK.dpkg-tmp"
+ fi
+fi
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=0:
Property changes on:
people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.preinst.in
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.prerm.in
===================================================================
--- people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.prerm.in
2003-10-27 23:54:50 UTC (rev 732)
+++ people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.prerm.in
2003-10-27 23:58:52 UTC (rev 733)
@@ -1,20 +1,24 @@
#!/bin/sh
-# Debian xterm package pre-removal script
-# Copyright 1998, 1999 Branden Robinson.
-# Copyright 2003 Daniel Stone.
+# Debian xlibs-data package pre-removal script
+# Copyright 2003 Daniel Stone, 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=xlibs-data
THIS_SCRIPT=prerm
+#INCLUDE_SHELL_LIB#
+
if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
+ # deregister available X cursor themes with update-alternatives
update-alternatives --remove x-cursor-theme /etc/X11/cursors/core.theme
- for i in whiteglass redglass handhelds; do
- update-alternatives --remove x-cursor-theme /etc/X11/cursors/$i.theme
+ for THEME in whiteglass redglass handhelds; do
+ update-alternatives --remove x-cursor-theme "/etc/X11/cursors/$THEME.theme"
done
fi
Property changes on:
people/branden/xlibs-and-xbase-clients-split/debian/xlibs-data.prerm.in
___________________________________________________________________
Name: svn:keywords
+ Id
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
