[Pkg-tcltk-commits] r1034 - xotcl/trunk/debian

[ssoberni-guest at alioth.debian.org]

Author: ssoberni-guest
Date: 2010-04-11 17:23:01 +0000 (Sun, 11 Apr 2010)
New Revision: 1034

Modified:
   xotcl/trunk/debian/changelog
   xotcl/trunk/debian/control
   xotcl/trunk/debian/rules
Log:
Incorporated changes of NMU #2 yielding 1.6.5-1.2

Modified: xotcl/trunk/debian/changelog
===================================================================
--- xotcl/trunk/debian/changelog	2010-04-11 16:36:04 UTC (rev 1033)
+++ xotcl/trunk/debian/changelog	2010-04-11 17:23:01 UTC (rev 1034)
@@ -1,3 +1,14 @@
+xotcl (1.6.5-1.2) unstable; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Fix CVE-2009-3720 in embedded Expat copy. xotcl isn't affected by
+    CVE-2009-3560 (Closes: #560950)
+
+  [ Stefan Sobernig ]
+  * Incorporated NMU source patches on bundled expat properly through dpatch
+
+ -- Moritz Muehlenhoff <jmm at debian.org>  Tue, 23 Feb 2010 21:51:50 +0100
+
 xotcl (1.6.5-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.

Modified: xotcl/trunk/debian/control
===================================================================
--- xotcl/trunk/debian/control	2010-04-11 16:36:04 UTC (rev 1033)
+++ xotcl/trunk/debian/control	2010-04-11 17:23:01 UTC (rev 1034)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Stefan Sobernig <stefan.sobernig at wu-wien.ac.at>
-Build-Depends: debhelper (>= 7), autotools-dev, tcl-dev (>= 8.4), tk-dev (>= 8.4), aolserver4-dev (>= 4.5.1-5)
+Build-Depends: debhelper (>= 7), autotools-dev, tcl-dev (>= 8.4), tk-dev (>= 8.4), aolserver4-dev (>= 4.5.1-5), dpatch
 Standards-Version: 3.8.3
 Homepage: http://www.xotcl.org/
 Vcs-Svn: svn://svn.debian.org/viewsvn/pkg-tcltk/xotcl/

Modified: xotcl/trunk/debian/rules
===================================================================
--- xotcl/trunk/debian/rules	2010-04-11 16:36:04 UTC (rev 1033)
+++ xotcl/trunk/debian/rules	2010-04-11 17:23:01 UTC (rev 1034)
@@ -17,6 +17,8 @@
 # Environement
 #
 
+include /usr/share/dpatch/dpatch.make
+
 SHELL=/bin/sh
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -80,14 +82,14 @@
 		--build=$(DEB_BUILD_GNU_TYPE)
 
 build: build-stamp
-build-stamp: config.status
+build-stamp: patch-stamp config.status
 	dh_testdir
 
 	$(MAKE)
 
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp