[cmor] 178/190: Prep 2.8.3-1 release

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository cmor.

commit 27cb2113ae66b0b46ef923c6214c791c201e633d
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Dec 20 01:41:23 2013 +0000

    Prep 2.8.3-1 release
---
 debian/TODO.txt       | 1 +
 debian/changelog      | 3 +--
 debian/control        | 2 +-
 debian/patches/series | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/TODO.txt b/debian/TODO.txt
new file mode 100644
index 0000000..10240c2
--- /dev/null
+++ b/debian/TODO.txt
@@ -0,0 +1 @@
+* Currently working on python3 patch.  This fails testing on unicode/bytestring issues
diff --git a/debian/changelog b/debian/changelog
index 7072e36..d185550 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,10 @@
 cmor (2.8.3-1) unstable; urgency=low
 
   * New upstream release.
-  * Add python3 support.
   * Depend on debhelper >=9 now. Remove lintian override.
   * Enable hardening.
   * Enable buiid-twice.
-  * Standards-Version: 3.9.4
+  * Standards-Version: 3.9.5
   * Build-Conflict: on python packages. For correct testing.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sat, 15 Jun 2013 08:57:20 +0100
diff --git a/debian/control b/debian/control
index 780a87d..c6fde1c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), dh-buildinfo, libossp-uuid-dev, libudunits2-dev, libnetcdf-dev, uuid-dev, python-all-dev (>= 2.6.6-3~), python-setuptools (>= 0.6b3), libgfortran3, automake, python-numpy, gfortran, python3-numpy, python3-all-dev, python3-setuptools
 Build-Conflicts: libcmor2, python-cmor, python3-cmor
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
 Homepage:  http://www2-pcmdi.llnl.gov/cmor
diff --git a/debian/patches/series b/debian/patches/series
index 9c48970..8c87e9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,5 @@ debug-test.patch
 ld-no-add-needed.patch
 destdir.patch
 cmor_ver.patch
-python3.patch
+# python3.patch
 silence-warning.patch

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