Imported Debian patch 3.7-7.2

diff --git a/debian/changelog b/debian/changelog
index fe1f4b2dffb05c77bacc2428c2ed05395e67c6d3..aa2366aa4b40c51777ae3c7a3de4dd5ca4316a6e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sash (3.7-7.2) unstable; urgency=low
+
+  * NMU
+  * Apparently CDBS decided to start overwriting the LDFLAGS setting, which
+    made sash no longer statically linked. Work around this brain-damage.
+    Closes: #403659
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 19 Dec 2006 18:16:21 -0500
+
 sash (3.7-7.1) unstable; urgency=low
 
   * Non-maintainer upload to fix longstanding l10n issues

diff --git a/debian/rules b/debian/rules
index c01e647808132bf429f3798f903dcc2f9b8a090d..e3d02480b3f674cbe183e69c5c4e26a6857b5e64 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 pkgdir := `pwd`/debian/sash
 
 DEB_MAKE_INSTALL_TARGET=install BINDIR=$(pkgdir)/bin MANDIR=$(pkgdir)/usr/share/man/man1
+# work around cdbs brain-damage
+LDFLAGS=-static -s
 
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk