[plplot] 25/68: Import Debian changes 5.6.1-11

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository plplot.

commit 1b4405f6b14640d12eee0a8a2e86cad3cffb08b0
Author: Matej Vela <vela at debian.org>
Date:   Sun Apr 15 21:57:03 2007 +0200

    Import Debian changes 5.6.1-11
    
    plplot (5.6.1-11) unstable; urgency=low
    
      * QA upload.
      * debian/patches/51_remove-no-force-mem.dpatch: Remove `-fno-force-mem',
        which is a no-op with GCC 4.1+, and unsupported with GCC 4.3.
        Closes: #415278.
      * debian/watch: Update upstream URL.
---
 debian/changelog                             | 10 +++++++++
 debian/patches/00list                        |  1 +
 debian/patches/00patch-opts                  |  2 ++
 debian/patches/51_remove-no-force-mem.dpatch | 32 ++++++++++++++++++++++++++++
 debian/watch                                 |  4 +---
 5 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d1f68e..fb0c29e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+plplot (5.6.1-11) unstable; urgency=low
+
+  * QA upload.
+  * debian/patches/51_remove-no-force-mem.dpatch: Remove `-fno-force-mem',
+    which is a no-op with GCC 4.1+, and unsupported with GCC 4.3.
+    Closes: #415278.
+  * debian/watch: Update upstream URL.
+
+ -- Matej Vela <vela at debian.org>  Sun, 15 Apr 2007 21:57:03 +0200
+
 plplot (5.6.1-10) unstable; urgency=low
 
   * Orphaning the package
diff --git a/debian/patches/00list b/debian/patches/00list
index 6de026c..a26dc8d 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
 50_check-for-octave2.1
+51_remove-no-force-mem
diff --git a/debian/patches/00patch-opts b/debian/patches/00patch-opts
new file mode 100644
index 0000000..836889c
--- /dev/null
+++ b/debian/patches/00patch-opts
@@ -0,0 +1,2 @@
+# Default options plus -Z to avoid problems with timestamp skew.
+patch_opts='-g0 -f --no-backup-if-mismatch -Z'
diff --git a/debian/patches/51_remove-no-force-mem.dpatch b/debian/patches/51_remove-no-force-mem.dpatch
new file mode 100644
index 0000000..445ecdd
--- /dev/null
+++ b/debian/patches/51_remove-no-force-mem.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 51_remove-no-force-mem.dpatch by Matej Vela <vela at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: `-fno-force-mem' is a no-op with GCC 4.1+, and unsupported with
+## DP: GCC 4.3 (#415278).
+
+ at DPATCH@
+diff -urNad plplot-5.6.1~/lib/nn/Makefile.am plplot-5.6.1/lib/nn/Makefile.am
+--- plplot-5.6.1~/lib/nn/Makefile.am	2005-04-27 08:44:18.000000000 +0200
++++ plplot-5.6.1/lib/nn/Makefile.am	2005-04-27 08:44:18.000000000 +0200
+@@ -24,7 +24,7 @@
+ # If using the gcc compiler, this library needs to be built with 
+ # the -fno-force-mem -ffloat-store for most reliable performance.
+ if cc_is_gcc
+-  AM_CFLAGS = -fno-force-mem -ffloat-store
++  AM_CFLAGS = -ffloat-store
+ endif
+ 		
+ lib_LTLIBRARIES = libcsironn.la
+diff -urNad plplot-5.6.1~/lib/nn/Makefile.in plplot-5.6.1/lib/nn/Makefile.in
+--- plplot-5.6.1~/lib/nn/Makefile.in	2006-05-30 01:07:33.000000000 +0200
++++ plplot-5.6.1/lib/nn/Makefile.in	2006-05-30 01:07:33.000000000 +0200
+@@ -475,7 +475,7 @@
+ 
+ # If using the gcc compiler, this library needs to be built with 
+ # the -fno-force-mem -ffloat-store for most reliable performance.
+- at cc_is_gcc_TRUE@AM_CFLAGS = -fno-force-mem -ffloat-store
++ at cc_is_gcc_TRUE@AM_CFLAGS = -ffloat-store
+ lib_LTLIBRARIES = libcsironn.la
+ libcsironn_la_SOURCES = delaunay.c hash.c istack.c lpi.c \
+                         nnai.c nnpi.c nncommon.c
diff --git a/debian/watch b/debian/watch
index 7a1b2de..b71db99 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
 version=3
-http://sourceforge.net/project/showfiles.php?group_id=2915 \
-  http://prdownloads.sourceforge.net/plplot/plplot-([\d\.]+).tar.gz\?download
-
+http://sf.net/plplot/plplot-(.*)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git