[Python-modules-commits] r13325 - in packages/pyfits/trunk/debian (7 files)

Tue Jun 8 14:45:56 UTC 2010

Date: Tuesday, June 8, 2010 @ 14:45:45
  Author: aurel32
Revision: 13325

  * Link with system zlib instead of using embedded one. 

Added:
  packages/pyfits/trunk/debian/README.source
  packages/pyfits/trunk/debian/patches/
  packages/pyfits/trunk/debian/patches/01-zlib.diff
  packages/pyfits/trunk/debian/patches/series
Modified:
  packages/pyfits/trunk/debian/changelog
  packages/pyfits/trunk/debian/control
  packages/pyfits/trunk/debian/rules

Added: packages/pyfits/trunk/debian/README.source
===================================================================

--- packages/pyfits/trunk/debian/README.source	                        (rev 0)
+++ packages/pyfits/trunk/debian/README.source	2010-06-08 14:45:45 UTC (rev 13325)
@@ -0,0 +1,58 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+                break
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.

Modified: packages/pyfits/trunk/debian/changelog
===================================================================
--- packages/pyfits/trunk/debian/changelog	2010-06-08 14:43:37 UTC (rev 13324)
+++ packages/pyfits/trunk/debian/changelog	2010-06-08 14:45:45 UTC (rev 13325)
@@ -1,9 +1,10 @@
-pyfits (1:2.3-2) unstable; urgency=low
+pyfits (1:2.3.1-1) unstable; urgency=low
 
   * New upstream version.
   * Update debian/copyright. 
+  * Link with system zlib instead of using embedded one. 
 
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 08 Jun 2010 16:09:09 +0200
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 08 Jun 2010 16:41:07 +0200
 
 pyfits (1:2.3-1) unstable; urgency=low
 

Modified: packages/pyfits/trunk/debian/control
===================================================================
--- packages/pyfits/trunk/debian/control	2010-06-08 14:43:37 UTC (rev 13324)
+++ packages/pyfits/trunk/debian/control	2010-06-08 14:45:45 UTC (rev 13325)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python-numpy, python-all-dev (>= 2.3.5-7), python-support (>= 0.3)
+Build-Depends: debhelper (>= 5.0.37.2), quilt, python-numpy, python-all-dev (>= 2.3.5-7), python-support (>= 0.3)
 Standards-Version: 3.8.4
 Homepage: http://www.stsci.edu/resources/software_hardware/pyfits
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyfits/trunk/

Added: packages/pyfits/trunk/debian/patches/01-zlib.diff
===================================================================
--- packages/pyfits/trunk/debian/patches/01-zlib.diff	                        (rev 0)
+++ packages/pyfits/trunk/debian/patches/01-zlib.diff	2010-06-08 14:45:45 UTC (rev 13325)
@@ -0,0 +1,27 @@
+--- pyfits-2.3.1.orig/defsetup.py
++++ pyfits-2.3.1/defsetup.py
+@@ -13,10 +13,9 @@
+                      ["src/compress.c", "src/fits_hcompress.c",
+                       "src/fits_hdecompress.c", "src/fitsio.c",
+                       "src/pliocomp.c", "src/pyfitsCompWrapper.c",
+-                      "src/quantize.c", "src/ricecomp.c",
+-                      "src/zlib.c", "src/inffast.c",
+-                      "src/inftrees.c", "src/trees.c"],
+-                      include_dirs = ["src", numpy.get_include()])]
++                      "src/quantize.c", "src/ricecomp.c"],
++                      include_dirs = ["src", numpy.get_include()],
++                      libraries = ["z"])]
+ 
+ except ImportError:
+     ext_modules = ''
+--- pyfits-2.3.1.orig/src/compress.c
++++ pyfits-2.3.1/src/compress.c
+@@ -106,7 +106,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include "zlib.h"  
++#include <zlib.h>  
+ 
+ int uncompress2mem_from_mem(                                                
+              char *inmemptr,     

Added: packages/pyfits/trunk/debian/patches/series
===================================================================
--- packages/pyfits/trunk/debian/patches/series	                        (rev 0)
+++ packages/pyfits/trunk/debian/patches/series	2010-06-08 14:45:45 UTC (rev 13325)
@@ -0,0 +1 @@
+01-zlib.diff

Modified: packages/pyfits/trunk/debian/rules
===================================================================
--- packages/pyfits/trunk/debian/rules	2010-06-08 14:43:37 UTC (rev 13324)
+++ packages/pyfits/trunk/debian/rules	2010-06-08 14:45:45 UTC (rev 13325)
@@ -5,7 +5,9 @@
 
 PYVERS:=$(shell pyversions -r)
 
-clean:
+include /usr/share/quilt/quilt.make
+
+clean: unpatch
 	dh_testdir
 	dh_testroot
 
@@ -13,12 +15,13 @@
 	    $$py setup.py clean --all ; \
 	done
 	rm -f *.pyc
+	rm -f lib/svn_version.py
 
 	rm -f *-stamp
 	dh_clean
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	set -e; \


