[Python-modules-commits] r3969 - in packages/numpy/trunk/debian (6 files)

kumanna-guest at users.alioth.debian.org kumanna-guest at users.alioth.debian.org
Mon Dec 17 07:44:42 UTC 2007 

    Date: Monday, December 17, 2007 @ 07:44:41
  Author: kumanna-guest
Revision: 3969

Revert to CDBS rules file.

Added:
  packages/numpy/trunk/debian/dirs
Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/control
  packages/numpy/trunk/debian/python-numpy.install
  packages/numpy/trunk/debian/rules
Deleted:
  packages/numpy/trunk/debian/python-numpy.docs

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2007-12-16 20:24:47 UTC (rev 3968)
+++ packages/numpy/trunk/debian/changelog	2007-12-17 07:44:41 UTC (rev 3969)
@@ -12,16 +12,6 @@
 
   [ Ondrej Certik ]
   * debian/pycompat removed
-
-  [ Kumar Appaiah ]
-  * debian/rules:
-    + Modify not to use CDBS.
-    + Use quilt for patches.
-  * debian/control:
-    + Don't Build-Depend on CDBS.
-    + Build-Depend on quilt.
-  * debian/python-numpy.docs:
-    + Install DEV_README.txt THANKS.txt using dh_installdocs.
   
  -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Thu, 06 Dec 2007 09:10:41 +0530
 

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2007-12-16 20:24:47 UTC (rev 3968)
+++ packages/numpy/trunk/debian/control	2007-12-17 07:44:41 UTC (rev 3969)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Marco Presi (Zufus) <zufus at debian.org>, Alexandre Fayolle <afayolle at debian.org>, José Fonseca <j_r_fonseca at yahoo.co.uk>, Matthias Klose <doko at debian.org>, Ondrej Certik <ondrej at certik.cz>, Kumar Appaiah <akumar at ee.iitm.ac.in>
-Build-Depends: python-all-dev, python-all-dbg, python-support, refblas3-dev [!arm !m68k], lapack3-dev [!arm !m68k], debhelper (>= 5.0.38), g77, patchutils, python-docutils, fftw3-dev, quilt
+Build-Depends: python-all-dev, python-all-dbg, python-support, refblas3-dev [!arm !m68k], lapack3-dev [!arm !m68k], debhelper (>= 5.0.38), g77, patchutils, python-docutils, fftw3-dev, cdbs
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/numpy/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/numpy/trunk/

Added: packages/numpy/trunk/debian/dirs
===================================================================
--- packages/numpy/trunk/debian/dirs	                        (rev 0)
+++ packages/numpy/trunk/debian/dirs	2007-12-17 07:44:41 UTC (rev 3969)
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/doc

Deleted: packages/numpy/trunk/debian/python-numpy.docs
===================================================================
--- packages/numpy/trunk/debian/python-numpy.docs	2007-12-16 20:24:47 UTC (rev 3968)
+++ packages/numpy/trunk/debian/python-numpy.docs	2007-12-17 07:44:41 UTC (rev 3969)
@@ -1,2 +0,0 @@
-DEV_README.txt
-THANKS.txt

Modified: packages/numpy/trunk/debian/python-numpy.install
===================================================================
--- packages/numpy/trunk/debian/python-numpy.install	2007-12-16 20:24:47 UTC (rev 3968)
+++ packages/numpy/trunk/debian/python-numpy.install	2007-12-17 07:44:41 UTC (rev 3969)
@@ -11,4 +11,3 @@
 usr/bin/f2py*
 usr/lib/python*/site-packages/numpy/f2py/*.py
 usr/lib/python*/site-packages/numpy/f2py/src
-usr/share/man/man1/f2py*

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2007-12-16 20:24:47 UTC (rev 3968)
+++ packages/numpy/trunk/debian/rules	2007-12-17 07:44:41 UTC (rev 3969)
@@ -1,55 +1,49 @@
 #!/usr/bin/make -f
+# Sample debian/rules that uses cdbs.  Originaly written by Robert Millan.
+# This file is public domain.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+DEB_AUTO_CLEANUP_RCS		:= yes
 
-include /usr/share/quilt/quilt.make
+DEB_PYTHON_SYSTEM=pysupport
+PYVERS=$(shell pyversions -vr debian/control)
 
-# The versions of python currently supported
-PYVERS = $(shell pyversions -vr debian/control)
+DEB_MAKE_CLEAN_TARGET	 := clean
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
-build-common: build-common-stamp
-build-common-stamp:
-	dh_testdir
-	touch $@
+DEB_DESTDIR=$(CURDIR)/debian/tmp
 
-build: build-common build-stamp
-build-stamp: patch $(PYVERS:%=build-python%)
-	touch $@
+DEB_INSTALL_MANPAGES_python-f2py  := numpy/f2py/f2py.1
+DEB_INSTALL_DOCS_python-numpy := DEV_README.txt THANKS.txt
 
-build-python%:
-	python$* setup.py build
+DEB_PYTHON_PACKAGES_EXCLUDE=python-numpy-dbg
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f *-stamp
-	rm -rf compile build
-	find -name '*.py[co]' -exec rm -f {} \;
-	dh_clean
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-install: build install-prereq $(PYVERS:%=install-python%)
-	[ ! -f ./debian/tmp/usr/bin/f2py`pyversions -vd` ] || mv ./debian/tmp/usr/bin/f2py`pyversions -vd` ./debian/tmp/usr/bin/f2py
-	mv debian/tmp/usr/bin/f2py debian/tmp/f2py`pyversions -vd`
-	(cd debian/tmp/usr/bin;ln -s f2py`pyversions -vd` f2py)
+clean::
+	-rm -rf `find -name build -type d`
+	-rm -rf `find . -name "*.pyc" -type f`
 
+install/python-numpy::
+	: # Adding documentation
+	install -d $(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy
+	cp -r $(DEB_DESTDIR)/usr/lib/python$(cdbs_python_current_version)/site-packages/numpy/doc/* \
+		$(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy/
+	cp $(DEB_DESTDIR)/usr/lib/python$(cdbs_python_current_version)/site-packages/numpy/doc/README.txt \
+		$(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy/README.doc.txt
 
-install-prereq:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-install-python%:
-	python$* setup.py install --root `pwd`/debian/tmp
-	find debian/tmp -name '*.py[co]' -exec rm -f {} \;
-
 	: # Adding links to manpages
-	mkdir -p debian/tmp/usr/share/man/man1
+	mkdir -p debian/python-numpy/usr/share/man/man1
 	for v in $(PYVERS); do \
-	  ln -sf f2py.1 debian/tmp/usr/share/man/man1/f2py$$v.1; \
-	  ln -sf f2py.1 debian/tmp/usr/share/man/man1/f2py$$v-dbg.1; \
+	  ln -sf f2py.1 debian/python-numpy/usr/share/man/man1/f2py$$v.1; \
+	  ln -sf f2py.1 debian/python-numpy/usr/share/man/man1/f2py$$v-dbg.1; \
 	done
 
+	: # Add unversioned numpy script
+	mv $(DEB_DESTDIR)/usr/bin/f2py $(DEB_DESTDIR)/usr/bin/f2py$(cdbs_python_current_version)
+	ln -s f2py$(cdbs_python_current_version) debian/python-numpy/usr/bin/f2py
+
 	: # Make Python scripts executable
 	for i in `find debian/tmp -type f`; do \
 	  sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
@@ -62,34 +56,30 @@
 	    echo "fixed interpreter: $$i"; \
 	  fi; \
 	done
-	mkdir -p debian/python-numpy/usr/share/man/man1
-	for v in $(PYVERS); do \
-	  ln -sf f2py.1 debian/python-numpy/usr/share/man/man1/f2py$$v.1; \
-	  ln -sf f2py.1 debian/python-numpy/usr/share/man/man1/f2py$$v-dbg.1; \
-	done
 
-binary-indep: build install
+binary-install/python-numpy-doc::
+	rst2html numpy/f2py/docs/usersguide/index.txt > $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/index.html
+	cp -r $(CURDIR)/numpy/f2py/docs/* $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)
+	chmod -x $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/usersguide/setup_example.py
 
-# Build architecture-dependent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
-binary-arch: build install
-	dh_testdir -i -a
-	dh_testroot -i -a
-	dh_installdocs -i -a
-	dh_install --sourcedir=debian/tmp -i -a
-	dh_installman -a
-	dh_installexamples -i -a
-	dh_installchangelogs -i -a
-	dh_pysupport -i -a
-	dh_link -i -a
-	dh_strip -a --dbg-package=python-numpy-dbg
-	dh_compress -i -X.py -a
-	dh_fixperms -i -X.py -a
-	dh_makeshlibs -a
-	dh_installdeb -i -a
-	dh_gencontrol -i -a
-	dh_md5sums -i -a
-	dh_builddeb -i -a
+binary-fixup/python-numpy-ext::
+	dh_pysupport -p$(cdbs_curpkg)
+	dh_python -p$(cdbs_curpkg)
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+build/python-numpy-dbg::
+	set -e; \
+	for i in $(cdbs_python_build_versions); do \
+	  python$$i-dbg ./setup.py build; \
+	done
+
+install/python-numpy-dbg::
+	for i in $(cdbs_python_build_versions); do \
+	  python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-numpy-dbg; \
+	done
+	find debian/python-numpy-dbg \
+		! -type d ! -name '*_d.so' | xargs rm -f
+	find debian/python-numpy-dbg -depth -empty -exec rmdir {} \;
+
+binary-predeb/python-numpy-dbg::
+	rm -rf debian/python-numpy-dbg/usr/share/doc/python-numpy-dbg
+	ln -s python-numpy debian/python-numpy-dbg/usr/share/doc/python-numpy-dbg

More information about the Python-modules-commits mailing list