[SCM] Core functionality for performing astronomy and astrophysics with Python branch, debian, updated. 5ad32d118ca582cc119081fb813cabceb638c52d

Ole Streicher debian at liska.ath.cx
Tue Jul 10 09:22:23 UTC 2012


The following commit has been merged in the debian branch:
commit 5ad32d118ca582cc119081fb813cabceb638c52d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jul 10 11:21:47 2012 +0200

    Describe patches

diff --git a/debian/patches/force_legacy_build.patch b/debian/patches/force_legacy_build.patch
index 2511cd3..5452cf3 100644
--- a/debian/patches/force_legacy_build.patch
+++ b/debian/patches/force_legacy_build.patch
@@ -1,3 +1,9 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: The setup tries to find out whether the original of a legacy
+ package is installed. In this case, the legacy module is not built.
+ This is useless in the case of Debian packaging since the dependencies
+ are maintained by the package system. So, this mechanism is switched off
+ here.
 --- a/astropy/setup_helpers.py
 +++ b/astropy/setup_helpers.py
 @@ -723,7 +723,7 @@
diff --git a/debian/patches/unbundle_expat.patch b/debian/patches/unbundle_expat.patch
index 3be7363..b5d4ebb 100644
--- a/debian/patches/unbundle_expat.patch
+++ b/debian/patches/unbundle_expat.patch
@@ -1,3 +1,6 @@
+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 @@
diff --git a/debian/patches/unbundle_wcslib.patch b/debian/patches/unbundle_wcslib.patch
index 2ac0c7e..172ddc3 100644
--- a/debian/patches/unbundle_wcslib.patch
+++ b/debian/patches/unbundle_wcslib.patch
@@ -1,3 +1,6 @@
+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 @@
@@ -9,9 +12,8 @@
                    include_dirs=[
                        setup_helpers.get_numpy_include_path(),
 -                      wcslib_cpath,
--                      join(WCSROOT, "include")],
-+                      join(WCSROOT, "include"),
-+                      '/usr/include/wcslib'],
++                      '/usr/include/wcslib',
+                       join(WCSROOT, "include")],
                    define_macros=define_macros,
                    undef_macros=undef_macros,
                    extra_compile_args=extra_compile_args,
diff --git a/debian/patches/unbundle_zlib.patch b/debian/patches/unbundle_zlib.patch
index 9f5ee04..243f521 100644
--- a/debian/patches/unbundle_zlib.patch
+++ b/debian/patches/unbundle_zlib.patch
@@ -1,3 +1,6 @@
+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 @@

-- 
Core functionality for performing astronomy and astrophysics with Python



More information about the debian-science-commits mailing list