[python-astropy] 02/02: Remove astropy-helper and use external dependency.

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository python-astropy.

commit 0a0cbde5b68a2b567ce8d968d84433608b76e901
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Sep 15 19:33:06 2014 +0200

    Remove astropy-helper and use external dependency.
---
 debian/changelog | 4 ++--
 debian/copyright | 3 +--
 debian/watch     | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be480e5..d15f2cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-python-astropy (0.4.1+dfsg-2) unstable; urgency=low
+python-astropy (0.4.1+dfsg2-1) unstable; urgency=low
 
-  * Disable astropy helper. Closes: #761055
+  * Remove astropy-helper and use external dependency. Closes: #761055
   * Support numpy 1.9. Closes: #761392
   * Update uploaders email address
 
diff --git a/debian/copyright b/debian/copyright
index e0e66f3..e8c028b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: astropy
 Upstream-Author: The Astropy Developers
 Source: http://www.astropy.org/
-Files-Excluded: astropy_helpers/astropy_helpers/__pycache__/*
- astropy_helpers/astropy_helpers/compat/__pycache__/*
+Files-Excluded: astropy_helpers/*
 
 Files: * astropy/io/fits/*
  astropy/sphinx/ext/compiler_unparse.py astropy/sphinx/ext/comment_eater.py
diff --git a/debian/watch b/debian/watch
index 01a2975..3dddcaf 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 # watch control file for uscan
 version=3
 opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
-dversionmangle=s/\+dfsg// \
+dversionmangle=s/\+dfsg\d*// \
 http://pypi.python.org/packages/source/a/astropy/astropy-([0-9].*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) debian uupdate

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-astropy.git