Imported Debian patch 3.7-5sarge1

diff --git a/debian/changelog b/debian/changelog
index c4c2077cb51f4cdf36c933d376530a21a8f2b079..8250d9d6faeb1a728e1b753f8fea090cbbd79dd2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sash (3.7-5sarge1) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team.
+  * Force recompile against zlib with security fixes (CVE-2005-1849,
+    CVE-2005-2096)
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Wed,  5 Apr 2006 15:57:42 +0000
+
 sash (3.7-5) unstable; urgency=low
 
   * Add Japanese debconf translation (closes: #290129)

diff --git a/debian/control b/debian/control
index ba24cde3a6c46d1cac4fe4170b9bff1eb732bb7d..a5f436d3b2dce14aaa8bfd193fa638917eeba0d6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: shells
 Priority: optional
 Maintainer: Tollef Fog Heen <tfheen@debian.org>
 Standards-Version: 3.6.1
-Build-Depends: zlib1g-dev (>= 1:1.1.3-19.1), cdbs, debhelper (>= 4.1.0), e2fslibs-dev, po-debconf
+Build-Depends: zlib1g-dev (>= 1:1.2.2-4.sarge.2), cdbs, debhelper (>= 4.1.0), e2fslibs-dev, po-debconf
 
 Package: sash
 Architecture: any