[SCM] Core functionality for performing astronomy and astrophysics with Python branch, debian, updated. 2d60183453ed8123379372820d44ebe120179f71
Ole Streicher
debian at liska.ath.cx
Sun Jan 6 17:57:32 UTC 2013
The following commit has been merged in the debian branch:
commit 2d60183453ed8123379372820d44ebe120179f71
Author: Ole Streicher <debian at liska.ath.cx>
Date: Sun Jan 6 18:57:04 2013 +0100
Adjust to latest beta version
diff --git a/debian/changelog b/debian/changelog
index 020ba66..b238820 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-python-astropy (0.1-1~5) precise; urgency=low
+python-astropy (0.2~b1-1) UNRELEASED; urgency=low
* Initial release. (Closes: #678168)
- -- Ole Streicher <debian at liska.ath.cx> Fri, 13 Jul 2012 15:10:00 +0200
+ -- Ole Streicher <debian at liska.ath.cx> Sun, 06 Jan 2013 18:00:00 +0100
diff --git a/debian/control b/debian/control
index 0bfe650..8fc1042 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Ole Streicher <debian at liska.ath.cx>
-DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 9),
graphviz,
libexpat1-dev,
@@ -16,7 +15,7 @@ Build-Depends: debhelper (>= 9),
python-support,
wcslib-dev (>= 4.7),
zlib1g-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://astropy.org
Vcs-Git: git://git.debian.org/git/debian-science/packages/python-astropy.git
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/python-astropy.git
diff --git a/debian/patches/fix_distribute_version.patch b/debian/patches/fix_distribute_version.patch
new file mode 100644
index 0000000..66c0047
--- /dev/null
+++ b/debian/patches/fix_distribute_version.patch
@@ -0,0 +1,13 @@
+diff --git a/distribute_setup.py b/distribute_setup.py
+index 8f5b063..bccdda5 100644
+--- a/distribute_setup.py
++++ b/distribute_setup.py
+@@ -46,7 +46,7 @@ except ImportError:
+ args = [quote(arg) for arg in args]
+ return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
+
+-DEFAULT_VERSION = "0.6.28"
++DEFAULT_VERSION = "0.6.0"
+ DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
+ SETUPTOOLS_FAKED_VERSION = "0.6c11"
+
diff --git a/debian/patches/series b/debian/patches/series
index a6c80f7..476b23d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-unbundle_expat.patch
-unbundle_wcslib.patch
-unbundle_zlib.patch
-force_legacy_build.patch
+fix_distribute_version.patch
diff --git a/debian/patches/unbundle_expat.patch b/debian/patches/unbundle_expat.patch
deleted file mode 100644
index b5d4ebb..0000000
--- a/debian/patches/unbundle_expat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Don't build the "expat" library objects, but instead link
- to the library.
---- a/astropy/utils/xml/setup_package.py
-+++ b/astropy/utils/xml/setup_package.py
-@@ -28,11 +28,7 @@
-
- return [Extension(
- "astropy.utils.xml._iterparser",
-- [join(XML_DIR, "iterparse.c"),
-- join(EXPAT_DIR, "xmlparse.c"),
-- join(EXPAT_DIR, "xmlrole.c"),
-- join(EXPAT_DIR, "xmltok.c"),
-- join(EXPAT_DIR, "xmltok_impl.c")],
-+ [join(XML_DIR, "iterparse.c")],
- define_macros=defines,
-- include_dirs=[XML_DIR, EXPAT_DIR],
-- extra_link_args=extra_link_args)]
-+ include_dirs=[XML_DIR],
-+ libraries=['expat'])]
---- a/astropy/utils/xml/src/iterparse.c
-+++ b/astropy/utils/xml/src/iterparse.c
-@@ -25,7 +25,7 @@
- #include <Python.h>
- #include "structmember.h"
-
--#include "expat.h"
-+#include <expat.h>
-
- /******************************************************************************
- * Convenience macros and functions
diff --git a/debian/patches/unbundle_wcslib.patch b/debian/patches/unbundle_wcslib.patch
deleted file mode 100644
index 172ddc3..0000000
--- a/debian/patches/unbundle_wcslib.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Don't build the "wcslib" library objects, but instead link
- to the library.
---- a/astropy/wcs/setup_package.py
-+++ b/astropy/wcs/setup_package.py
-@@ -288,16 +288,16 @@
-
- return [
- Extension('astropy.wcs._wcs',
-- wcslib_files + astropy_wcs_files,
-+ astropy_wcs_files,
- include_dirs=[
- setup_helpers.get_numpy_include_path(),
-- wcslib_cpath,
-+ '/usr/include/wcslib',
- join(WCSROOT, "include")],
- define_macros=define_macros,
- undef_macros=undef_macros,
- extra_compile_args=extra_compile_args,
- extra_link_args=extra_link_args,
-- libraries=libraries)]
-+ libraries=libraries + ['wcs', 'm'])]
-
-
- def get_package_data():
diff --git a/debian/patches/unbundle_zlib.patch b/debian/patches/unbundle_zlib.patch
deleted file mode 100644
index 243f521..0000000
--- a/debian/patches/unbundle_zlib.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Don't build the "libz" library objects, but instead link
- to the library. This is copied and adjusted from the pyfits package.
---- a/astropy/io/fits/setup_package.py
-+++ b/astropy/io/fits/setup_package.py
-@@ -17,10 +17,17 @@
- return [
- Extension(
- 'astropy.io.fits.compression',
-- [os.path.relpath(x) for x in
-- glob(os.path.join(os.path.dirname(__file__), 'src/*.c'))],
-+ [ os.path.relpath(x)
-+ for x in ( os.path.join(os.path.dirname(__file__), 'src', s)
-+ for s in ('compress.c', 'compressionmodule.c', \
-+ 'fits_hcompress.c', 'fits_hdecompress.c', \
-+ 'fitsio.c', 'pliocomp.c', 'quantize.c', \
-+ 'ricecomp.c'))
-+ ],
- include_dirs=[setup_helpers.get_numpy_include_path()],
-- extra_compile_args=extra_compile_args)
-+ extra_compile_args=extra_compile_args,
-+ libraries = ['z'])
-+
- ]
-
-
---- a/astropy/io/fits/src/compress.c
-+++ b/astropy/io/fits/src/compress.c
-@@ -106,7 +106,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include "zlib.h"
-+#include <zlib.h>
-
- int _astropy_uncompress2mem_from_mem(
- char *inmemptr,
-@@ -182,7 +182,7 @@
- d_stream.next_out = uncompr;
- d_stream.avail_out = uncomprLen;
-
-- err = _astropy_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 = _astropy_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 = _astropy_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 = _astropy_deflateEnd(&c_stream);
-+ err = deflateEnd(&c_stream);
-
- /* free temporary output data buffer */
- free(compr);
diff --git a/debian/rules b/debian/rules
index a5f0c2b..28d83d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
%:
dh $@ --with python2,sphinxdoc
+override_dh_auto_build:
+ dh_auto_build -- --use-system-libraries --enable-legacy
+
override_dh_shlibdeps:
dh_shlibdeps
dh_numpy
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..ab6bfd3
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,4 @@
+# We don't use the convinience copies of wcslib and expat, so we can
+# safely ignore their lintian warnings.
+outdated-autotools-helper-file cextern/expat/conftools/config.*
+outdated-autotools-helper-file cextern/wcslib/config/config.*
--
Core functionality for performing astronomy and astrophysics with Python
More information about the debian-science-commits
mailing list