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

Ole Streicher debian at liska.ath.cx
Wed Jan 30 09:23:16 UTC 2013


The following commit has been merged in the debian branch:
commit 57a4393298eeceee62fce38b736afa7917e0fbfa
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jan 30 10:23:10 2013 +0100

    Update Debian files for new test release

diff --git a/debian/changelog b/debian/changelog
index b238820..1d09886 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-python-astropy (0.2~b1-1) UNRELEASED; urgency=low
+python-astropy (0.2~b2-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #678168)
 
- -- Ole Streicher <debian at liska.ath.cx>  Sun, 06 Jan 2013 18:00:00 +0100
+ -- Ole Streicher <debian at liska.ath.cx>  Wed, 30 Jan 2013 10:00:00 +0100
diff --git a/debian/clean b/debian/clean
index 7213139..534e4e1 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,4 @@
+astropy/astropy.cfg
 astropy/cython_version.py
 astropy/nddata/convolution/boundary_extend.c
 astropy/nddata/convolution/boundary_fill.c
diff --git a/debian/patches/fix_distribute_version.patch b/debian/patches/fix_distribute_version.patch
deleted file mode 100644
index 66c0047..0000000
--- a/debian/patches/fix_distribute_version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 476b23d..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-fix_distribute_version.patch
diff --git a/debian/rules b/debian/rules
index d5ee3da..90afdd0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 	dh $@ --with python2,sphinxdoc
 
 override_dh_auto_build:
-	dh_auto_build -- --use-system-libraries --use-system-distribute --enable-legacy
+	dh_auto_build -- --use-system-libraries --enable-legacy
 
 override_dh_shlibdeps:
 	dh_shlibdeps

-- 
Core functionality for performing astronomy and astrophysics with Python



More information about the debian-science-commits mailing list