[Python-modules-commits] r2729 - in /packages/pyfits: branches/1.1/ trunk/debian/changelog trunk/debian/control trunk/debian/rules

[aurel32 at users.alioth.debian.org]

Author: aurel32
Date: Sat Jul 14 07:43:44 2007
New Revision: 2729

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2729
Log:
Merge 1.1 branch into trunk

Removed:
    packages/pyfits/branches/1.1/
Modified:
    packages/pyfits/trunk/debian/changelog
    packages/pyfits/trunk/debian/control
    packages/pyfits/trunk/debian/rules

Modified: packages/pyfits/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/pyfits/trunk/debian/changelog?rev=2729&op=diff
==============================================================================
--- packages/pyfits/trunk/debian/changelog (original)
+++ packages/pyfits/trunk/debian/changelog Sat Jul 14 07:43:44 2007
@@ -1,14 +1,33 @@
-pyfits (1.0.1-8) UNRELEASED; urgency=low
+pyfits (1.1rc1-1) experimental; urgency=low
 
-  * Added XS-Vcs-Svn field
+  * New upstream version. 
 
- -- Piotr Ozarowski <ozarow at gmail.com>  Thu, 23 Nov 2006 14:44:49 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 12 Apr 2007 16:32:45 +0200
 
-pyfits (1.0.1-7) unstable; urgency=low
+pyfits (1.1b3-1) experimental; urgency=low
+
+  * New upstream version. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 10 Dec 2006 20:15:31 +0100
+
+pyfits (1.1b2-3) experimental; urgency=low
+
+  * Fix a fixed path in debian/rules causing a FTBFS.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 29 Aug 2006 22:44:18 +0200
+
+pyfits (1.1b2-2) experimental; urgency=low
 
   * Correctly use dh_pysupport. 
 
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 23 Jul 2006 13:20:55 +0200
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 23 Jul 2006 14:39:39 +0200
+
+pyfits (1.1b2-1) experimental; urgency=low
+
+  * Upload to experimental.
+  * New beta version supporting both numpy and numarray.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 22 Jul 2006 23:04:53 +0200
 
 pyfits (1.0.1-6) unstable; urgency=low
 

Modified: packages/pyfits/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/pyfits/trunk/debian/control?rev=2729&op=diff
==============================================================================
--- packages/pyfits/trunk/debian/control (original)
+++ packages/pyfits/trunk/debian/control Sat Jul 14 07:43:44 2007
@@ -4,13 +4,12 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>
 Build-Depends: debhelper (>= 5.0.37.2), python-dev (>= 2.3.5-7)
-Build-Depends-Indep: python-support (>= 0.3), tetex-bin
+Build-Depends-Indep: python-support (>= 0.3)
 Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyfits/trunk/
 
 Package: python-pyfits
 Architecture: all
-Depends: ${python:Depends}, python-numarray
+Depends: ${python:Depends}, python-numarray, python-numpy
 XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
 Description: Python module for reading, writing, and manipulating FITS files
@@ -22,18 +21,4 @@
  .
   Homepage: http://www.stsci.edu/resources/software_hardware/pyfits
 
-Package: python-pyfits-doc
-Section: doc
-Architecture: all
-Suggests: python-pyfits
-Description: Documentation for PyFITS
- FITS (Flexible Image Transport System) is a data format most used in
- astronomy. PyFITS is a Python module for reading, writing, and manipulating
- FITS files. The module uses Python's object-oriented features to provide quick, 
- easy, and efficient access to FITS files. The use of Python's array syntax 
- enables immediate access to any FITS extension, header cards, or data items.
- .
- This package holds the documentation for PyFITS.
- .
-  Homepage: http://www.stsci.edu/resources/software_hardware/pyfits
 

Modified: packages/pyfits/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/pyfits/trunk/debian/rules?rev=2729&op=diff
==============================================================================
--- packages/pyfits/trunk/debian/rules (original)
+++ packages/pyfits/trunk/debian/rules Sat Jul 14 07:43:44 2007
@@ -6,20 +6,14 @@
 clean:
 	dh_testdir
 	dh_testroot
-
 	python setup.py clean --all
-	rm -f docs/PyFITS.{pdf,aux,log}
-	
 	rm -f build-stamp
 	dh_clean
 
 build: build-stamp
 build-stamp:
 	dh_testdir
-	python setup.py build	
-	cd docs && \
-		pdflatex PyFITS.tex
-
+	python setup.py build
 	touch build-stamp
 
 binary-indep: build
@@ -33,9 +27,8 @@
 	dh_installdocs
 	dh_installexamples
 
-	find $(CURDIR)/debian/python-pyfits/ -name "*.py" -exec chmod +x {} \;
+	find $(CURDIR)/debian/python-pyfits/ -name "*_pyfits.py" -exec chmod +x {} \;
 
-#	dh_installinit
 	dh_installman
 	dh_installchangelogs debian/CHANGES
 	dh_link
@@ -43,7 +36,6 @@
 	dh_compress -X.py -X.fits
 	dh_fixperms
 	dh_pysupport
-	dh_python
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol