Author: branden
Date: 2004-11-10 18:51:22 -0500 (Wed, 10 Nov 2004)
New Revision: 2019
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/libdps1.postinst.in
trunk/debian/libdps1.postrm.in
trunk/debian/libxaw6.postinst.in
trunk/debian/libxaw6.postrm.in
trunk/debian/libxaw7.postinst.in
trunk/debian/libxaw7.postrm.in
trunk/debian/xlibmesa-gl.postinst.in
trunk/debian/xlibmesa-gl.postrm.in
trunk/debian/xlibmesa-glu.postinst.in
trunk/debian/xlibmesa-glu.postrm.in
trunk/debian/xlibosmesa4.postinst.in
trunk/debian/xlibosmesa4.postrm.in
Log:
Perform some cleanup work on the shared library maintainer scripts of
libdps1, libxaw6, libxaw7, xlibmesa-gl, xlibmesa-glu, and xlibosmesa4;
thanks to Fabio for noticing the inconsistencies.
+ Call register_x_lib_dir_with_ld_so() before invoking ldconfig in the
post-installation scripts.
+ Perform configuration actions regardless of the value of "$1" in the
post-installation scripts.
+ Call deregister_x_lib_dir_with_ld_so() before invoking ldconfig in the
post-removal scripts.
+ Move the #DEBHELPER# expando later in the scripts where applicable.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-11-09 17:59:41 UTC (rev 2018)
+++ trunk/debian/CHANGESETS 2004-11-10 23:51:22 UTC (rev 2019)
@@ -253,4 +253,16 @@
affect Debian, but would cause unexpected behavior on OpenBSD).
2017
+Perform some cleanup work on the shared library maintainer scripts of
+libdps1, libxaw6, libxaw7, xlibmesa-gl, xlibmesa-glu, and xlibosmesa4;
+thanks to Fabio for noticing the inconsistencies.
++ Call register_x_lib_dir_with_ld_so() before invoking ldconfig in the
+ post-installation scripts.
++ Perform configuration actions regardless of the value of "$1" in the
+ post-installation scripts.
++ Call deregister_x_lib_dir_with_ld_so() before invoking ldconfig in the
+ post-removal scripts.
++ Move the #DEBHELPER# expando later in the scripts where applicable.
+ 2019
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-11-09 17:59:41 UTC (rev 2018)
+++ trunk/debian/TODO 2004-11-10 23:51:22 UTC (rev 2019)
@@ -17,9 +17,6 @@
4.3.0.dfsg.1-9
--------------
-* Copy Fabio's tidy-up fixes to shared library maintainer scripts from the
- Ubuntu X.Org packages. Check update-alternative calls in twm and xterm to
- make sure the right manpage slave symlink gets installed.
* Rewrite xserver-xfree86 debconfage. Joey Hess, Eduard Bloch, and David
Nusinow have provided good input.
+ udev users will have "/dev/input/mousen" -- configure that as only mouse
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-11-09 17:59:41 UTC (rev 2018)
+++ trunk/debian/changelog 2004-11-10 23:51:22 UTC (rev 2019)
@@ -132,6 +132,17 @@
+ Fix a problem with parentheses when using the preprocessor (doesn't
affect Debian, but would cause unexpected behavior on OpenBSD).
+ * Perform some cleanup work on the shared library maintainer scripts of
+ libdps1, libxaw6, libxaw7, xlibmesa-gl, xlibmesa-glu, and xlibosmesa4;
+ thanks to Fabio for noticing the inconsistencies.
+ + Call register_x_lib_dir_with_ld_so() before invoking ldconfig in the
+ post-installation scripts.
+ + Perform configuration actions regardless of the value of "$1" in the
+ post-installation scripts.
+ + Call deregister_x_lib_dir_with_ld_so() before invoking ldconfig in the
+ post-removal scripts.
+ + Move the #DEBHELPER# expando later in the scripts where applicable.
+
Changes by Denis Barbier and Fabio M. Di Nitto:
* Edit xc/programs/xkbcomp/symbols/pc/Imakefile so that the new pc/us_intl
@@ -214,7 +225,7 @@
exiting upon encountering the first shell interpeter that fails on the
script; instead, attempt all the interpreters and report all that fail.
- -- Branden Robinson <[EMAIL PROTECTED]> Mon, 8 Nov 2004 14:42:42 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 10 Nov 2004 18:34:20 -0500
xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
Modified: trunk/debian/libdps1.postinst.in
===================================================================
--- trunk/debian/libdps1.postinst.in 2004-11-09 17:59:41 UTC (rev 2018)
+++ trunk/debian/libdps1.postinst.in 2004-11-10 23:51:22 UTC (rev 2019)
@@ -1,6 +1,6 @@
#!/bin/sh
# Debian libdps1 package post-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998-2001, 2004 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.
@@ -12,16 +12,11 @@
#INCLUDE_SHELL_LIB#
+register_x_lib_dir_with_ld_so
+ldconfig
+
#DEBHELPER#
-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
-
exit 0
# vim:set ai et sts=2 sw=2 tw=0:
Modified: trunk/debian/libdps1.postrm.in
===================================================================
--- trunk/debian/libdps1.postrm.in 2004-11-09 17:59:41 UTC (rev 2018)
+++ trunk/debian/libdps1.postrm.in 2004-11-10 23:51:22 UTC (rev 2019)
@@ -1,6 +1,6 @@
#!/bin/sh
# Debian libdps1 package post-removal script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998-2001, 2004 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.
@@ -12,12 +12,13 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
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:
Modified: trunk/debian/libxaw6.postinst.in
===================================================================
--- trunk/debian/libxaw6.postinst.in 2004-11-09 17:59:41 UTC (rev 2018)
+++ trunk/debian/libxaw6.postinst.in 2004-11-10 23:51:22 UTC (rev 2019)
@@ -1,6 +1,6 @@
#!/bin/sh
# Debian libxaw6 package post-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998-2001, 2004 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.
@@ -12,12 +12,11 @@
#INCLUDE_SHELL_LIB#
+register_x_lib_dir_with_ld_so
+ldconfig
+
#DEBHELPER#
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-
exit 0
# vim:set ai et sts=2 sw=2 tw=0:
Modified: trunk/debian/libxaw6.postrm.in
===================================================================
--- trunk/debian/libxaw6.postrm.in 2004-11-09 17:59:41 UTC (rev 2018)
+++ trunk/debian/libxaw6.postrm.in 2004-11-10 23:51:22 UTC (rev 2019)
@@ -1,6 +1,6 @@
#!/bin/sh
# Debian libxaw6 package post-removal script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998-2001, 2004 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.
@@ -12,12 +12,13 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
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:
Modified: trunk/debian/libxaw7.postinst.in
===================================================================
--- trunk/debian/libxaw7.postinst.in 2004-11-09 17:59:41 UTC (rev 2018)
+++ trunk/debian/libxaw7.postinst.in 2004-11-10 23:51:22 UTC (rev 2019)
@@ -1,6 +1,6 @@
#!/bin/sh
# Debian libxaw7 package post-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998-2001, 2004 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.
@@ -12,12 +12,11 @@
#INCLUDE_SHELL_LIB#
+register_x_lib_dir_with_ld_so
+ldconfig
+
#DEBHELPER#
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-
exit 0
# vim:set ai et sts=2 sw=2 tw=0:
Modified: trunk/debian/libxaw7.postrm.in
===================================================================
--- trunk/debian/libxaw7.postrm.in 2004-11-09 17:59:41 UTC (rev 2018)
+++ trunk/debian/libxaw7.postrm.in 2004-11-10 23:51:22 UTC (rev 2019)
@@ -1,6 +1,6 @@
#!/bin/sh
# Debian libxaw7 package post-removal script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998-2001, 2004 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.
@@ -12,12 +12,13 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
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:
Modified: trunk/debian/xlibmesa-gl.postinst.in
===================================================================
--- trunk/debian/xlibmesa-gl.postinst.in 2004-11-09 17:59:41 UTC (rev
2018)
+++ trunk/debian/xlibmesa-gl.postinst.in 2004-11-10 23:51:22 UTC (rev
2019)
@@ -1,6 +1,6 @@
#!/bin/sh
# Debian xlibmesa-gl package post-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998-2001, 2004 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.
@@ -12,12 +12,11 @@
#INCLUDE_SHELL_LIB#
+register_x_lib_dir_with_ld_so
+ldconfig
+
#DEBHELPER#
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-
exit 0
# vim:set ai et sts=2 sw=2 tw=0:
Modified: trunk/debian/xlibmesa-gl.postrm.in
===================================================================
--- trunk/debian/xlibmesa-gl.postrm.in 2004-11-09 17:59:41 UTC (rev 2018)
+++ trunk/debian/xlibmesa-gl.postrm.in 2004-11-10 23:51:22 UTC (rev 2019)
@@ -1,6 +1,6 @@
#!/bin/sh
# Debian xlibmesa-gl package post-removal script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998-2001, 2004 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.
@@ -12,12 +12,13 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
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:
Modified: trunk/debian/xlibmesa-glu.postinst.in
===================================================================
--- trunk/debian/xlibmesa-glu.postinst.in 2004-11-09 17:59:41 UTC (rev
2018)
+++ trunk/debian/xlibmesa-glu.postinst.in 2004-11-10 23:51:22 UTC (rev
2019)
@@ -1,6 +1,6 @@
#!/bin/sh
# Debian xlibmesa-glu package post-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998-2001, 2004 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.
@@ -12,12 +12,11 @@
#INCLUDE_SHELL_LIB#
+register_x_lib_dir_with_ld_so
+ldconfig
+
#DEBHELPER#
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-
exit 0
# vim:set ai et sts=2 sw=2 tw=0:
Modified: trunk/debian/xlibmesa-glu.postrm.in
===================================================================
--- trunk/debian/xlibmesa-glu.postrm.in 2004-11-09 17:59:41 UTC (rev 2018)
+++ trunk/debian/xlibmesa-glu.postrm.in 2004-11-10 23:51:22 UTC (rev 2019)
@@ -1,6 +1,6 @@
#!/bin/sh
# Debian xlibmesa-glu package post-removal script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998-2001, 2004 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.
@@ -12,12 +12,13 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
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:
Modified: trunk/debian/xlibosmesa4.postinst.in
===================================================================
--- trunk/debian/xlibosmesa4.postinst.in 2004-11-09 17:59:41 UTC (rev
2018)
+++ trunk/debian/xlibosmesa4.postinst.in 2004-11-10 23:51:22 UTC (rev
2019)
@@ -1,6 +1,6 @@
#!/bin/sh
# Debian xlibosmesa4 package post-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998-2001, 2004 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.
@@ -12,12 +12,11 @@
#INCLUDE_SHELL_LIB#
+register_x_lib_dir_with_ld_so
+ldconfig
+
#DEBHELPER#
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-
exit 0
# vim:set ai et sts=2 sw=2 tw=0:
Modified: trunk/debian/xlibosmesa4.postrm.in
===================================================================
--- trunk/debian/xlibosmesa4.postrm.in 2004-11-09 17:59:41 UTC (rev 2018)
+++ trunk/debian/xlibosmesa4.postrm.in 2004-11-10 23:51:22 UTC (rev 2019)
@@ -1,6 +1,6 @@
#!/bin/sh
# Debian xlibosmesa4 package post-removal script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998-2001, 2004 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.
@@ -12,12 +12,13 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
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:
