[SCM] Python interface for IRAF branch, debian, updated. 06e98f5713ba1df1bec41c80e0836d765f85edad

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 06e98f5713ba1df1bec41c80e0836d765f85edad
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jun 7 16:34:07 2013 +0200

    Fix compilation for python2

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..9835f63
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+required_pkgs/stsci.tools/setup.cfg.orig
diff --git a/debian/control b/debian/control
index f692abb..86522ae 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,25 @@ Source: python-pyraf
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
-Build-Depends: debhelper (>= 9),python-support,python-setuptools (>= 0.6.4),python3-setuptools (>= 0.6.4),
-Section: science
+Build-Depends: debhelper (>= 9),
+	       python,
+               python-setuptools (>= 0.6.4),
+               python-stsci.distutils (>= 0.3.2),
+               python-support,
+	       python3,
+               python3-setuptools (>= 0.6.4),
+               python3-stsci.distutils (>= 0.3.2)
+Section: python
 Standards-Version: 3.9.4
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
 Homepage: http://www.stsci.edu/institute/software_hardware/pyraf
-Vcs-Git: git://git.debian.org/git/debian-science/packages/python-pyiraf.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/python-pyraf.git
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/python-pyraf.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/python-pyraf.git
 
 Package: python-pyraf
-Architecture: Any
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, iraf
+Architecture: any
+Depends: iraf, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Description: Python interface for IRAF
  PyRAF is a command language for running IRAF [1] tasks that is based on
  the Python scripting language. It gives users the ability to run IRAF
diff --git a/debian/copyright b/debian/copyright
index 229ad20..dfabf20 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: pyraf
-Upstream-Author: Association of Universities for Research in Astronomy (AURA)
+Upstream-Author:  Rick White, Perry Greenfield
 Source: http://www.astropy.org/
 
 Files: *
@@ -19,7 +19,7 @@ License: BSD-3
  disclaimer in the documentation and/or other materials provided
  with the distribution.
  .
- 3. The name of AURA and its representatives, Michael Foord, or 
+ 3. The name of AURA and its representatives, Michael Foord, or
  the name of Voidspacemay not be used to endorse or promote products
  derived from this software without specific prior written permission.
  .
@@ -54,8 +54,8 @@ License:  Python Library License
  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-Files: required_pkgs/d2to1/d2to1/extern/six.py, lib/pyraf/cltoken.py, lib/pyraf/clast.py
-Copyright: 2010-2011 Benjamin Peterson, 
+Files: required_pkgs/d2to1/d2to1/extern/six.py lib/pyraf/cltoken.py lib/pyraf/clast.py
+Copyright: 2010-2011 Benjamin Peterson,
  1998-1999 John Aycock
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index 905f7c4..03510ce
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,11 @@ PYTHON2:=$(shell pyversions -vr)
 PYTHON3:=$(shell py3versions -vr)
 
 # Prevent setuptools/distribute from accessing the internet.
-export http_proxy = http://127.0.9.1:9
+#export http_proxy = http://127.0.9.1:9
 
 %:
-	dh $@ --with python2,python3,sphinxdoc
+	dh $@ --with python2,python3
+
+override_dh_clean:
+	dh_clean
+	rm -rf lib/pyraf.egg-info/

-- 
Python interface for IRAF