[med-svn] r12848 - in trunk/packages/mcl/trunk/debian: . patches

[Philipp Benner]

Author: philipp
Date: 2013-01-27 15:17:54 +0000 (Sun, 27 Jan 2013)
New Revision: 12848

Added:
   trunk/packages/mcl/trunk/debian/patches/01-restrict-variables.patch
Modified:
   trunk/packages/mcl/trunk/debian/changelog
   trunk/packages/mcl/trunk/debian/control
   trunk/packages/mcl/trunk/debian/patches/series
   trunk/packages/mcl/trunk/debian/rules
Log:
release 12-135-1

Modified: trunk/packages/mcl/trunk/debian/changelog
===================================================================
--- trunk/packages/mcl/trunk/debian/changelog	2013-01-26 23:25:08 UTC (rev 12847)
+++ trunk/packages/mcl/trunk/debian/changelog	2013-01-27 15:17:54 UTC (rev 12848)
@@ -1,9 +1,16 @@
-mcl (1:12-068-2) UNRELEASED; urgency=low
+mcl (1:12-135-1) unstable; urgency=low
 
+  [ Andreas Tille ]
   * debian/upstream: Add citation information
 
- -- Andreas Tille <tille at debian.org>  Sun, 27 May 2012 08:38:14 +0200
+  [ Philipp Benner ]
+  * New upstream release
+  * Hardening flags
+  * Renamed variables with name 'restricted' in src/impala/matrix.c
+    (Closes: #688655)
 
+ -- Philipp Benner <philipp at debian.org>  Sun, 27 Jan 2013 15:49:50 +0100
+
 mcl (1:12-068-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/mcl/trunk/debian/control
===================================================================
--- trunk/packages/mcl/trunk/debian/control	2013-01-26 23:25:08 UTC (rev 12847)
+++ trunk/packages/mcl/trunk/debian/control	2013-01-27 15:17:54 UTC (rev 12848)
@@ -4,7 +4,7 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Philipp Benner <philipp at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, quilt, zoem, tidy
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.16.1~), autotools-dev, quilt, zoem, tidy
 Standards-Version: 3.9.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mcl/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/mcl/

Added: trunk/packages/mcl/trunk/debian/patches/01-restrict-variables.patch
===================================================================
--- trunk/packages/mcl/trunk/debian/patches/01-restrict-variables.patch	                        (rev 0)
+++ trunk/packages/mcl/trunk/debian/patches/01-restrict-variables.patch	2013-01-27 15:17:54 UTC (rev 12848)
@@ -0,0 +1,35 @@
+--- a/src/impala/matrix.c
++++ b/src/impala/matrix.c
+@@ -1855,18 +1855,18 @@
+ mclv* mclgUnionv
+ (  mclx* mx
+ ,  const mclv* coldom
+-,  const mclv* restrict
++,  const mclv* restrict_var
+ ,  mcxenum scratch_STATUS
+ ,  mclv* dst
+ )
+-   {  return mclgUnionv2(mx, coldom, restrict, scratch_STATUS, dst, mx->dom_rows)
++   {  return mclgUnionv2(mx, coldom, restrict_var, scratch_STATUS, dst, mx->dom_rows)
+ ;  }
+ 
+ 
+ mclv* mclgUnionv2
+ (  const mclx* mx
+ ,  const mclv* coldom
+-,  const mclv* restrict
++,  const mclv* restrict_var
+ ,  mcxenum scratch_STATUS
+ ,  mclv* dst
+ ,  mclv* scratch
+@@ -1911,8 +1911,8 @@
+                )
+                continue               /* SNH if coldom is subset of mx->dom_cols */
+             ;  if
+-               (  restrict
+-               && 0 > (o_restrict = mclvGetIvpOffset(restrict, idx, o_restrict))
++               (  restrict_var
++               && 0 > (o_restrict = mclvGetIvpOffset(restrict_var, idx, o_restrict))
+                )
+                continue               /* not found in restriction domain */
+ 

Modified: trunk/packages/mcl/trunk/debian/patches/series
===================================================================
--- trunk/packages/mcl/trunk/debian/patches/series	2013-01-26 23:25:08 UTC (rev 12847)
+++ trunk/packages/mcl/trunk/debian/patches/series	2013-01-27 15:17:54 UTC (rev 12848)
@@ -1 +1,2 @@
+01-restrict-variables.patch
 02-wrong-interpreter-path.patch

Modified: trunk/packages/mcl/trunk/debian/rules
===================================================================
--- trunk/packages/mcl/trunk/debian/rules	2013-01-26 23:25:08 UTC (rev 12847)
+++ trunk/packages/mcl/trunk/debian/rules	2013-01-27 15:17:54 UTC (rev 12848)
@@ -6,7 +6,8 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 pkg=mcl
 
@@ -124,14 +125,14 @@
 build: build-arch build-indep
 build-arch: build-stamp
 build-indep: build-stamp
-build-stamp: patch configure $(QUILT_STAMPFN)
+build-stamp: configure $(QUILT_STAMPFN)
 	dh_testdir
 
 	$(MAKE)
 
 	touch build-stamp
 
-clean: unpatch config-clean
+clean: config-clean
 	dh_testdir
 	dh_testroot
 	$(RM) -f build-stamp configure-stamp