X Strike Force X.Org X11 SVN commit: r4048 - trunk/lib/libx11/debian
Author: julien
Date: 2006-11-25 00:06:54 -0500 (Sat, 25 Nov 2006)
New Revision: 4048
Removed:
trunk/lib/libx11/debian/libx11-6.postrm.in
Modified:
trunk/lib/libx11/debian/changelog
trunk/lib/libx11/debian/libx11-6.postinst.in
Log:
* Replace call to register_x_lib_dir_with_ld_so in postinst with a call to
deregister_x_lib_dir_with_ld_so.
* Remove libx11-6.postrm.in which doesn't need to deregister /usr/X11R6/lib
anymore.
Modified: trunk/lib/libx11/debian/changelog
===================================================================
--- trunk/lib/libx11/debian/changelog 2006-11-25 01:14:26 UTC (rev 4047)
+++ trunk/lib/libx11/debian/changelog 2006-11-25 05:06:54 UTC (rev 4048)
@@ -1,3 +1,10 @@
+libx11 (2:1.0.3-5) UNRELEASED; urgency=low
+
+ * Remove /usr/X11R6/lib from /etc/ld.so.conf in postinst if it's no longer
+ needed, instead of adding it there.
+
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Sat, 25 Nov 2006 06:01:37 +0100
+
libx11 (2:1.0.3-4) unstable; urgency=low
* Some patches got lost in the upgrade from 1.0.0 (2:1.0.0-9) to 1.0.3:
Modified: trunk/lib/libx11/debian/libx11-6.postinst.in
===================================================================
--- trunk/lib/libx11/debian/libx11-6.postinst.in 2006-11-25 01:14:26 UTC (rev 4047)
+++ trunk/lib/libx11/debian/libx11-6.postinst.in 2006-11-25 05:06:54 UTC (rev 4048)
@@ -14,7 +14,7 @@
#INCLUDE_SHELL_LIB#
-register_x_lib_dir_with_ld_so
+deregister_x_lib_dir_with_ld_so
#DEBHELPER#
Deleted: trunk/lib/libx11/debian/libx11-6.postrm.in
===================================================================
--- trunk/lib/libx11/debian/libx11-6.postrm.in 2006-11-25 01:14:26 UTC (rev 4047)
+++ trunk/lib/libx11/debian/libx11-6.postrm.in 2006-11-25 05:06:54 UTC (rev 4048)
@@ -1,25 +0,0 @@
-#!/bin/sh
-# Debian libx11-6 package post-removal script
-# Copyright 2003, 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>.
-# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $Id: libx11-6.postrm.in 189 2005-06-11 00:04:27Z branden $
-
-set -e
-
-THIS_PACKAGE=libx11-6
-THIS_SCRIPT=postrm
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "remove" ]; then
- deregister_x_lib_dir_with_ld_so
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=80:
Reply to: