[Python-modules-commits] r29913 - in packages/pyfits/trunk/debian (9 files)

aurel32 at users.alioth.debian.org aurel32 at users.alioth.debian.org
Fri Jul 25 18:42:35 UTC 2014 

    Date: Friday, July 25, 2014 @ 18:42:35
  Author: aurel32
Revision: 29913

Rewrite debian/rules using dh.

Added:
  packages/pyfits/trunk/debian/python-pyfits.install
  packages/pyfits/trunk/debian/python3-pyfits.install
Modified:
  packages/pyfits/trunk/debian/changelog
  packages/pyfits/trunk/debian/compat
  packages/pyfits/trunk/debian/control
  packages/pyfits/trunk/debian/pyfits-utils.install
  packages/pyfits/trunk/debian/rules
Deleted:
  packages/pyfits/trunk/debian/examples
  packages/pyfits/trunk/debian/pyfits-utils.dir

Modified: packages/pyfits/trunk/debian/changelog
===================================================================
--- packages/pyfits/trunk/debian/changelog	2014-07-25 18:42:26 UTC (rev 29912)
+++ packages/pyfits/trunk/debian/changelog	2014-07-25 18:42:35 UTC (rev 29913)
@@ -1,6 +1,7 @@
 pyfits (1:3.3-1) UNRELEASED; urgency=medium
 
   * New upstream version.
+  * Rewrite debian/rules using dh.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Fri, 25 Jul 2014 11:34:23 +0200
 

Modified: packages/pyfits/trunk/debian/compat
===================================================================
--- packages/pyfits/trunk/debian/compat	2014-07-25 18:42:26 UTC (rev 29912)
+++ packages/pyfits/trunk/debian/compat	2014-07-25 18:42:35 UTC (rev 29913)
@@ -1 +1 @@
-5
+9

Modified: packages/pyfits/trunk/debian/control
===================================================================
--- packages/pyfits/trunk/debian/control	2014-07-25 18:42:26 UTC (rev 29912)
+++ packages/pyfits/trunk/debian/control	2014-07-25 18:42:35 UTC (rev 29913)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), libcfitsio3-dev, python-all-dev (>= 2.6.6-3~), python-setuptools, python-d2to1, python-stsci.distutils, python-numpy, python3-all-dev (>= 3.1.2-6~), python3-setuptools, python3-d2to1, python3-stsci.distutils, python3-numpy
+Build-Depends: debhelper (>= 9), libcfitsio3-dev, python-all-dev (>= 2.6.6-3~), python-setuptools, python-d2to1, python-stsci.distutils, python-numpy, python-nose, python3-all-dev (>= 3.1.2-6~), python3-setuptools, python3-d2to1, python3-stsci.distutils, python3-numpy, python3-nose
 X-Python-Version: >= 2.5
 X-Python3-Version: >= 3.0
 Standards-Version: 3.9.5
@@ -13,7 +13,7 @@
 
 Package: python-pyfits
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 Suggests: pyfits-utils
 Description: Python module for reading, writing, and manipulating FITS files
@@ -28,7 +28,7 @@
 
 Package: python3-pyfits
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}
 Provides: ${python3:Provides}
 Suggests: pyfits-utils
 Description: Python3 module for reading, writing, and manipulating FITS files
@@ -60,7 +60,7 @@
 
 Package: pyfits-utils
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-pyfits
+Depends: ${python:Depends}, ${misc:Depends}, python-pyfits
 Breaks: python-pyfits (<< 1:3.0.7-2~), fitscheck (<< 1:3.1.2-1~)
 Replaces: python-pyfits (<< 1:3.0.7-2~), fitscheck (<< 1:3.1.2-1~)
 Description: script to detect and fix FITS standards violations

Deleted: packages/pyfits/trunk/debian/examples
===================================================================
--- packages/pyfits/trunk/debian/examples	2014-07-25 18:42:26 UTC (rev 29912)
+++ packages/pyfits/trunk/debian/examples	2014-07-25 18:42:35 UTC (rev 29913)
@@ -1 +0,0 @@
-test/*

Deleted: packages/pyfits/trunk/debian/pyfits-utils.dir
===================================================================
--- packages/pyfits/trunk/debian/pyfits-utils.dir	2014-07-25 18:42:26 UTC (rev 29912)
+++ packages/pyfits/trunk/debian/pyfits-utils.dir	2014-07-25 18:42:35 UTC (rev 29913)
@@ -1 +0,0 @@
-usr/bin

Modified: packages/pyfits/trunk/debian/pyfits-utils.install
===================================================================
--- packages/pyfits/trunk/debian/pyfits-utils.install	2014-07-25 18:42:26 UTC (rev 29912)
+++ packages/pyfits/trunk/debian/pyfits-utils.install	2014-07-25 18:42:35 UTC (rev 29913)
@@ -1,2 +1 @@
-scripts/fitscheck usr/bin
-scripts/fitsdiff usr/bin
+usr/bin

Added: packages/pyfits/trunk/debian/python-pyfits.install
===================================================================
--- packages/pyfits/trunk/debian/python-pyfits.install	                        (rev 0)
+++ packages/pyfits/trunk/debian/python-pyfits.install	2014-07-25 18:42:35 UTC (rev 29913)
@@ -0,0 +1 @@
+usr/lib/python2.*

Added: packages/pyfits/trunk/debian/python3-pyfits.install
===================================================================
--- packages/pyfits/trunk/debian/python3-pyfits.install	                        (rev 0)
+++ packages/pyfits/trunk/debian/python3-pyfits.install	2014-07-25 18:42:35 UTC (rev 29913)
@@ -0,0 +1,2 @@
+usr/lib/python3.*
+

Modified: packages/pyfits/trunk/debian/rules
===================================================================
--- packages/pyfits/trunk/debian/rules	2014-07-25 18:42:26 UTC (rev 29912)
+++ packages/pyfits/trunk/debian/rules	2014-07-25 18:42:35 UTC (rev 29913)
@@ -1,118 +1,23 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@ --with python2,python3 --buildsystem=pybuild --parallel 
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# Get flags from dpkg-buildflags
-CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS   := $(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
-
-PYVERS   := $(shell pyversions -r)
-PY3VERS  := $(shell py3versions -r)
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	for py in $(PYVERS) $(PY3VERS); do \
-	    $$py setup.py clean --all ; \
-	done
-	rm -f *.pyc
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -f lib/pyfits/version.py
 	rm -rf lib/pyfits.egg-info
 
-	rm -f *-stamp
-	dh_clean
+override_dh_auto_install:
+	dh_auto_install
 
-build: build-arch build-indep
+	# We overwrite the installed version as we want version
+	# independent scripts
+	install -d -m 755 $(CURDIR)/debian/tmp/usr/bin
+	install -m 755 scripts/fitscheck $(CURDIR)/debian/tmp/usr/bin
+	install -m 755 scripts/fitsdiff $(CURDIR)/debian/tmp/usr/bin
+	
+	# The dh sequencer does not call dh_numpy
+	dh_numpy
+	dh_numpy3
 
-build-arch: build-arch-stamp
-build-arch-stamp:
-	dh_testdir
-
-	set -e; \
-	for py in $(PYVERS) $(PY3VERS); do \
-	    LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"  \
-	        $$py setup.py build ; \
-	done
-
-	touch $@
-
-# We have nothing to do by default.
-build-indep:
-
-install: install-stamp
-install-stamp: build-arch
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_install --sourcedir=$(CURDIR)
-
-	# Python2 version
-	set -e; \
-	for py in $(PYVERS); do \
-	    $$py setup.py install --prefix=/usr \
-				  --root=$(CURDIR)/debian/python-pyfits \
-				  --install-layout=deb ; \
-	    rm -rf $(CURDIR)/debian/python-pyfits/usr/bin ; \
-	done
-
-	# Python3 version
-	set -e; \
-	for py in $(PY3VERS); do \
-	    $$py setup.py install --prefix=/usr \
-				  --root=$(CURDIR)/debian/python3-pyfits \
-				  --install-layout=deb ; \
-	    rm -rf $(CURDIR)/debian/python3-pyfits/usr/bin ; \
-	done
-
-	touch $@
-
-# Build architecture-independent files here.
-binary-indep: build-indep install
-	dh_testdir
-	dh_testroot
-	dh_installdocs -i
-	dh_installman -i
-	dh_installexamples -i
-	dh_installchangelogs -i CHANGES.txt
-	dh_python2 -i
-	dh_numpy -i
-	dh_link -i
-	dh_strip -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build-arch install
-	dh_testdir
-	dh_testroot
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installchangelogs -a CHANGES.txt
-	dh_python2 -a
-	dh_numpy -a
-	dh_python3 -a
-	dh_numpy3 -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a -X.py
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install
-

More information about the Python-modules-commits mailing list