X Strike Force SVN commit: rev 499 - trunk/debian

To: debian-x@lists.debian.org
Subject: X Strike Force SVN commit: rev 499 - trunk/debian
From: X Strike Force SVN Admin <branden@debian.org>
Date: Wed, 10 Sep 2003 13:20:08 -0500 (EST)
Message-id: <[🔎] 20030910182008.99A9C5C092@necrotic.deadbeast.net>
Reply-to: debian-x@lists.debian.org
Author: branden
Date: 2003-09-10 07:04:01 -0500 (Wed, 10 Sep 2003)
New Revision: 499

Modified:
   trunk/debian/changelog
   trunk/debian/xbase-clients.postinst.in
   trunk/debian/xbase-clients.postrm.in
   trunk/debian/xbase-clients.preinst.in
   trunk/debian/xfree86-common.postinst.in
   trunk/debian/xfree86-common.postrm.in
   trunk/debian/xfree86-common.preinst.in
Log:
Migrate existing obsolete-conffile handling to use new shell-lib.sh
functions.
- debian/{xfree86-common,xbase-clients}.preinst.in: use
  remove_conffile_prepare()
- debian/{xfree86-common,xbase-clients}.postinst.in: use
  remove_conffile_commit()
- debian/{xfree86-common,xbase-clients}.postrm.in: use
  remove_conffile_rollback()



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2003-09-10 11:57:29 UTC (rev 498)
+++ trunk/debian/changelog	2003-09-10 12:04:01 UTC (rev 499)
@@ -81,8 +81,17 @@
       usage of update-alternatives (see #164021)
     - move workaround for bug #28519 into the main conditional block
 
- -- Branden Robinson <branden@debian.org>  Wed, 10 Sep 2003 06:53:52 -0500
+  * Migrate existing obsolete-conffile handling to use new shell-lib.sh
+    functions.
+    - debian/{xfree86-common,xbase-clients}.preinst.in: use
+      remove_conffile_prepare()
+    - debian/{xfree86-common,xbase-clients}.postinst.in: use
+      remove_conffile_commit()
+    - debian/{xfree86-common,xbase-clients}.postrm.in: use
+      remove_conffile_rollback()
 
+ -- Branden Robinson <branden@debian.org>  Wed, 10 Sep 2003 06:59:21 -0500
+
 xfree86 (4.2.1-11) unstable; urgency=medium
 
   * urgency set to medium because bug #206790 bites a lot of people (but,

Modified: trunk/debian/xbase-clients.postinst.in
===================================================================
--- trunk/debian/xbase-clients.postinst.in	2003-09-10 11:57:29 UTC (rev 498)
+++ trunk/debian/xbase-clients.postinst.in	2003-09-10 12:04:01 UTC (rev 499)
@@ -1,10 +1,12 @@
 #!/bin/sh
 # Debian xbase-clients package post-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998--2001, 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=xbase-clients
@@ -24,25 +26,8 @@
   fi
 done
 
-# /etc/X11/Xmodmap is deprecated
-# delete it if it's the default, otherwise move it
-if dpkg --compare-versions "$2" lt "4.1.0-7"; then
-  if [ -e /etc/X11/Xmodmap ]; then
-    LAST_OFFICIAL_MD5SUM="$(printf '4ddb36003811f11586cec98d666af013\n')"
-    INSTALLED_MD5SUM=$(cat /etc/X11/Xmodmap | md5sum)
-    if [ "$INSTALLED_MD5SUM" = "$LAST_OFFICIAL_MD5SUM" ]; then
-      rm /etc/X11/Xmodmap
-    else
-      mv /etc/X11/Xmodmap /etc/X11/Xmodmap.moved-by-preinst
-    fi
-  fi
-fi
+remove_conffile_commit /etc/X11/Xmodmap
 
-if [ -e /etc/X11/Xmodmap.moved-by-preinst ]; then
-  mv /etc/X11/Xmodmap.moved-by-preinst /etc/X11/Xmodmap.xbase-clients-old
-  message "Note: /etc/X11/Xmodmap moved to /etc/X11/Xmodmap.xbase-clients-old."
-fi
-
 #DEBHELPER#
 
 exit 0


Property changes on: trunk/debian/xbase-clients.postinst.in
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/debian/xbase-clients.postrm.in
===================================================================
--- trunk/debian/xbase-clients.postrm.in	2003-09-10 11:57:29 UTC (rev 498)
+++ trunk/debian/xbase-clients.postrm.in	2003-09-10 12:04:01 UTC (rev 499)
@@ -1,10 +1,12 @@
 #!/bin/sh
 # Debian xbase-clients package post-removal script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998--2001, 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=xbase-clients
@@ -19,6 +21,8 @@
       mv /usr/X11R6/lib/X11/$DIR.moved-by-preinst /usr/X11R6/lib/X11/$DIR
     fi
   done
+
+  remove_conffile_rollback /etc/X11/Xmodmap
 fi
 
 #DEBHELPER#


Property changes on: trunk/debian/xbase-clients.postrm.in
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/debian/xbase-clients.preinst.in
===================================================================
--- trunk/debian/xbase-clients.preinst.in	2003-09-10 11:57:29 UTC (rev 498)
+++ trunk/debian/xbase-clients.preinst.in	2003-09-10 12:04:01 UTC (rev 499)
@@ -48,6 +48,11 @@
       update-alternatives --remove xconsole /usr/X11R6/bin/xconsole.real
     fi
   fi
+
+  # /etc/X11/Xmodmap was obsoleted in 4.1.0-7
+  if dpkg --compare-versions "$2" lt "4.1.0-7"; then
+    remove_conffile_prepare /etc/X11/Xmodmap 4ddb36003811f11586cec98d666af013
+  fi
 fi
 
 #DEBHELPER#

Modified: trunk/debian/xfree86-common.postinst.in
===================================================================
--- trunk/debian/xfree86-common.postinst.in	2003-09-10 11:57:29 UTC (rev 498)
+++ trunk/debian/xfree86-common.postinst.in	2003-09-10 12:04:01 UTC (rev 499)
@@ -40,12 +40,7 @@
 ###  rm /usr/X11R6/lib/X11/rgb.txt.moved-by-preinst
 ###fi
 
-if [ -e /etc/X11/Xsession.d/40xfree86-common_xmodmap.moved-by-preinst ]; then
-  mv /etc/X11/Xsession.d/40xfree86-common_xmodmap.moved-by-preinst \
-     /etc/X11/Xsession.d/40xfree86-common_xmodmap.xfree86-common-old
-  message "Note: /etc/X11/Xsession.d/40xfree86-common_xmodmap moved to" \
-          "/etc/X11/Xsession.d/40xfree86-common_xmodmap.xfree86-common-old."
-fi
+remove_conffile_commit /etc/X11/Xsession.d/40xfree86-common_xmodmap
 
 if [ -e /etc/init.d/xfree86-common ]; then
   update-rc.d $THIS_PACKAGE start 70 S .

Modified: trunk/debian/xfree86-common.postrm.in
===================================================================
--- trunk/debian/xfree86-common.postrm.in	2003-09-10 11:57:29 UTC (rev 498)
+++ trunk/debian/xfree86-common.postrm.in	2003-09-10 12:04:01 UTC (rev 499)
@@ -1,10 +1,12 @@
 #!/bin/sh
 # Debian xfree86-common package post-removal script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998--2001, 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=xfree86-common
@@ -17,10 +19,7 @@
 ###    rm /usr/X11R6/lib/X11/rgb.txt
 ###    mv /etc/X11/rgb.txt.moved-by-preinst /usr/X11R6/lib/X11/rgb.txt
 ###  fi
-  if [ -e /etc/X11/Xsession.d/40xfree86-common_xmodmap.moved-by-preinst ]; then
-    mv /etc/X11/Xsession.d/40xfree86-common_xmodmap.moved-by-preinst \
-       /etc/X11/Xsession.d/40xfree86-common_xmodmap
-  fi
+  remove_conffile_rollback /etc/X11/Xsession.d/40xfree86-common_xmodmap
 fi
 
 #DEBHELPER#


Property changes on: trunk/debian/xfree86-common.postrm.in
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/debian/xfree86-common.preinst.in
===================================================================
--- trunk/debian/xfree86-common.preinst.in	2003-09-10 11:57:29 UTC (rev 498)
+++ trunk/debian/xfree86-common.preinst.in	2003-09-10 12:04:01 UTC (rev 499)
@@ -1,10 +1,12 @@
 #!/bin/sh
 # Debian xfree86-common package pre-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998--2001, 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=xfree86-common
@@ -20,18 +22,8 @@
 ###  fi
 
   if dpkg --compare-versions "$2" lt "4.1.0-7"; then
-    # /etc/X11/Xsession.d/40xfree86-common_xmodmap is deprecated
-    # delete it if it is the default, move it if it isn't
-    if [ -e /etc/X11/Xsession.d/40xfree86-common_xmodmap ]; then
-      LAST_OFFICIAL_MD5SUM="$(printf 'b370a42803aec72f27da67ca6a225402\n')"
-      INSTALLED_MD5SUM=$(cat /etc/X11/Xsession.d/40xfree86-common_xmodmap | md5sum)
-      if [ "$INSTALLED_MD5SUM" = "$LAST_OFFICIAL_MD5SUM" ]; then
-        rm /etc/X11/Xsession.d/40xfree86-common_xmodmap
-      else
-        mv /etc/X11/Xsession.d/40xfree86-common_xmodmap \
-           /etc/X11/Xsession.d/40xfree86-common_xmodmap.moved-by-preinst
-      fi
-    fi
+    remove_conffile_prepare /etc/X11/Xsession.d/40xfree86-common_xmodmap \
+      b370a42803aec72f27da67ca6a225402
   fi
 
   check_symlinks_and_warn /usr/bin/X11 \


Property changes on: trunk/debian/xfree86-common.preinst.in
___________________________________________________________________
Name: svn:keywords
   + Id
Reply to:
Prev by Date: X Strike Force SVN commit: rev 500 - trunk/debian
Next by Date: X Strike Force SVN commit: rev 501 - trunk/debian
Previous by thread: X Strike Force SVN commit: rev 500 - trunk/debian
Next by thread: X Strike Force SVN commit: rev 501 - trunk/debian
Index(es):
- Date
- Thread