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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 766ac776610a0254b03f888390f992aed89fda07
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Feb 20 09:58:26 2013 +0100

    New upstream version

diff --git a/debian/changelog b/debian/changelog
index 4e378df..b1e25ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-python-astropy (0.2~rc1-1) experimental; urgency=low
+python-astropy (0.2-1) experimental; urgency=low
 
-  * Release candidate version
+  * New upstream release
 
- -- Ole Streicher <debian at liska.ath.cx>  Thu, 14 Feb 2013 08:58:56 +0100
+ -- Ole Streicher <debian at liska.ath.cx>  Wed, 20 Feb 2013 09:00:00 +0100
 
 python-astropy (0.2~b2-1) experimental; urgency=low
 
diff --git a/debian/patches/Add_default_libs.patch b/debian/patches/Add_default_libs.patch
deleted file mode 100644
index 0668a68..0000000
--- a/debian/patches/Add_default_libs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/astropy/setup_helpers.py
-+++ b/astropy/setup_helpers.py
-@@ -1318,8 +1318,17 @@
-         log.warn('\n'.join(lines))
-         libraries.extend(default_libraries)
-     else:
--        for token in output.split():
--            locals()[flag_map.get(token[:2])].append(token[2:])
-+        if pipe.returncode != 0:
-+            lines = [
-+                "pkg-config could not lookup up package(s) {0}.".format(
-+                    ", ".join(packages)),
-+                "This may cause the build to fail below."
-+                ]
-+            log.warn('\n'.join(lines))
-+            libraries.extend(default_libraries)
-+        else:
-+            for token in output.split():
-+                locals()[flag_map.get(token[:2])].append(token[2:])
- 
- 
- def add_external_library(library):
diff --git a/debian/patches/fix_sphinxbuild.patch b/debian/patches/fix_sphinxbuild.patch
deleted file mode 100644
index 44f0cc5..0000000
--- a/debian/patches/fix_sphinxbuild.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix some glitches of the documentation that may prevent
- dh_pshinxdoc to succeed.
---- /dev/null
-+++ b/CHANGES.rst
-@@ -0,0 +1 @@
-+(dummy)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ab317fe..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Add_default_libs.patch
-fix_sphinxbuild.patch
diff --git a/debian/python-astropy-doc.lintian-overrides b/debian/python-astropy-doc.lintian-overrides
index 57f68b5..3005fbf 100644
--- a/debian/python-astropy-doc.lintian-overrides
+++ b/debian/python-astropy-doc.lintian-overrides
@@ -2,4 +2,4 @@
 # HTML documentation. It seems to be better to keep this file than
 # to remove these links or to link to the machine-readable Debian 
 # copyright file.
-extra-license-file usr/share/doc/python-astropy-doc/html/_sources/creditsandlicense.txt
+extra-license-file usr/share/doc/python-astropy-doc/html/_sources/license.txt

-- 
Core functionality for performing astronomy and astrophysics with Python