[cdo] 03/14: Merge 1.6.6 changes back to master

[Alastair McKinstry]

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 8aea37072999c67d2619a329adb6dd25717a0fa8
Merge: 6368cbe 42ec7f6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jul 13 09:33:57 2015 +0100

    Merge 1.6.6 changes back to master

 debian/changelog                         |  21 +++-
 debian/control                           |   1 +
 debian/patches/deregister.patch          |  55 ++++++++++
 debian/patches/reproducible-builds.patch | 175 +++++++++++++++++++++++++++++++
 debian/patches/series                    |   3 +
 debian/patches/str2uuid.patch            |  27 +++++
 m4/._ax_pthread.m4                       | Bin 197 -> 0 bytes
 test/data/._netcdf_testfile01.nc         | Bin 197 -> 0 bytes
 8 files changed, 280 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index d5b58e2,adb8301..45aef98
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,22 +1,30 @@@
 +cdo (1.6.9+dfsg.1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +    - remove build-fix.patch for str2uuid(), now not needed.
 +  * Enable libfftw3 support
-   * Add deregister.patch, removing 'register' attributes from libcdi code
-     that breaks HPPA where it tries to find the addr of registers.
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Wed, 29 Apr 2015 19:19:51 +0100
 +
+ cdo (1.6.6+dfsg.1-2) unstable; urgency=medium
+ 
+   * deregister.patch: remove obsolete 'register' statements from some code. 
+     Finding the address of a register strictly verboten and breaks 
+     ppc64el code. 
+   * Additional fix ore reproducible build: set hostname, username to 
+     constant values. 
+ 
+  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 13 Jul 2015 08:58:40 +0100
+ 
+ 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
+ 
  cdo (1.6.5+dfsg.1-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/patches/series
index 63010b3,cf725a2..e7f5d46
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,7 +1,7 @@@
+ deregister.patch
  fix_typos.patch
  ignore.patch
 -build-fixes.patch
  gotocc-fix.patch
 +deregister.patch
+ reproducible-builds.patch
+ str2uuid.patch

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