[cdo] 12/14: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Aug 23 11:53:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/1.6.9+dfsg.1-1
in repository cdo.
commit 39ae388fdbc4941ffb7aeba53b358c02205e493d
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jul 20 04:33:06 2015 +0100
refresh patches
---
debian/patches/ppc64el.patch | 8 +--
debian/patches/reproducible-builds.patch | 91 +++++++++++---------------------
debian/patches/series | 1 -
debian/patches/str2uuid.patch | 22 --------
4 files changed, 36 insertions(+), 86 deletions(-)
diff --git a/debian/patches/ppc64el.patch b/debian/patches/ppc64el.patch
index c9d0a41..f9ddf23 100644
--- a/debian/patches/ppc64el.patch
+++ b/debian/patches/ppc64el.patch
@@ -6,11 +6,11 @@ Bug-Debian: https://bugs.debian.org/763691
Last-Updated: 2015-07-14
Forwarded: no
-Index: cdo-1.6.6+dfsg.1/libcdi/src/cgribexlib.c
+Index: cdo-1.6.9+dfsg.1/libcdi/src/cgribexlib.c
===================================================================
---- cdo-1.6.6+dfsg.1.orig/libcdi/src/cgribexlib.c 2015-07-14 02:03:14.000000000 -0300
-+++ cdo-1.6.6+dfsg.1/libcdi/src/cgribexlib.c 2015-07-14 03:06:20.000000000 -0300
-@@ -15,6 +15,7 @@
+--- cdo-1.6.9+dfsg.1.orig/libcdi/src/cgribexlib.c
++++ cdo-1.6.9+dfsg.1/libcdi/src/cgribexlib.c
+@@ -14,6 +14,7 @@
#ifdef _ARCH_PWR6
#pragma options nostrict
diff --git a/debian/patches/reproducible-builds.patch b/debian/patches/reproducible-builds.patch
index 1ab43f2..cacb791 100644
--- a/debian/patches/reproducible-builds.patch
+++ b/debian/patches/reproducible-builds.patch
@@ -4,11 +4,11 @@ Description: Make builds bit-reproducible in Debian: remove timestamps
Last-Updated: 2015-07-08
Forwarded: no
-Index: cdo-1.6.6+dfsg.1/libcdi/app/cdi.c
+Index: cdo-1.6.9+dfsg.1/libcdi/app/cdi.c
===================================================================
---- cdo-1.6.6+dfsg.1.orig/libcdi/app/cdi.c
-+++ cdo-1.6.6+dfsg.1/libcdi/app/cdi.c
-@@ -74,8 +74,8 @@ void version(void)
+--- cdo-1.6.9+dfsg.1.orig/libcdi/app/cdi.c
++++ cdo-1.6.9+dfsg.1/libcdi/app/cdi.c
+@@ -67,8 +67,8 @@ void version(void)
fprintf(stderr, " version: %s\n", COMP_VERSION);
#endif
#if defined (USER_NAME) && defined(HOST_NAME) && defined(SYSTEM_TYPE)
@@ -19,11 +19,11 @@ Index: cdo-1.6.6+dfsg.1/libcdi/app/cdi.c
#endif
fprintf(stderr, "filetype: ");
-Index: cdo-1.6.6+dfsg.1/libcdi/src/cdilib.c
+Index: cdo-1.6.9+dfsg.1/libcdi/src/cdilib.c
===================================================================
---- cdo-1.6.6+dfsg.1.orig/libcdi/src/cdilib.c
-+++ cdo-1.6.6+dfsg.1/libcdi/src/cdilib.c
-@@ -16172,7 +16172,7 @@ static int srvDefaultDprec = 0;
+--- cdo-1.6.9+dfsg.1.orig/libcdi/src/cdilib.c
++++ cdo-1.6.9+dfsg.1/libcdi/src/cdilib.c
+@@ -33743,7 +33743,7 @@ static int srvDefaultDprec = 0;
#define LIBVERSION 1.3.2
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
@@ -32,37 +32,10 @@ Index: cdo-1.6.6+dfsg.1/libcdi/src/cdilib.c
const char *srvLibraryVersion(void)
{
-@@ -16775,7 +16775,7 @@ static int extDefaultNumber = EXT_REAL;
- #define LIBVERSION 1.3.2
- #define XSTRING(x) #x
- #define STRING(x) XSTRING(x)
--static const char ext_libvers[] = STRING(LIBVERSION) " of "__DATE__" "__TIME__;
-+static const char ext_libvers[] = STRING(LIBVERSION) ;
-
- const char *extLibraryVersion(void)
- {
-@@ -17372,7 +17372,7 @@ static int iegDefaultDprec = 0;
- #define LIBVERSION 1.3.3
- #define XSTRING(x) #x
- #define STRING(x) XSTRING(x)
--static const char ieg_libvers[] = STRING(LIBVERSION) " of "__DATE__" "__TIME__;
-+static const char ieg_libvers[] = STRING(LIBVERSION) ;
-
- const char *iegLibraryVersion(void)
- {
-@@ -46830,7 +46830,7 @@ static void file_table_print(void);
- #define LIBVERSION 1.8.2
- #define XSTRING(x) #x
- #define STRING(x) XSTRING(x)
--const char file_libvers[] = STRING(LIBVERSION) " of "__DATE__" "__TIME__;
-+const char file_libvers[] = STRING(LIBVERSION) ;
-
- /*
- 21/05/2004 1.3.2 set min I/O Buffersize to 128k
-Index: cdo-1.6.6+dfsg.1/libcdi/src/extralib.c
+Index: cdo-1.6.9+dfsg.1/libcdi/src/extralib.c
===================================================================
---- cdo-1.6.6+dfsg.1.orig/libcdi/src/extralib.c
-+++ cdo-1.6.6+dfsg.1/libcdi/src/extralib.c
+--- cdo-1.6.9+dfsg.1.orig/libcdi/src/extralib.c
++++ cdo-1.6.9+dfsg.1/libcdi/src/extralib.c
@@ -35,7 +35,7 @@ static int extDefaultNumber = EXT_REAL;
#define LIBVERSION 1.3.2
#define XSTRING(x) #x
@@ -72,10 +45,10 @@ Index: cdo-1.6.6+dfsg.1/libcdi/src/extralib.c
const char *extLibraryVersion(void)
{
-Index: cdo-1.6.6+dfsg.1/libcdi/src/file.c
+Index: cdo-1.6.9+dfsg.1/libcdi/src/file.c
===================================================================
---- cdo-1.6.6+dfsg.1.orig/libcdi/src/file.c
-+++ cdo-1.6.6+dfsg.1/libcdi/src/file.c
+--- cdo-1.6.9+dfsg.1.orig/libcdi/src/file.c
++++ cdo-1.6.9+dfsg.1/libcdi/src/file.c
@@ -153,7 +153,7 @@ static void file_table_print(void);
#define LIBVERSION 1.8.2
#define XSTRING(x) #x
@@ -85,10 +58,10 @@ Index: cdo-1.6.6+dfsg.1/libcdi/src/file.c
/*
21/05/2004 1.3.2 set min I/O Buffersize to 128k
-Index: cdo-1.6.6+dfsg.1/libcdi/src/ieglib.c
+Index: cdo-1.6.9+dfsg.1/libcdi/src/ieglib.c
===================================================================
---- cdo-1.6.6+dfsg.1.orig/libcdi/src/ieglib.c
-+++ cdo-1.6.6+dfsg.1/libcdi/src/ieglib.c
+--- cdo-1.6.9+dfsg.1.orig/libcdi/src/ieglib.c
++++ cdo-1.6.9+dfsg.1/libcdi/src/ieglib.c
@@ -29,7 +29,7 @@ static int iegDefaultDprec = 0;
#define LIBVERSION 1.3.3
#define XSTRING(x) #x
@@ -98,11 +71,11 @@ Index: cdo-1.6.6+dfsg.1/libcdi/src/ieglib.c
const char *iegLibraryVersion(void)
{
-Index: cdo-1.6.6+dfsg.1/libcdi/src/servicelib.c
+Index: cdo-1.6.9+dfsg.1/libcdi/src/servicelib.c
===================================================================
---- cdo-1.6.6+dfsg.1.orig/libcdi/src/servicelib.c
-+++ cdo-1.6.6+dfsg.1/libcdi/src/servicelib.c
-@@ -35,7 +35,7 @@ static int srvDefaultDprec = 0;
+--- cdo-1.6.9+dfsg.1.orig/libcdi/src/servicelib.c
++++ cdo-1.6.9+dfsg.1/libcdi/src/servicelib.c
+@@ -37,7 +37,7 @@ static int srvDefaultDprec = 0;
#define LIBVERSION 1.3.2
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
@@ -111,10 +84,10 @@ Index: cdo-1.6.6+dfsg.1/libcdi/src/servicelib.c
const char *srvLibraryVersion(void)
{
-Index: cdo-1.6.6+dfsg.1/libcdi/src/version.c
+Index: cdo-1.6.9+dfsg.1/libcdi/src/version.c
===================================================================
---- cdo-1.6.6+dfsg.1.orig/libcdi/src/version.c
-+++ cdo-1.6.6+dfsg.1/libcdi/src/version.c
+--- cdo-1.6.9+dfsg.1.orig/libcdi/src/version.c
++++ cdo-1.6.9+dfsg.1/libcdi/src/version.c
@@ -7,7 +7,7 @@
*/
@@ -124,11 +97,11 @@ Index: cdo-1.6.6+dfsg.1/libcdi/src/version.c
#else
# error "VERSION undefined"
#endif
-Index: cdo-1.6.6+dfsg.1/src/cdo.c
+Index: cdo-1.6.9+dfsg.1/src/cdo.c
===================================================================
---- cdo-1.6.6+dfsg.1.orig/src/cdo.c
-+++ cdo-1.6.6+dfsg.1/src/cdo.c
-@@ -168,7 +168,7 @@ void cdo_version(void)
+--- cdo-1.6.9+dfsg.1.orig/src/cdo.c
++++ cdo-1.6.9+dfsg.1/src/cdo.c
+@@ -107,7 +107,7 @@ void cdo_version(void)
fprintf(stderr, "%s\n", CDO_Version);
#if defined(USER_NAME) && defined(HOST_NAME) && defined(SYSTEM_TYPE)
@@ -137,11 +110,11 @@ Index: cdo-1.6.6+dfsg.1/src/cdo.c
#endif
#if defined(COMPILER)
fprintf(stderr, "Compiler: %s\n", COMPILER);
-Index: cdo-1.6.6+dfsg.1/configure.ac
+Index: cdo-1.6.9+dfsg.1/configure.ac
===================================================================
---- cdo-1.6.6+dfsg.1.orig/configure.ac
-+++ cdo-1.6.6+dfsg.1/configure.ac
-@@ -85,19 +85,19 @@ if test -z "$COMP_VERSION" ; then COMP_V
+--- cdo-1.6.9+dfsg.1.orig/configure.ac
++++ cdo-1.6.9+dfsg.1/configure.ac
+@@ -90,19 +90,19 @@ if test -z "$COMP_VERSION" ; then COMP_V
AC_DEFINE_UNQUOTED(COMP_VERSION, ["$COMP_VERSION"], [Compiler version])
# Checks for username, hostname and system type
diff --git a/debian/patches/series b/debian/patches/series
index f18f400..19eeeba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,4 @@ ignore.patch
gotocc-fix.patch
deregister.patch
reproducible-builds.patch
-str2uuid.patch
ppc64el.patch
diff --git a/debian/patches/str2uuid.patch b/debian/patches/str2uuid.patch
index 7a1c9f8..eaadc23 100644
--- a/debian/patches/str2uuid.patch
+++ b/debian/patches/str2uuid.patch
@@ -3,25 +3,3 @@ Description: Build fix needed for str2uuid() fn
Forwarded: no
Last-Updated: 2015-06-29
-Index: cdo-1.6.6+dfsg.1/src/griddes.c
-===================================================================
---- cdo-1.6.6+dfsg.1.orig/src/griddes.c
-+++ cdo-1.6.6+dfsg.1/src/griddes.c
-@@ -55,7 +55,7 @@ void extClose(int fileID);
-
- #define MAX_LINE_LEN 65536
-
--void str2uuid(const char *uuidstr, char *uuid);
-+void str2uuid(const char *uuidstr, unsigned char *uuid);
-
- void gridInit(griddes_t *grid)
- {
-@@ -671,8 +671,6 @@ double readflt(const char *filename, con
- return (val);
- }
-
--void str2uuid(const char *uuidstr, unsigned char *uuid);
--
- int gridFromFile(FILE *gfp, const char *dname)
- {
- char line[MAX_LINE_LEN], *pline;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git
More information about the debian-science-commits
mailing list