[cminpack] 01/03: Rediff patches for use with gbp

Ole Streicher olebole at moszumanska.debian.org
Mon Feb 27 14:37:21 UTC 2017


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

olebole pushed a commit to branch master
in repository cminpack.

commit 3aef32cb0c1a63897a6d8e1406efe3f545330270
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Feb 27 15:22:23 2017 +0100

    Rediff patches for use with gbp
---
 .../patches/{addlibmath.patch => Link-to-math-lib.patch}   | 14 ++++++++++----
 ...m-provided-environment-when-building-the-test-su.patch} | 14 +++++++++++---
 debian/patches/series                                      |  4 ++--
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/debian/patches/addlibmath.patch b/debian/patches/Link-to-math-lib.patch
similarity index 50%
rename from debian/patches/addlibmath.patch
rename to debian/patches/Link-to-math-lib.patch
index 2098d70..42d03f9 100644
--- a/debian/patches/addlibmath.patch
+++ b/debian/patches/Link-to-math-lib.patch
@@ -1,11 +1,17 @@
-Description: need to link to math lib
+From: Mathieu Malaterre <malat at debian.org>
+Date: Wed, 11 Apr 2012 16:35:33 +0000
+Subject: Link to math lib
+
 Forwarded: Frederic Devernay
-Author: Mathieu Malaterre <malat at debian.org>
-Last-Update: 2012-04-11
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7cd09bc..5e79b57 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -57,6 +57,7 @@
+@@ -57,6 +57,7 @@ set (cminpack_hdrs
      cminpack.h minpack.h)
  
  add_library (cminpack ${LIB_TYPE} ${cminpack_srcs})
diff --git a/debian/patches/fix_tests.patch b/debian/patches/Use-system-provided-environment-when-building-the-test-su.patch
similarity index 50%
rename from debian/patches/fix_tests.patch
rename to debian/patches/Use-system-provided-environment-when-building-the-test-su.patch
index aeb6ac7..08dc6a4 100644
--- a/debian/patches/fix_tests.patch
+++ b/debian/patches/Use-system-provided-environment-when-building-the-test-su.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Use system provided environment when building the test suite
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Thu, 29 May 2014 10:09:47 +0200
+Subject: Use system provided environment when building the test suite
+
+---
+ examples/Makefile | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/examples/Makefile b/examples/Makefile
+index 31ea902..fb37b12 100644
 --- a/examples/Makefile
 +++ b/examples/Makefile
-@@ -10,10 +10,12 @@
+@@ -10,10 +10,12 @@ F77=gfortran
  #F77CFLAGS=-g
  
  # uncomment the following for C MINPACK
diff --git a/debian/patches/series b/debian/patches/series
index 415522c..8a41bde 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-addlibmath.patch
-fix_tests.patch
+Link-to-math-lib.patch
+Use-system-provided-environment-when-building-the-test-su.patch

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



More information about the debian-science-commits mailing list