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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit ffffe5d7b6eb3d67cb4f1e8181730587b8a5b9a7
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jul 12 13:13:18 2012 +0200

    Use .docs file for documentation specification

diff --git a/debian/control b/debian/control
index 14c9c58..ae13e3a 100644
--- a/debian/control
+++ b/debian/control
@@ -19,18 +19,6 @@ Homepage: http://astropy.org
 Vcs-Git: git://git.debian.org/git/debian-science/packages/python-astropy.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/python-astropy.git
 
-Package: python-astropy-doc
-Architecture: all
-Section: doc
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
-Description: Core functionality for performing astrophysics with Python (doc)
- The astropy package contains core functionality and some common tools 
- needed for performing astronomy and astrophysics research with Python. 
- It is expected to be extended by a number of "affilated packages" that are
- intended to work with the core package.
- .
- This package contains the package documentation.
-
 Package: python-astropy
 Architecture: any
 Depends: libexpat1,
@@ -49,6 +37,18 @@ Description: Core functionality for performing astrophysics with Python
  .
  The current release is a developer preview.
 
+Package: python-astropy-doc
+Architecture: all
+Section: doc
+Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Description: Core functionality for performing astrophysics with Python (doc)
+ The astropy package contains core functionality and some common tools 
+ needed for performing astronomy and astrophysics research with Python. 
+ It is expected to be extended by a number of "affilated packages" that are
+ intended to work with the core package.
+ .
+ This package contains the package documentation.
+
 Package: python-astropy-pywcs
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, python-astropy
diff --git a/debian/python-astropy-doc.docs b/debian/python-astropy-doc.docs
new file mode 100644
index 0000000..84b89e6
--- /dev/null
+++ b/debian/python-astropy-doc.docs
@@ -0,0 +1 @@
+ docs/_build/html
diff --git a/debian/rules b/debian/rules
index f94f964..821944d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ override_dh_shlibdeps:
 
 override_dh_installdocs:
 	python setup.py build_sphinx
-	dh_installdocs docs/_build/html
+	dh_installdocs
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
Core functionality for performing astronomy and astrophysics with Python