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

Ole Streicher debian at liska.ath.cx
Thu Apr 4 08:13:38 UTC 2013


The following commit has been merged in the debian branch:
commit 92a5f1d3bb15112b030957c8e753cd1343eabe0b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Apr 4 10:13:25 2013 +0200

    Adopt 0.2.1 for Debian

diff --git a/debian/changelog b/debian/changelog
index e401243..0e6ec1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-python-astropy (0.2-1) unstable; urgency=low
+python-astropy (0.2.1-1) unstable; urgency=low
 
   * New upstream release
   * Build python3 packages
 
- -- Ole Streicher <debian at liska.ath.cx>  Thu, 21 Feb 2013 09:18:00 +0100
+ -- Ole Streicher <debian at liska.ath.cx>  Thu, 04 Apr 2013 10:10:00 +0200
 
 python-astropy (0.2~b2-1) experimental; urgency=low
 
diff --git a/debian/patches/fix_python3.patch b/debian/patches/fix_python3.patch
deleted file mode 100644
index f95ae09..0000000
--- a/debian/patches/fix_python3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix FTBS to build python3 package
-Bug: https://github.com/astropy/astropy/issues/799
---- a/astropy/setup_helpers.py
-+++ b/astropy/setup_helpers.py
-@@ -1307,7 +1307,7 @@ def pkg_config(packages, default_libraries, include_dirs, library_dirs,
- 
-     try:
-         pipe = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
--        output = pipe.communicate()[0].strip()
-+        output = pipe.communicate()[0].strip().decode()
-     except subprocess.CalledProcessError as e:
-         lines = [
-             "pkg-config failed.  This may cause the build to fail below.",
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 01c09fc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_python3.patch

-- 
Core functionality for performing astronomy and astrophysics with Python



More information about the debian-science-commits mailing list