Package: fvwm95
Version: 2.0.43ba-24.1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my fvwm95 2.0.43ba-24.2 NMU.
--
.''`. Fuck your fascist beauty standards
: :' :
`. `' Proudly running unstable Debian GNU/Linux
`- www.amayita.com www.malapecora.com www.chicasduras.com
diff -u fvwm95-2.0.43ba/debian/control fvwm95-2.0.43ba/debian/control
--- fvwm95-2.0.43ba/debian/control
+++ fvwm95-2.0.43ba/debian/control
@@ -10,7 +10,7 @@
Pre-Depends: x11-common (>= 1:7.0.0)
Depends: ${shlibs:Depends}
Provides: x-window-manager
-Recommends: fvwm95-icons, xbase-clients, xterm, xcontrib, menu (>= 1.5-1)
+Recommends: fvwm95-icons, xbase-clients, xterm, menu (>= 1.5-1)
Description: Win95 lookalike Window Manager for X
fvwm95 is a Window Manager for the X Window System, configured
to look like a win95 user interface.
diff -u fvwm95-2.0.43ba/debian/changelog fvwm95-2.0.43ba/debian/changelog
--- fvwm95-2.0.43ba/debian/changelog
+++ fvwm95-2.0.43ba/debian/changelog
@@ -1,3 +1,12 @@
+fvwm95 (2.0.43ba-24.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Get rid of the /usr/doc link in postinst (Closes: #351516).
+ * Clean up dirs if not empty in /usr/local/ postrm (Closes: #330793).
+ * Remove xcontrib from Recommends (Closes: #351516).
+
+ -- Amaya Rodrigo Sastre <[EMAIL PROTECTED]> Sat, 15 Jul 2006 18:26:06 +0200
+
fvwm95 (2.0.43ba-24.1) unstable; urgency=low
* NMU
@@ -118,7 +127,7 @@
-- Adrian Bunk <[EMAIL PROTECTED]> Mon, 4 Jun 2001 09:40:27 +0200
-fvwm95 (2.0.43ba-15) frozen unstable; urgency=low, closes=#64218
+fvwm95 (2.0.43ba-15) frozen unstable; urgency=low
* Fixed a typo in postrm that was discovered in dicussing bug
#64218. (Bug #64218 is marked as Critical, so this should probably
@@ -126,14 +135,14 @@
-- Daniel Martin <[EMAIL PROTECTED]> Fri, 19 May 2000 10:09:14 -0400
-fvwm95 (2.0.43ba-14) unstable; urgency=low, closes=#64218
+fvwm95 (2.0.43ba-14) unstable; urgency=low
* Fixed minor error in preinst logic dealing with deleting obsolete
conffiles. (closes #64218)
-- Daniel Martin <[EMAIL PROTECTED]> Tue, 16 May 2000 12:51:21 -0400
-fvwm95 (2.0.43ba-13) unstable; urgency=low, closes=#59985
+fvwm95 (2.0.43ba-13) unstable; urgency=low
* Added a last-resort get font from C locale option to GetFontSetOrFixed -
This is a kludge to get around the problem reported in bug #59985; for
@@ -142,13 +151,13 @@
-- Daniel Martin <[EMAIL PROTECTED]> Thu, 9 Mar 2000 12:10:06 -0500
-fvwm95 (2.0.43ba-12) frozen unstable; urgency=low, closes=Bug#59556
+fvwm95 (2.0.43ba-12) frozen unstable; urgency=low
* Fixed broken fvwm95-icons postinst; I don't know how that got released.
-- Daniel Martin <[EMAIL PROTECTED]> Tue, 7 Mar 2000 09:27:22 -0500
-fvwm95 (2.0.43ba-11) unstable; urgency=low, closes=59556
+fvwm95 (2.0.43ba-11) unstable; urgency=low
* Reworked prerm and postrm according to the new way to do X window
managers. (That is, with update-alternatives and Provides:
@@ -163,7 +172,7 @@
-- Daniel Martin <[EMAIL PROTECTED]> Fri, 17 Sep 1999 13:43:18 -0400
-fvwm95 (2.0.43ba-9) unstable; urgency=low, closes=37102 29412 37102 35750
+fvwm95 (2.0.43ba-9) unstable; urgency=low
* Added prerm statements to remove menu-generated files (closes
#37102, #29412)
@@ -178,7 +187,7 @@
-- Daniel Martin <[EMAIL PROTECTED]> Tue, 2 Feb 1999 21:37:07 -0500
-fvwm95 (2.0.43ba-7) frozen unstable; urgency=low, closes=29412 22933
+fvwm95 (2.0.43ba-7) frozen unstable; urgency=low
* Reworked prerm and postrm according to new menu docs (closes 29412)
* Fixed WindowList bug (not reported to BTS) by ripping WindowList
@@ -400,10 +409,12 @@
* Bug in postinst as a result of the last change. Corrupts
/etc/X11/window-managers!
+ -- Christoph Lameter <[EMAIL PROTECTED]> Fri, 20 Sep 1996 15:37:25 +0100
+
fvwm95 (2.0.42a-4) unstable; urgency=low
- * Removed usage of "ed" from postinst script and set up dependencies
- for sed and grep.
+ * Removed usage of ed from postinst script and set up dependencies for sed
+ and grep.
-- Christoph Lameter <[EMAIL PROTECTED]> Fri, 20 Sep 1996 15:37:25 +0100
diff -u fvwm95-2.0.43ba/debian/postrm fvwm95-2.0.43ba/debian/postrm
--- fvwm95-2.0.43ba/debian/postrm
+++ fvwm95-2.0.43ba/debian/postrm
@@ -26,6 +26,12 @@
if [ -x /usr/sbin/register-window-manager ]; then
register-window-manager --remove fvwm95
fi
+
+ # Policy 9.1.2, see #330793
+ if [ -d /usr/local/share/fvwm95/icons ]; then rmdir
/usr/local/share/fvwm95-icons 2>/dev/null || true ; fi
+ if [ -d /usr/local/share/fvwm95 ]; then rmdir /usr/local/share/fvwm95
2>/dev/null || true ; fi
+ if [ -d /usr/local/share/icons ]; then rmdir /usr/local/share/fvwm95
2>/dev/null || true ; fi
+
;;
disappear)
if test "$2" != overwriter; then
only in patch2:
unchanged:
--- fvwm95-2.0.43ba.orig/debian/fvwm95-icons.postinst
+++ fvwm95-2.0.43ba/debian/fvwm95-icons.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ]; then
+ if [ -d /usr/doc -a -h /usr/doc/fvwm95-icons -a -d
/usr/share/doc/fvwm95-icons ]; then
+ rm -f /usr/doc/fvwm95-icons
+ fi
+fi
+
+#DEBHELPER#
