[Python-modules-commits] r22094 - in packages/pyfits/trunk/debian (2 files)

[aurel32 at users.alioth.debian.org]

    Date: Thursday, June 7, 2012 @ 19:55:07
  Author: aurel32
Revision: 22094

Modified:
  packages/pyfits/trunk/debian/changelog
  packages/pyfits/trunk/debian/patches/01-zlib.diff

Modified: packages/pyfits/trunk/debian/changelog
===================================================================
--- packages/pyfits/trunk/debian/changelog	2012-06-07 18:06:24 UTC (rev 22093)
+++ packages/pyfits/trunk/debian/changelog	2012-06-07 19:55:07 UTC (rev 22094)
@@ -1,3 +1,10 @@
+pyfits (1:3.0.8-1) unstable; urgency=low
+
+  * New upstream version. 
+  * Fix the compression library. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 07 Jun 2012 21:39:08 +0200
+
 pyfits (1:3.0.7-2) unstable; urgency=medium
 
   * Add a Python3 package.

Modified: packages/pyfits/trunk/debian/patches/01-zlib.diff
===================================================================
--- packages/pyfits/trunk/debian/patches/01-zlib.diff	2012-06-07 18:06:24 UTC (rev 22093)
+++ packages/pyfits/trunk/debian/patches/01-zlib.diff	2012-06-07 19:55:07 UTC (rev 22094)
@@ -1,7 +1,7 @@
 ---
  setup.cfg      |    5 +----
- src/compress.c |    2 +-
- 2 files changed, 2 insertions(+), 5 deletions(-)
+ src/compress.c |   10 +++++-----
+ 2 files changed, 6 insertions(+), 9 deletions(-)
 
 --- a/setup.cfg
 +++ b/setup.cfg
@@ -32,3 +32,39 @@
  
  int _pyfits_uncompress2mem_from_mem(
               char *inmemptr,     
+@@ -182,7 +182,7 @@
+         d_stream.next_out = uncompr;
+         d_stream.avail_out = uncomprLen;
+ 
+-        err = _pyfits_inflate(&d_stream, Z_NO_FLUSH);
++        err = inflate(&d_stream, Z_NO_FLUSH);
+ 
+         if (err != Z_OK && err != Z_STREAM_END)
+         {
+@@ -217,7 +217,7 @@
+     *filesize = d_stream.total_out;
+ 
+     /* End the decompression */
+-    err = _pyfits_inflateEnd(&d_stream);
++    err = inflateEnd(&d_stream);
+ 
+     /* free temporary output data buffer */
+     free(uncompr);
+@@ -285,7 +285,7 @@
+         c_stream.next_out = compr;
+         c_stream.avail_out = comprLen;
+ 
+-        err = _pyfits_deflate(&c_stream, Z_FINISH);
++        err = deflate(&c_stream, Z_FINISH);
+ 
+         if (err != Z_OK && err != Z_STREAM_END)
+         {
+@@ -320,7 +320,7 @@
+     *filesize = c_stream.total_out;
+ 
+     /* End the compression */
+-    err = _pyfits_deflateEnd(&c_stream);
++    err = deflateEnd(&c_stream);
+ 
+     /* free temporary output data buffer */
+     free(compr);