[cdo] 04/04: Prep 1.6.6 release
Alastair McKinstry
mckinstry at moszumanska.debian.org
Mon Jul 13 10:06:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/1.6.6+dfsg.1-1
in repository cdo.
commit bc54d2c2d917ec727579fa600183415cd4a1bd01
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun Jun 28 09:48:21 2015 +0100
Prep 1.6.6 release
---
debian/changelog | 5 +-
debian/patches/reproducible-builds.patch | 138 +++++++++++++++++++++++++++++++
debian/patches/series | 2 +
debian/patches/str2uuid.patch | 27 ++++++
4 files changed, 171 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 0f03571..f90c7ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-cdo (1.6.6+dfsg.1-1) UNRELEASED; urgency=medium
+cdo (1.6.6+dfsg.1-1) unstable; urgency=medium
* New upstream release
+ * Remove timestamps to make build bit-reproducible
+ * Minor build fix for str2uuid: remove broken forward declaration
+ * Add Vcs-Git: to control file, pointing to debian-science repo
-- Alastair McKinstry <mckinstry at debian.org> Sun, 28 Jun 2015 09:00:16 +0100
diff --git a/debian/patches/reproducible-builds.patch b/debian/patches/reproducible-builds.patch
new file mode 100644
index 0000000..4cefb4b
--- /dev/null
+++ b/debian/patches/reproducible-builds.patch
@@ -0,0 +1,138 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Make builds bit-reproducible in Debian: remove timestamps
+Last-Updated: 2015-06-29
+Forwarded: no
+
+Index: cdo-1.6.6+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)
+ fprintf(stderr, " version: %s\n", COMP_VERSION);
+ #endif
+ #if defined (USER_NAME) && defined(HOST_NAME) && defined(SYSTEM_TYPE)
+- fprintf(stderr, "Compiled: by %s on %s (%s) %s %s\n",
+- USER_NAME, HOST_NAME, SYSTEM_TYPE, __DATE__, __TIME__);
++ fprintf(stderr, "Compiled: by %s on %s (%s) \n",
++ USER_NAME, HOST_NAME, SYSTEM_TYPE);
+ #endif
+
+ fprintf(stderr, "filetype: ");
+Index: cdo-1.6.6+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;
+ #define LIBVERSION 1.3.2
+ #define XSTRING(x) #x
+ #define STRING(x) XSTRING(x)
+-static const char srv_libvers[] = STRING(LIBVERSION) " of "__DATE__" "__TIME__;
++static const char srv_libvers[] = STRING(LIBVERSION);
+
+ 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
+===================================================================
+--- cdo-1.6.6+dfsg.1.orig/libcdi/src/extralib.c
++++ cdo-1.6.6+dfsg.1/libcdi/src/extralib.c
+@@ -35,7 +35,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)
+ {
+Index: cdo-1.6.6+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
+@@ -153,7 +153,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/ieglib.c
+===================================================================
+--- cdo-1.6.6+dfsg.1.orig/libcdi/src/ieglib.c
++++ cdo-1.6.6+dfsg.1/libcdi/src/ieglib.c
+@@ -29,7 +29,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)
+ {
+Index: cdo-1.6.6+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;
+ #define LIBVERSION 1.3.2
+ #define XSTRING(x) #x
+ #define STRING(x) XSTRING(x)
+-static const char srv_libvers[] = STRING(LIBVERSION) " of "__DATE__" "__TIME__;
++static const char srv_libvers[] = STRING(LIBVERSION) ;
+
+ const char *srvLibraryVersion(void)
+ {
+Index: cdo-1.6.6+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
+@@ -7,7 +7,7 @@
+ */
+
+ #if defined (VERSION)
+- static const char cdi_libvers[] = VERSION " of "__DATE__" "__TIME__;
++ static const char cdi_libvers[] = VERSION ;
+ #else
+ # error "VERSION undefined"
+ #endif
+Index: cdo-1.6.6+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)
+
+ fprintf(stderr, "%s\n", CDO_Version);
+ #if defined(USER_NAME) && defined(HOST_NAME) && defined(SYSTEM_TYPE)
+- fprintf(stderr, "Compiled: by %s on %s (%s) %s %s\n", USER_NAME, HOST_NAME, SYSTEM_TYPE, __DATE__, __TIME__);
++ fprintf(stderr, "Compiled: by %s on %s (%s)\n", USER_NAME, HOST_NAME, SYSTEM_TYPE);
+ #endif
+ #if defined(COMPILER)
+ fprintf(stderr, "Compiler: %s\n", COMPILER);
diff --git a/debian/patches/series b/debian/patches/series
index c424ce3..700c500 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ fix_typos.patch
ignore.patch
build-fixes.patch
gotocc-fix.patch
+reproducible-builds.patch
+str2uuid.patch
diff --git a/debian/patches/str2uuid.patch b/debian/patches/str2uuid.patch
new file mode 100644
index 0000000..7a1c9f8
--- /dev/null
+++ b/debian/patches/str2uuid.patch
@@ -0,0 +1,27 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+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