Package: ctwm Version: 3.7-2 Severity: normal Tags: patch Hi,
Attached is the diff for my ctwm 3.7-2.1 NMU. -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u ctwm-3.7/debian/menu-method ctwm-3.7/debian/menu-method
--- ctwm-3.7/debian/menu-method
+++ ctwm-3.7/debian/menu-method
@@ -1,9 +1,9 @@
-#!/usr/sbin/install-menu
+#!/usr/bin/install-menu
# -*- mode: shell-script; -*-
#I need menu-1!
#
#NOTE: the first line of this script _must_ be
-# equal to "#!/usr/sbin/install-menu", otherwise update-menus
+# equal to "#!/usr/bin/install-menu", otherwise update-menus
# will feed this script old-compat-mode data.
#
#More info: /usr/doc/menu/html.
diff -u ctwm-3.7/debian/control ctwm-3.7/debian/control
--- ctwm-3.7/debian/control
+++ ctwm-3.7/debian/control
@@ -8,6 +8,7 @@
Package: ctwm
Architecture: any
Depends: m4, ${shlibs:Depends}
+Pre-Depends: x11-common (>= 1:7.0.0)
Provides: x-window-manager
Description: Claude's Tab window manager
ctwm is Claude Lecommandeur's extension to twm; in addition to the
diff -u ctwm-3.7/debian/changelog ctwm-3.7/debian/changelog
--- ctwm-3.7/debian/changelog
+++ ctwm-3.7/debian/changelog
@@ -1,3 +1,13 @@
+ctwm (3.7-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload for RC bugfix.
+ * Build-depend against xutils-dev for the X11R7 transition, pre-depend on
+ a recent x11-common and adjust debian/rules for the FHS paths
+ (Closes: #364239).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Fri, 12 May 2006 22:35:26 +0200
+
ctwm (3.7-2) unstable; urgency=low
* Add build-dependency on libjpeg62-dev to fix FTBFS. Shame on me for not
@@ -370,3 +379,0 @@
- $Id: changelog 57 2005-11-02 20:00:57Z branden $
-
- vim:set ai et sts=2 sw=2 tw=78:
diff -u ctwm-3.7/debian/postinst ctwm-3.7/debian/postinst
--- ctwm-3.7/debian/postinst
+++ ctwm-3.7/debian/postinst
@@ -15,5 +15,5 @@
update-alternatives --install /usr/bin/x-window-manager x-window-manager
/usr/bin/X11/ctwm 40 \
- --slave /usr/share/man/man1/x-window-manager.1.gz x-window-manager.1.gz
/usr/X11R6/man/man1/ctwm.1x.gz
+ --slave /usr/share/man/man1/x-window-manager.1.gz x-window-manager.1.gz
/usr/share/man/man1/ctwm.1x.gz
exit
diff -u ctwm-3.7/debian/rules ctwm-3.7/debian/rules
--- ctwm-3.7/debian/rules
+++ ctwm-3.7/debian/rules
@@ -51,13 +51,13 @@
$(MAKE) DESTDIR=debian/ctwm install install.man
# Don't ship pixmaps that are in fvwm-icons.
- rm debian/ctwm/usr/X11R6/include/X11/pixmaps/datebook.xpm
- rm debian/ctwm/usr/X11R6/include/X11/pixmaps/mail1.xpm
- rm debian/ctwm/usr/X11R6/include/X11/pixmaps/term.xpm
- rm debian/ctwm/usr/X11R6/include/X11/pixmaps/unknown1.xpm
- rm debian/ctwm/usr/X11R6/include/X11/pixmaps/xcalc.xpm
- rm debian/ctwm/usr/X11R6/include/X11/pixmaps/xman.xpm
- rm debian/ctwm/usr/X11R6/include/X11/pixmaps/xterm.xpm
+ rm debian/ctwm/usr/include/X11/pixmaps/datebook.xpm
+ rm debian/ctwm/usr/include/X11/pixmaps/mail1.xpm
+ rm debian/ctwm/usr/include/X11/pixmaps/term.xpm
+ rm debian/ctwm/usr/include/X11/pixmaps/unknown1.xpm
+ rm debian/ctwm/usr/include/X11/pixmaps/xcalc.xpm
+ rm debian/ctwm/usr/include/X11/pixmaps/xman.xpm
+ rm debian/ctwm/usr/include/X11/pixmaps/xterm.xpm
binary-arch: build install
dh_testdir
signature.asc
Description: OpenPGP digital signature
