Bug#375757: diff for 1:1.3+cvs20060518-1.1 NMU

["Steinar H. Gunderson" <sesse@debian.org>]

Package: sawfish
Version: 1:1.3+cvs20060518-1
Severity: normal
Tags: patch

Hi,

Attached is the diff for my sawfish 1:1.3+cvs20060518-1.1 NMU.

diff -u sawfish-1.3+cvs20060518/debian/changelog sawfish-1.3+cvs20060518/debian/changelog
--- sawfish-1.3+cvs20060518/debian/changelog
+++ sawfish-1.3+cvs20060518/debian/changelog
@@ -1,3 +1,13 @@
+sawfish (1:1.3+cvs20060518-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * 08_install-info.dpatch: Comment out call to install-info in
+    man/Makefile.in; the manual should not be installed into the filesystem
+    before at postinst time, otherwise it causes file conflicts.
+    (Closes: #373866)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Tue, 27 Jun 2006 22:17:05 +0200
+
 sawfish (1:1.3+cvs20060518-1) unstable; urgency=low
 
   * New cvs release.
diff -u sawfish-1.3+cvs20060518/debian/patches/00list sawfish-1.3+cvs20060518/debian/patches/00list
--- sawfish-1.3+cvs20060518/debian/patches/00list
+++ sawfish-1.3+cvs20060518/debian/patches/00list
@@ -6,0 +7 @@
+08_install-info.dpatch
only in patch2:
unchanged:
--- sawfish-1.3+cvs20060518.orig/debian/patches/08_install-info.dpatch
+++ sawfish-1.3+cvs20060518/debian/patches/08_install-info.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_install-info.dpatch by Steinar H. Gunderson <sesse@debian.org>
+##
+## All lines beginning with ## DP:' are a description of the patch.
+## DP: Delay install-info invocation to postinst, as per Policy.
+
+@DPATCH@
+
+--- sawfish-1.3.orig/man/Makefile.in	2006-06-15 08:46:02.000000000 +0200
++++ sawfish-1.3/man/Makefile.in	2006-06-27 22:14:45.000000000 +0200
+@@ -58,7 +58,7 @@
+ 	for f in sawfish.info*; do \
+  	  $(INSTALL_DATA) $$f $(DESTDIR)$(infodir); \
+ 	done
+-	-install-info --info-dir=$(DESTDIR)$(infodir) sawfish.info
++	# -install-info --info-dir=$(DESTDIR)$(infodir) sawfish.info
+ 
+ installdirs : mkinstalldirs
+ 	$(SHELL) $< $(DESTDIR)$(infodir)