twm: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/rules | 2 +-
debian/twm.postinst.in | 10 ----------
debian/twm.postrm.in | 10 ----------
debian/twm.preinst.in | 30 ------------------------------
debian/twm.prerm.in | 2 --
6 files changed, 9 insertions(+), 53 deletions(-)
New commits:
commit 40c4c0aeeb53232643afa4fc5c5f918514d956ae
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jun 8 01:40:36 2007 +0200
Generate the maintainer scripts properly.
Make debian/rules build depend on genscripts so the x-window-manager
alternative is properly installed.
Also remove old transition code from the maintainer scripts, which as far
as I can see was used for the xfree86 3.x -> 4.x transition.
diff --git a/debian/changelog b/debian/changelog
index 3c87128..44a03e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+twm (1:1.0.3-2) UNRELEASED; urgency=low
+
+ * Generate the maintainer scripts properly (so the x-window-manager
+ alternative is installed), and remove old transition code from
+ the XFree86 4.x days.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 08 Jun 2007 01:37:52 +0200
+
twm (1:1.0.3-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index fb59ee0..c1d9472 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ endif
confflags += --enable-man-pages=3
-build: patch build-stamp
+build: genscripts patch build-stamp
build-stamp:
dh_testdir
diff --git a/debian/twm.postinst.in b/debian/twm.postinst.in
index e143aff..ca12d49 100644
--- a/debian/twm.postinst.in
+++ b/debian/twm.postinst.in
@@ -12,16 +12,6 @@ set -e
THIS_PACKAGE=twm
THIS_SCRIPT=postinst
-#INCLUDE_SHELL_LIB#
-
-check_symlinks_and_bomb /usr/lib/X11/twm
-
-# now safe to remove old twm dir
-if [ -e /usr/X11R6/lib/X11/twm.moved-by-preinst ] \
- && [ -L /usr/X11R6/lib/X11/twm ]; then
- rm -r /usr/X11R6/lib/X11/twm.moved-by-preinst
-fi
-
#DEBHELPER#
# clean up after older alternative that used different path
diff --git a/debian/twm.postrm.in b/debian/twm.postrm.in
index 3b5a593..dd1fbde 100644
--- a/debian/twm.postrm.in
+++ b/debian/twm.postrm.in
@@ -12,16 +12,6 @@ set -e
THIS_PACKAGE=twm
THIS_SCRIPT=postrm
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
- if [ -d /usr/X11R6/lib/X11/twm.moved-by-preinst ] \
- && [ -L /usr/lib/X11/twm ]; then
- rm /usr/lib/X11/twm
- mv /usr/X11R6/lib/X11/twm.moved-by-preinst /usr/X11R6/lib/X11/twm
- fi
-fi
-
#DEBHELPER#
if [ "$1" = "purge" ]; then
diff --git a/debian/twm.preinst.in b/debian/twm.preinst.in
deleted file mode 100644
index 97752cb..0000000
--- a/debian/twm.preinst.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Debian twm package pre-installation script
-# 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>.
-# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $Id: twm.preinst.in 189 2005-06-11 00:04:27Z branden $
-
-set -e
-
-THIS_PACKAGE=twm
-THIS_SCRIPT=preinst
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
- # twm dir moved to /etc/X11 in 4.x
- if [ -e /usr/X11R6/lib/X11/twm ] && ! [ -L /usr/X11R6/lib/X11/twm ]; then
- observe "removing obsolete /usr/X11R6/lib/X11/twm directory"
- mv /usr/X11R6/lib/X11/twm /usr/X11R6/lib/X11/twm.moved-by-preinst
- fi
- check_symlinks_and_warn /usr/lib/X11/twm
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:
diff --git a/debian/twm.prerm.in b/debian/twm.prerm.in
index 789de5b..7e2508c 100644
--- a/debian/twm.prerm.in
+++ b/debian/twm.prerm.in
@@ -12,8 +12,6 @@ set -e
THIS_PACKAGE=twm
THIS_SCRIPT=prerm
-#INCLUDE_SHELL_LIB#
-
#DEBHELPER#
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
Reply to: