Author: branden Date: 2003-10-27 21:26:46 -0500 (Mon, 27 Oct 2003) New Revision: 734
Added: people/branden/xlibs-and-xbase-clients-split/debian/libice6.install people/branden/xlibs-and-xbase-clients-split/debian/libice6.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libice6.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libice6.shlibs people/branden/xlibs-and-xbase-clients-split/debian/libsm6.install people/branden/xlibs-and-xbase-clients-split/debian/libsm6.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libsm6.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libsm6.shlibs people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.install people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.links people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.preinst.in people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.shlibs people/branden/xlibs-and-xbase-clients-split/debian/libxext6.install people/branden/xlibs-and-xbase-clients-split/debian/libxext6.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libxext6.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libxext6.shlibs people/branden/xlibs-and-xbase-clients-split/debian/libxft1.install people/branden/xlibs-and-xbase-clients-split/debian/libxft1.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libxft1.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libxft1.shlibs people/branden/xlibs-and-xbase-clients-split/debian/libxi6.install people/branden/xlibs-and-xbase-clients-split/debian/libxi6.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libxi6.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libxi6.shlibs people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.install people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.shlibs people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.install people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.shlibs people/branden/xlibs-and-xbase-clients-split/debian/libxp6.install people/branden/xlibs-and-xbase-clients-split/debian/libxp6.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libxp6.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libxp6.shlibs people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.install people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.shlibs people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.install people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.shlibs people/branden/xlibs-and-xbase-clients-split/debian/libxt6.dirs people/branden/xlibs-and-xbase-clients-split/debian/libxt6.install people/branden/xlibs-and-xbase-clients-split/debian/libxt6.links people/branden/xlibs-and-xbase-clients-split/debian/libxt6.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libxt6.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libxt6.preinst.in people/branden/xlibs-and-xbase-clients-split/debian/libxt6.shlibs people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.install people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.shlibs people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.install people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.shlibs people/branden/xlibs-and-xbase-clients-split/debian/libxv1.install people/branden/xlibs-and-xbase-clients-split/debian/libxv1.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/libxv1.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/libxv1.shlibs Removed: people/branden/xlibs-and-xbase-clients-split/debian/xlibs.dirs people/branden/xlibs-and-xbase-clients-split/debian/xlibs.links people/branden/xlibs-and-xbase-clients-split/debian/xlibs.postinst.in people/branden/xlibs-and-xbase-clients-split/debian/xlibs.postrm.in people/branden/xlibs-and-xbase-clients-split/debian/xlibs.preinst.in people/branden/xlibs-and-xbase-clients-split/debian/xlibs.shlibs people/branden/xlibs-and-xbase-clients-split/debian/xlibs.shlibs.dummy Modified: people/branden/xlibs-and-xbase-clients-split/debian/changelog people/branden/xlibs-and-xbase-clients-split/debian/rules people/branden/xlibs-and-xbase-clients-split/debian/scripts/manifest-install-reconcile people/branden/xlibs-and-xbase-clients-split/debian/shell-lib.sh people/branden/xlibs-and-xbase-clients-split/debian/xlibs.install Log: Split xlibs package into one package per shared library, keeping only the XKB data files in xlibs (see above). The XRX plugin (/usr/X11R6/lib/libxrx.so.6.3) and its manpage are being dropped entirely. (The needed update to debian/control will follow in a subsequent commit.) - debian/xlibs.install: stop shipping everything but the XKB data - debian/xlibs.{dirs,links,postinst.in,postrm.in,preinst.in,shlibs, shlibs.dummy}: deleted - debian/rules: eliminate special dh_shlibdeps handling for xlibs package; no longer needed - debian/scripts/manifest-install-reconcile: add libxrx shared library and object to list of files expected to be unshipped - debian/shell-lib.sh: define new functions to aid maintainer scripts of new libraries + register_x_lib_dir_with_ld_so(): add /usr/X11R6/lib to /etc/ld.so.conf if needed + deregister_x_lib_dir_with_ld_so(): remove /usr/X11R6/lib from /etc/ld.so.conf when no shared libraries left in directory - debian/{libice6,libsm6,libx11-6,libxext6,libxft1,libxi6,libxmu6, libxmuu1,libxp6,libxpm4,libxrandr2,libxt6,libxtrap6,libxtst6, libxv1}.install: new; ship shared library - debian/{libice6,libsm6,libx11-6,libxext6,libxft1,libxi6,libxmu6, libxmuu1,libxp6,libxpm4,libxrandr2,libxt6,libxtrap6,libxtst6, libxv1}.shlibs: new; provide shlibs file, specifying alternative versioned dependencies on older versions of xlibs (except in the case of libxv1, for which a shared version did not exist in XFree86 prior to 4.3) - debian/{libice6,libsm6,libx11-6,libxext6,libxft1,libxi6,libxmu6, libxmuu1,libxp6,libxpm4,libxrandr2,libxt6,libxtrap6,libxtst6, libxv1}.{postinst,postrm}: new; call register_x_lib_dir_with_ld_so(), deregister_x_lib_dir_with_ld_so(), and ldconfig as appropriate - debian/{libx11-6,libxt6}.{preinst,postinst,postrm}: migrate /usr/X11R6/lib/X11/{app-defaults,xkb} prepare/commit/rollback handling from xlibs maintainer scripts, now deceased - debian/libx11-6.links: migrated from xlibs.links for /usr/X11R6/lib/X11/xkb symlink - debian/libxt6.dirs: migrated from xlibs.dirs for /etc/X11/app-defaults directory - debian/libxt6.links: migrated from xlibs.links for /usr/X11R6/lib/X11/app-defaults symlink Modified: people/branden/xlibs-and-xbase-clients-split/debian/changelog =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/changelog 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/changelog 2003-10-28 02:26:46 UTC (rev 734) @@ -52,8 +52,47 @@ - debian/xlibs-data.prerm.in - debian/xlibs.preinst.in - -- Branden Robinson <[EMAIL PROTECTED]> Mon, 27 Oct 2003 18:47:24 -0500 + * Split xlibs package into one package per shared library, keeping only the + XKB data files in xlibs (see above). The XRX plugin + (/usr/X11R6/lib/libxrx.so.6.3) and its manpage are being dropped entirely. + - debian/xlibs.install: stop shipping everything but the XKB data + - debian/xlibs.{dirs,links,postinst.in,postrm.in,preinst.in,shlibs, + shlibs.dummy}: deleted + - debian/rules: eliminate special dh_shlibdeps handling for xlibs package; + no longer needed + - debian/scripts/manifest-install-reconcile: add libxrx shared library and + object to list of files expected to be unshipped + - debian/shell-lib.sh: define new functions to aid maintainer scripts of + new libraries + + register_x_lib_dir_with_ld_so(): add /usr/X11R6/lib to /etc/ld.so.conf + if needed + + deregister_x_lib_dir_with_ld_so(): remove /usr/X11R6/lib from + /etc/ld.so.conf when no shared libraries left in directory + - debian/{libice6,libsm6,libx11-6,libxext6,libxft1,libxi6,libxmu6, + libxmuu1,libxp6,libxpm4,libxrandr2,libxt6,libxtrap6,libxtst6, + libxv1}.install: new; ship shared library + - debian/{libice6,libsm6,libx11-6,libxext6,libxft1,libxi6,libxmu6, + libxmuu1,libxp6,libxpm4,libxrandr2,libxt6,libxtrap6,libxtst6, + libxv1}.shlibs: new; provide shlibs file, specifying alternative + versioned dependencies on older versions of xlibs (except in the case of + libxv1, for which a shared version did not exist in XFree86 prior to + 4.3) + - debian/{libice6,libsm6,libx11-6,libxext6,libxft1,libxi6,libxmu6, + libxmuu1,libxp6,libxpm4,libxrandr2,libxt6,libxtrap6,libxtst6, + libxv1}.{postinst,postrm}: new; call register_x_lib_dir_with_ld_so(), + deregister_x_lib_dir_with_ld_so(), and ldconfig as appropriate + - debian/{libx11-6,libxt6}.{preinst,postinst,postrm}: migrate + /usr/X11R6/lib/X11/{app-defaults,xkb} prepare/commit/rollback handling + from xlibs maintainer scripts, now deceased + - debian/libx11-6.links: migrated from xlibs.links for + /usr/X11R6/lib/X11/xkb symlink + - debian/libxt6.dirs: migrated from xlibs.dirs for /etc/X11/app-defaults + directory + - debian/libxt6.links: migrated from xlibs.links for + /usr/X11R6/lib/X11/app-defaults symlink + -- Branden Robinson <[EMAIL PROTECTED]> Mon, 27 Oct 2003 20:34:55 -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/libice6.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libice6.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libice6.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +usr/X11R6/lib/libICE.so.6.3 Added: people/branden/xlibs-and-xbase-clients-split/debian/libice6.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libice6.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libice6.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,24 @@ +#!/bin/sh +# Debian libice6 package post-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=libice6 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libice6.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libice6.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libice6.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libice6.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian libice6 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=libice6 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libice6.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libice6.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libice6.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libice6.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libICE 6 libice6 | xlibs (>> 4.1.0) Added: people/branden/xlibs-and-xbase-clients-split/debian/libsm6.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libsm6.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libsm6.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +usr/X11R6/lib/libSM.so.6.0 Added: people/branden/xlibs-and-xbase-clients-split/debian/libsm6.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libsm6.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libsm6.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,24 @@ +#!/bin/sh +# Debian libsm6 package post-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=libsm6 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libsm6.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libsm6.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libsm6.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libsm6.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian libsm6 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=libsm6 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libsm6.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libsm6.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libsm6.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libsm6.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libSM 6 libsm6 | xlibs (>> 4.1.0) Added: people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,7 @@ +usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2 +usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2 +usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2 +usr/X11R6/lib/X11/locale/lib/common/xlibi18n.so.2 +usr/X11R6/lib/X11/locale/lib/common/xlocale.so.2 +usr/X11R6/lib/X11/locale/lib/common/xomGeneric.so.2 +usr/X11R6/lib/libX11.so.6.2 Added: people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.links =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.links 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.links 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +etc/X11/xkb usr/X11R6/lib/X11/xkb Added: people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,32 @@ +#!/bin/sh +# Debian libx11-6 package post-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=libx11-6 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +# finish migration started in preinst +DIR=/usr/X11R6/lib/X11/xkb +if [ -d "$DIR.dpkg-tmp" -a -L "$DIR" ]; then + observe "committing removal of obsolete directory $DIR" + rm -r "$DIR" +fi +check_symlinks_and_bomb "$DIR" + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,35 @@ +#!/bin/sh +# Debian libx11-6 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=libx11-6 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then + # roll back migration started in preinst + DIR=/usr/X11R6/lib/X11/xkb + if [ -d "$DIR.dpkg-tmp" ]; then + observe "rolling back removal of obsolete directory $DIR" + mv "$DIR.dpkg-tmp" "$DIR" + fi +fi + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libx11-6.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.preinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.preinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.preinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,31 @@ +#!/bin/sh +# Debian libx11-6 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=libx11-6 +THIS_SCRIPT=preinst + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "install" -o "$1" = "upgrade" ]; then + # xkb directory moved in 4.0 + DIR=/usr/X11R6/lib/X11/xkb + if [ -d "$DIR" -a ! -L "$DIR" ]; then + observe "preparing obsolete directory $DIR for removal" + mv "$DIR" "$DIR.dpkg-tmp" + fi + check_symlinks_and_warn "$DIR" +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/libx11-6.preinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libX11 6 libx11-6 | xlibs (>> 4.1.0) Added: people/branden/xlibs-and-xbase-clients-split/debian/libxext6.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxext6.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxext6.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +usr/X11R6/lib/libXext.so.6.4 Added: people/branden/xlibs-and-xbase-clients-split/debian/libxext6.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxext6.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxext6.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,24 @@ +#!/bin/sh +# Debian libxext6 package post-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=libxext6 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libxext6.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxext6.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxext6.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxext6.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian libxext6 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=libxext6 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libxext6.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxext6.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxext6.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxext6.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libXext 6 libxext6 | xlibs (>> 4.1.0) Added: people/branden/xlibs-and-xbase-clients-split/debian/libxft1.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxft1.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxft1.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +usr/X11R6/lib/libXft.so.1.1 Added: people/branden/xlibs-and-xbase-clients-split/debian/libxft1.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxft1.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxft1.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,24 @@ +#!/bin/sh +# Debian libxft1 package post-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=libxft1 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libxft1.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxft1.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxft1.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxft1.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian libxft1 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=libxft1 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libxft1.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxft1.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxft1.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxft1.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libXft 1 libxft1 | xlibs (>> 4.1.0) Added: people/branden/xlibs-and-xbase-clients-split/debian/libxi6.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxi6.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxi6.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +usr/X11R6/lib/libXi.so.6.0 Added: people/branden/xlibs-and-xbase-clients-split/debian/libxi6.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxi6.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxi6.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,24 @@ +#!/bin/sh +# Debian libxi6 package post-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=libxi6 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libxi6.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxi6.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxi6.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxi6.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian libxi6 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=libxi6 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libxi6.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxi6.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxi6.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxi6.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libXi 6 libxi6 | xlibs (>> 4.1.0) Added: people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +usr/X11R6/lib/libXmu.so.6.2 Added: people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,24 @@ +#!/bin/sh +# Debian libxmu6 package post-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=libxmu6 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian libxmu6 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=libxmu6 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libxmu6.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxmu6.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libXmu 6 libxmu6 | xlibs (>> 4.1.0) Added: people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +usr/X11R6/lib/libXmuu.so.1.0 Added: people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,24 @@ +#!/bin/sh +# Debian libxmuu1 package post-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=libxmuu1 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian libxmuu1 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=libxmuu1 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libxmuu1.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxmuu1.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libXmuu 1 libxmuu1 | xlibs (>> 4.1.0) Added: people/branden/xlibs-and-xbase-clients-split/debian/libxp6.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxp6.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxp6.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +usr/X11R6/lib/libXp.so.6.2 Added: people/branden/xlibs-and-xbase-clients-split/debian/libxp6.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxp6.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxp6.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,24 @@ +#!/bin/sh +# Debian libxp6 package post-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=libxp6 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libxp6.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxp6.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxp6.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxp6.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian libxp6 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=libxp6 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libxp6.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxp6.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxp6.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxp6.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libXp 6 libxp6 | xlibs (>> 4.1.0) Added: people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +usr/X11R6/lib/libXpm.so.4.11 Added: people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,24 @@ +#!/bin/sh +# Debian libxpm4 package post-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=libxpm4 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian libxpm4 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=libxpm4 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libxpm4.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxpm4.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libXpm 4 libxpm4 | xlibs (>> 4.1.0) Added: people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +usr/X11R6/lib/libXrandr.so.2.0 Added: people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,24 @@ +#!/bin/sh +# Debian libxrandr2 package post-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=libxrandr2 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian libxrandr2 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=libxrandr2 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libxrandr2.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxrandr2.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libXrandr 2 libxrandr2 | xlibs (>> 4.3.0) Added: people/branden/xlibs-and-xbase-clients-split/debian/libxt6.dirs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxt6.dirs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxt6.dirs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +etc/X11/app-defaults Added: people/branden/xlibs-and-xbase-clients-split/debian/libxt6.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxt6.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxt6.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +usr/X11R6/lib/libXt.so.6.0 Added: people/branden/xlibs-and-xbase-clients-split/debian/libxt6.links =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxt6.links 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxt6.links 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +etc/X11/app-defaults usr/X11R6/lib/X11/app-defaults Added: people/branden/xlibs-and-xbase-clients-split/debian/libxt6.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxt6.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxt6.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,32 @@ +#!/bin/sh +# Debian libxt6 package post-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=libxt6 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +# finish migration started in preinst +DIR=/usr/X11R6/lib/X11/app-defaults +if [ -d "$DIR.dpkg-tmp" -a -L "$DIR" ]; then + observe "committing removal of obsolete directory $DIR" + rm -r "$DIR" +fi +check_symlinks_and_bomb "$DIR" + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libxt6.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxt6.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxt6.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxt6.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,35 @@ +#!/bin/sh +# Debian libxt6 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=libxt6 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then + # roll back migration started in preinst + DIR=/usr/X11R6/lib/X11/app-defaults + if [ -d "$DIR.dpkg-tmp" ]; then + observe "rolling back removal of obsolete directory $DIR" + mv "$DIR.dpkg-tmp" "$DIR" + fi +fi + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libxt6.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxt6.preinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxt6.preinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxt6.preinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,31 @@ +#!/bin/sh +# Debian libxt6 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=libxt6 +THIS_SCRIPT=preinst + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "install" -o "$1" = "upgrade" ]; then + # app-defaults directory moved in 4.0 + DIR=/usr/X11R6/lib/X11/app-defaults + if [ -d "$DIR" -a ! -L "$DIR" ]; then + observe "preparing obsolete directory $DIR for removal" + mv "$DIR" "$DIR.dpkg-tmp" + fi + check_symlinks_and_warn "$DIR" +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/libxt6.preinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxt6.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxt6.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxt6.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libXt 6 libxt6 | xlibs (>> 4.1.0) Added: people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +usr/X11R6/lib/libXTrap.so.6.4 Added: people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,24 @@ +#!/bin/sh +# Debian libxtrap6 package post-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=libxtrap6 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian libxtrap6 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=libxtrap6 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libxtrap6.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxtrap6.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libXTrap 6 libxtrap6 | xlibs (>> 4.2.0) Added: people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +usr/X11R6/lib/libXtst.so.6.1 Added: people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,24 @@ +#!/bin/sh +# Debian libxtst6 package post-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=libxtst6 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian libxtst6 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=libxtst6 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libxtst6.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxtst6.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libXtst 6 libxtst6 | xlibs (>> 4.1.0) Added: people/branden/xlibs-and-xbase-clients-split/debian/libxv1.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxv1.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxv1.install 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +usr/X11R6/lib/libXv.so.1.0 Added: people/branden/xlibs-and-xbase-clients-split/debian/libxv1.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxv1.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxv1.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,24 @@ +#!/bin/sh +# Debian libxv1 package post-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=libxv1 +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +register_x_lib_dir_with_ld_so +ldconfig + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: Property changes on: people/branden/xlibs-and-xbase-clients-split/debian/libxv1.postinst.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxv1.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxv1.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxv1.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian libxv1 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=libxv1 +THIS_SCRIPT=postrm + +#INCLUDE_SHELL_LIB# + +if [ "$1" = "remove" ]; then + deregister_x_lib_dir_with_ld_so + ldconfig +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/libxv1.postrm.in ___________________________________________________________________ Name: svn:keywords + Id Added: people/branden/xlibs-and-xbase-clients-split/debian/libxv1.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/libxv1.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/libxv1.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -0,0 +1 @@ +libXv 1 libxv1 Modified: people/branden/xlibs-and-xbase-clients-split/debian/rules =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/rules 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/rules 2003-10-28 02:26:46 UTC (rev 734) @@ -422,10 +422,7 @@ chown :utmp debian/xterm/usr/X11R6/bin/xterm chmod g+s debian/xterm/usr/X11R6/bin/xterm dh_installdeb - dh_shlibdeps -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib -Nxlibs --exclude=usr/X11R6/lib/modules - # xlibs needs to be given a special shlibs file so that dpkg-shlibdeps - # doesn't try to make it depend on itself - DH_OPTIONS= dh_shlibdeps -l$(DEBTREEDIR)/usr/X11R6/lib -pxlibs --exclude=libxrx.so -- -Ldebian/xlibs.shlibs.dummy + dh_shlibdeps -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib --exclude=usr/X11R6/lib/modules dh_gencontrol -- -VF:XWSC-Special-Depends=$(XWSC_SPECIAL_DEPENDS) -VF:Xlibmesa-gl-Special-Depends=$(XLIBMESA_GL_SPECIAL_DEPENDS) dh_md5sums dh_builddeb Modified: people/branden/xlibs-and-xbase-clients-split/debian/scripts/manifest-install-reconcile =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/scripts/manifest-install-reconcile 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/scripts/manifest-install-reconcile 2003-10-28 02:26:46 UTC (rev 734) @@ -34,6 +34,8 @@ # obsolete; Debian has ncurses-base for terminfo and doesn't use termcap # usr/X11R6/lib/X11/fonts/*/{encoding.dir,fonts.alias,fonts.dir} # generated in xfonts-* postinst scripts +# usr/X11R6/{lib/libxrx.so.6.3,man/man1/libxrx.1x} +# XXX: not sure what to do about this yet # var/lib/xkb/README # documentation doesn't belong in /var/lib Modified: people/branden/xlibs-and-xbase-clients-split/debian/shell-lib.sh =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/shell-lib.sh 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/shell-lib.sh 2003-10-28 02:26:46 UTC (rev 734) @@ -515,4 +515,52 @@ fi } +register_x_lib_dir_with_ld_so () { + # syntax: register_x_lib_dir_with_ld_so + # + # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared + # libraries. + # + # Call this function from the postinst script of a package that places a + # shared library in /usr/X11R6/lib, before invoking ldconfig. + + local dir ldsoconf + + dir="/usr/X11R6/lib" + ldsoconf="/etc/ld.so.conf" + + # is the line not already present? + if ! fgrep -qsx "$dir" "$ldsoconf"; then + observe "adding $dir directory to $ldsoconf" + echo "$dir" >> "$ldsoconf" + fi +} + +deregister_x_lib_dir_with_ld_so () { + # syntax: deregister_x_lib_dir_with_ld_so + # + # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared + # libraries, if and only if no shared libaries remain there. + # + # Call this function from the postrm script of a package that places a shared + # library in /usr/X11R6/lib, in the event "$1" is "remove", and before + # invoking ldconfig. + + local dir ldsoconf + + dir="/usr/X11R6/lib" + ldsoconf="/etc/ld.so.conf" + + # is the line present? + if fgrep -qsx "$dir" "$ldsoconf"; then + # are there any shared objects in the directory? + if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then + # glob expansion produced nothing, so no shared libraries are present + observe "removing $dir directory from $ldsoconf" + fgrep -qsvx "$dir" > "$ldsoconf.dpkg-tmp" + mv "$ldsoconf.dpkg-tmp" "$ldsoconf" + fi + fi +} + # vim:set ai et sts=2 sw=2 tw=0: Deleted: people/branden/xlibs-and-xbase-clients-split/debian/xlibs.dirs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/xlibs.dirs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/xlibs.dirs 2003-10-28 02:26:46 UTC (rev 734) @@ -1 +0,0 @@ -etc/X11/app-defaults Modified: people/branden/xlibs-and-xbase-clients-split/debian/xlibs.install =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/xlibs.install 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/xlibs.install 2003-10-28 02:26:46 UTC (rev 734) @@ -334,26 +334,3 @@ etc/X11/xkb/types/iso9995 etc/X11/xkb/types/mousekeys etc/X11/xkb/types/pc -usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2 -usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2 -usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2 -usr/X11R6/lib/X11/locale/lib/common/xlibi18n.so.2 -usr/X11R6/lib/X11/locale/lib/common/xlocale.so.2 -usr/X11R6/lib/X11/locale/lib/common/xomGeneric.so.2 -usr/X11R6/lib/libICE.so.6.3 -usr/X11R6/lib/libSM.so.6.0 -usr/X11R6/lib/libX11.so.6.2 -usr/X11R6/lib/libXTrap.so.6.4 -usr/X11R6/lib/libXext.so.6.4 -usr/X11R6/lib/libXft.so.1.1 -usr/X11R6/lib/libXi.so.6.0 -usr/X11R6/lib/libXmu.so.6.2 -usr/X11R6/lib/libXmuu.so.1.0 -usr/X11R6/lib/libXp.so.6.2 -usr/X11R6/lib/libXpm.so.4.11 -usr/X11R6/lib/libXrandr.so.2.0 -usr/X11R6/lib/libXt.so.6.0 -usr/X11R6/lib/libXtst.so.6.1 -usr/X11R6/lib/libXv.so.1.0 -usr/X11R6/lib/libxrx.so.6.3 -usr/X11R6/man/man1/libxrx.1x Deleted: people/branden/xlibs-and-xbase-clients-split/debian/xlibs.links =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/xlibs.links 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/xlibs.links 2003-10-28 02:26:46 UTC (rev 734) @@ -1,18 +0,0 @@ -etc/X11/app-defaults usr/X11R6/lib/X11/app-defaults -etc/X11/xkb usr/X11R6/lib/X11/xkb -usr/X11R6/lib/libICE.so.6.3 usr/X11R6/lib/libICE.so.6 -usr/X11R6/lib/libSM.so.6.0 usr/X11R6/lib/libSM.so.6 -usr/X11R6/lib/libX11.so.6.2 usr/X11R6/lib/libX11.so.6 -usr/X11R6/lib/libXTrap.so.6.4 usr/X11R6/lib/libXTrap.so.6 -usr/X11R6/lib/libXext.so.6.4 usr/X11R6/lib/libXext.so.6 -usr/X11R6/lib/libXft.so.1.1 usr/X11R6/lib/libXft.so.1 -usr/X11R6/lib/libXi.so.6.0 usr/X11R6/lib/libXi.so.6 -usr/X11R6/lib/libXmu.so.6.2 usr/X11R6/lib/libXmu.so.6 -usr/X11R6/lib/libXmuu.so.1.0 usr/X11R6/lib/libXmuu.so.1 -usr/X11R6/lib/libXp.so.6.2 usr/X11R6/lib/libXp.so.6 -usr/X11R6/lib/libXpm.so.4.11 usr/X11R6/lib/libXpm.so.4 -usr/X11R6/lib/libXrandr.so.2.0 usr/X11R6/lib/libXrandr.so.2 -usr/X11R6/lib/libXt.so.6.0 usr/X11R6/lib/libXt.so.6 -usr/X11R6/lib/libXtst.so.6.1 usr/X11R6/lib/libXtst.so.6 -usr/X11R6/lib/libXv.so.1.0 usr/X11R6/lib/libXv.so.1 -usr/X11R6/lib/libxrx.so.6.3 usr/X11R6/lib/libxrx.so.6 Deleted: people/branden/xlibs-and-xbase-clients-split/debian/xlibs.postinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/xlibs.postinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/xlibs.postinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -1,37 +0,0 @@ -#!/bin/sh -# Debian xlibs package post-installation script -# Copyright 1998-2001 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. - -set -e - -THIS_PACKAGE=xlibs -THIS_SCRIPT=postinst - -#INCLUDE_SHELL_LIB# - -# now safe to finish migrations started in preinst -for DIR in xkb app-defaults; do - if [ -e /usr/X11R6/lib/X11/$DIR.moved-by-preinst -a -L /usr/X11R6/lib/X11/$DIR ]; then - rm -r /usr/X11R6/lib/X11/$DIR.moved-by-preinst - fi -done - -check_symlinks_and_bomb /usr/X11R6/lib/X11/xkb \ - /usr/X11R6/lib/X11/app-defaults - -if ! grep -qs ^/usr/X11R6/lib\$ /etc/ld.so.conf; then - echo /usr/X11R6/lib >> /etc/ld.so.conf -fi - -if [ "$1" = "configure" ]; then - ldconfig -fi - -#DEBHELPER# - -exit 0 - -# vim:set ai et sts=2 sw=2 tw=0: Deleted: people/branden/xlibs-and-xbase-clients-split/debian/xlibs.postrm.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/xlibs.postrm.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/xlibs.postrm.in 2003-10-28 02:26:46 UTC (rev 734) @@ -1,37 +0,0 @@ -#!/bin/sh -# Debian xlibs package post-removal script -# Copyright 1998-2001 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. - -set -e - -THIS_PACKAGE=xlibs -THIS_SCRIPT=postrm - -#INCLUDE_SHELL_LIB# - -if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then - for DIR in app-defaults xkb; do - if [ -d /usr/X11R6/lib/X11/$DIR.moved-by-preinst -a -L /usr/X11R6/lib/X11/$DIR ]; then - rm /usr/X11R6/lib/X11/$DIR - mv /usr/X11R6/lib/X11/$DIR.moved-by-preinst /usr/X11R6/lib/X11/$DIR - fi - done -fi - -#DEBHELPER# - -if [ "$1" = "remove" ]; then - ldconfig -fi - -if [ "$1" = "purge" ]; then - if [ -d /etc/X11/xkb ]; then - rm -r /etc/X11/xkb - fi -fi -exit 0 - -# vim:set ai et sts=2 sw=2 tw=0: Deleted: people/branden/xlibs-and-xbase-clients-split/debian/xlibs.preinst.in =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/xlibs.preinst.in 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/xlibs.preinst.in 2003-10-28 02:26:46 UTC (rev 734) @@ -1,46 +0,0 @@ -#!/bin/sh -# Debian xlibs package pre-installation script -# Copyright 1998-2001 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. - -set -e - -THIS_PACKAGE=xlibs -THIS_SCRIPT=preinst - -#INCLUDE_SHELL_LIB# - -if [ "$1" = "install" -o "$1" = "upgrade" ]; then - # app-defaults and xkb directories moved in 4.0 - for DIR in app-defaults xkb; do - if [ -e /usr/X11R6/lib/X11/$DIR -a ! -L /usr/X11R6/lib/X11/$DIR ]; then - observe "removing obsolete /usr/X11R6/lib/X11/$DIR directory" - mv /usr/X11R6/lib/X11/$DIR /usr/X11R6/lib/X11/$DIR.moved-by-preinst - fi - done - - check_symlinks_and_warn /usr/X11R6/lib/X11/xkb \ - /usr/X11R6/lib/X11/app-defaults - - # ensure the sanity of the app-defaults symlink; the xlibs postinst script in - # woody could make it insane - LINK="/etc/X11/app-defaults/app-defaults" - if [ -L "$LINK" ]; then - observe "removing bogus symbolic link $LINK" - rm -f "$LINK" - fi - - # clean up after 3.3.2.3a-2 to 3.3.2.3a-7 - if [ -L /usr/X11R6/lib/X11/locale ]; then - observe "removing /usr/X11R6/lib/X11/locale symbolic link" - rm /usr/X11R6/lib/X11/locale - fi -fi - -#DEBHELPER# - -exit 0 - -# vim:set ai et sts=2 sw=2 tw=0: Deleted: people/branden/xlibs-and-xbase-clients-split/debian/xlibs.shlibs =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/xlibs.shlibs 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/xlibs.shlibs 2003-10-28 02:26:46 UTC (rev 734) @@ -1,15 +0,0 @@ -libICE 6 xlibs (>> 4.1.0) | libice6 -libSM 6 xlibs (>> 4.1.0) | libsm6 -libX11 6 xlibs (>> 4.1.0) | libx11-6 -libXTrap 6 xlibs (>> 4.2.0) | libxtrap6 -libXext 6 xlibs (>> 4.1.0) | libxext6 -libXft 1 xlibs (>> 4.1.0) | libxft1 -libXi 6 xlibs (>> 4.1.0) | libxi6 -libXmu 6 xlibs (>> 4.1.0) | libxmu6 -libXmuu 1 xlibs (>> 4.1.0) | libxmuu1 -libXp 6 xlibs (>> 4.1.0) | libxp6 -libXpm 4 xlibs (>> 4.1.0) | libxpm4 -libXrandr 2 xlibs (>> 4.3.0) | libxrandr2 -libXt 6 xlibs (>> 4.1.0) | libxt6 -libXtst 6 xlibs (>> 4.1.0) | libxtst6 -libXv 1 xlibs (>> 4.3.0) | libxv1 Deleted: people/branden/xlibs-and-xbase-clients-split/debian/xlibs.shlibs.dummy =================================================================== --- people/branden/xlibs-and-xbase-clients-split/debian/xlibs.shlibs.dummy 2003-10-27 23:58:52 UTC (rev 733) +++ people/branden/xlibs-and-xbase-clients-split/debian/xlibs.shlibs.dummy 2003-10-28 02:26:46 UTC (rev 734) @@ -1,15 +0,0 @@ -libICE 6 -libSM 6 -libX11 6 -libXext 6 -libXft 1 -libXi 6 -libXmu 6 -libXmuu 1 -libXp 6 -libXpm 4 -libXt 6 -libXtst 6 -libXTrap 6 -libXrandr 2 -libXv 1