[Python-modules-commits] r23667 - in packages/gamera/trunk/debian (4 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Wed Mar 6 22:08:52 UTC 2013
Date: Wednesday, March 6, 2013 @ 22:08:51
Author: jwilk
Revision: 23667
Rewrite debian/rules without using dh; install *.egg-info.
Modified:
packages/gamera/trunk/debian/changelog
packages/gamera/trunk/debian/control
packages/gamera/trunk/debian/python-gamera.install
packages/gamera/trunk/debian/rules
Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog 2013-03-06 21:50:30 UTC (rev 23666)
+++ packages/gamera/trunk/debian/changelog 2013-03-06 22:08:51 UTC (rev 23667)
@@ -10,10 +10,11 @@
* Bump standards version to 3.9.4 (no changes needed).
* Add patch to fix spelling mistakes.
(fix-typos.diff)
- * Don't run dh_auto_clean; remove *.pyc files manually (which was the only
- thing it did that wasn't done by other means) instead.
+ * Rewrite debian/rules without using dh.
+ + Reduce minimum required debhelper version to 7.
+ * Install *.egg-info into the binary package.
- -- Jakub Wilk <jwilk at debian.org> Tue, 26 Feb 2013 20:45:14 +0100
+ -- Jakub Wilk <jwilk at debian.org> Wed, 06 Mar 2013 22:54:39 +0100
gamera (3.3.3-2) unstable; urgency=low
Modified: packages/gamera/trunk/debian/control
===================================================================
--- packages/gamera/trunk/debian/control 2013-03-06 21:50:30 UTC (rev 23666)
+++ packages/gamera/trunk/debian/control 2013-03-06 22:08:51 UTC (rev 23667)
@@ -5,7 +5,7 @@
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Vcs-Svn: svn://svn.debian.org/python-modules/packages/gamera/trunk
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/gamera/trunk/
-Build-Depends: debhelper (>= 7.3.5~), dpkg-dev (>= 1.15.7~),
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.15.7~),
python-support (>= 0.90),
python-all-dev (>= 2.5), python-all-dbg (>= 2.5),
python-nose, procps, python-docutils, python-pygments,
Modified: packages/gamera/trunk/debian/python-gamera.install
===================================================================
--- packages/gamera/trunk/debian/python-gamera.install 2013-03-06 21:50:30 UTC (rev 23666)
+++ packages/gamera/trunk/debian/python-gamera.install 2013-03-06 22:08:51 UTC (rev 23667)
@@ -1,9 +1,10 @@
usr/lib/python*/*-packages/gamera/gui/__init__.py
usr/lib/python*/*-packages/gamera/gui/has_gui.py
-usr/lib/python*/*-packages/gamera/backport/config.py
+usr/lib/python*/*-packages/gamera/backport/
usr/lib/python*/*-packages/gamera/plugins/*[a-z][a-z].so
usr/lib/python*/*-packages/gamera/plugins/*.py
usr/lib/python*/*-packages/gamera/toolkits/
usr/lib/python*/*-packages/gamera/*[a-z][a-z].so
usr/lib/python*/*-packages/gamera/*.py
usr/lib/python*/*-packages/gamera/test/* usr/share/gamera/test/
+usr/lib/python*/*-packages/*.egg-info
Modified: packages/gamera/trunk/debian/rules
===================================================================
--- packages/gamera/trunk/debian/rules 2013-03-06 21:50:30 UTC (rev 23666)
+++ packages/gamera/trunk/debian/rules 2013-03-06 22:08:51 UTC (rev 23667)
@@ -7,12 +7,12 @@
export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
-ifneq ($(filter parallel=%,$(DEB_BUILD_OPTIONS)),)
- makeflags = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
+nproc = $(or $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))),1)
+python2 = $(shell pyversions -r)
+python2d = $(addsuffix -dbg,$(python2))
+python_all = $(python2) $(python2d)
+loop = echo -n $(1) | xargs -d ' ' -t -I {} env {}
-python_all = pyversions -r | tr ' ' '\n' | sed -e 'p; s/$$/-dbg/' | xargs -t -I {} env {}
-
pythonpath = $$(_py_=$(strip $(1)); _py_=$${_py_\#python}; ls -d $(CURDIR)/build/lib.*-$${_py_})
default_pythonpath = $(call pythonpath,$(shell pyversions -d))
@@ -23,89 +23,87 @@
# build and build-* targets
# =========================
-.PHONY: build build-arch build-indep
+.PHONY: build
build: build-arch build-indep
-build-arch:
- dh build
+.PHONY: build-arch
+build-arch: build/build-stamp
-build-indep:
- # Nothing to do in build-indep, "thanks" to bug #374029.
+build/build-stamp:
+ $(MAKE) -f debian/rules -j$(nproc) $(addprefix build/build-stamp-,$(python_all))
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+ $(call loop, $(python_all)) debian/run-tests.py
+endif
+ touch $(@)
-.PHONY: override_dh_auto_build
-override_dh_auto_build:
+build/cruft-stamp:
+ dh_testdir
rm -Rf include/zlib*/ src/zlib*/ src/libpng*/ src/libtiff*/
rm -Rf include/vigra/
rm -Rf src/ga/
- $(MAKE) -f debian/rules $(makeflags) build/stamp
-
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
-ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
- $(python_all) debian/run-tests.py
-endif
-
-build/stamp: $(patsubst %,build/stamp-python%,$(shell pyversions -rv))
-build/stamp: $(patsubst %,build/stamp-python%-dbg,$(shell pyversions -rv))
-build/stamp:
+ cd gamera/backport && rm -f ConfigParser.py optparse.py sets.py textwrap.py
+ mkdir -p $(dir $@)
touch $(@)
-build/stamp-python%:
+build/build-stamp-python%: build/cruft-stamp
python$(*) setup.py build
touch $(@)
-build/stamp-python%-dbg:
+build/build-stamp-python%-dbg: build/cruft-stamp
CFLAGS="$$CFLAGS_noopt" python$(*)-dbg setup.py build
touch $(@)
+.PHONY: build-indep
+# dpkg-buildpackage (<< 1.16.2) called the build target without Build-Depends
+# installed. To work around this buggy behaviour, we build arch-independent
+# stuff in binary-arch rather than here. See bug #374029.
# binary and binary-* targets
# ===========================
-.PHONY: binary binary-arch binary-indep
-binary binary-arch binary-indep:
- dh $(@)
+.PHONY: binary
+binary: binary-arch binary-indep
-.PHONY: override_dh_installman
-ifneq ($(shell dh_listpackages | grep -x -F gamera-gui),)
-override_dh_installman: doc/manpage/gamera_gui.1
- dh_installman
-endif
+build/install-stamp: build/build-stamp
+ $(call loop, $(python_all)) setup.py install --prefix=/usr --root=debian/tmp/
+ sed -i -e '1 s,^#!.*,#!/usr/bin/python,' debian/tmp/usr/bin/*
+ rm -rf debian/tmp/usr/lib/python*/*-packages/gamera/src/
+ rm -f debian/tmp/usr/bin/gamera_post_install.py
+ touch $(@)
-.PHONY: override_dh_installdocs
-override_dh_installdocs: doc/stamp
- dh_installdocs
-ifneq ($(shell dh_listpackages | grep -x -F gamera-doc),)
+.PHONY: binary-arch
+binary-arch: build/install-stamp
+ dh_testroot
+ dh_install -a -X.pyc --fail-missing
+ dh_installdocs -a
+ dh_installchangelogs -a
+ dh_pysupport -a
+ dh_link -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_strip -a --dbg-package=python-gamera-dbg
+ debian/dh_buildid -a
+ dh_shlibdeps -a
+ dh_installdeb -a
+ dh_gencontrol -a -- -Vvigra:Version=$(vigra_version)
+ dh_md5sums -a
+ dh_builddeb -a -- -Zxz
+
+.PHONY: binary-indep
+binary-indep: build/install-stamp build/doc-stamp doc/manpage/gamera_gui.1
+ dh_testroot
+ dh_installdirs -i
+ pngtopnm < gamera/pixmaps/icon.png | ppmtoxpm > debian/gamera-gui/usr/share/pixmaps/gamera-gui.xpm
+ dh_install -i -X.pyc --fail-missing
+ find debian/gamera-gui/ -name has_gui.py -delete
+ dh_installdocs -i
cd debian/gamera-doc/usr/share/doc/gamera-doc/html/ && \
$(CURDIR)/debian/symlink-helper ../src/ . && \
rdfind -makehardlinks true -makeresultsfile false .
-endif
-
-doc/manpage/gamera_gui.1: build/stamp
- mkdir -p doc/manpage/
- ln -sf $(CURDIR)/debian/manpage-helper-1 doc/manpage/
- ln -sf $(CURDIR)/debian/manpage-helper-2 doc/manpage/gamera_gui
- cd doc/manpage/ && \
- PYTHONPATH=$(default_pythonpath) \
- help2man --version-string=$(version) --name='GUI for the Gamera framework' --no-info ./gamera_gui > gamera_gui.1
-
-doc/stamp: build/stamp
-ifneq ($(shell dh_listpackages | grep -x -F gamera-doc),)
- cd doc && PYTHONPATH=$(default_pythonpath) python gendoc.py
-endif
- touch $(@)
-
-.PHONY: override_dh_install
-override_dh_install:
- dh_install
-ifneq ($(shell dh_listpackages | grep -x -F gamera-gui),)
- find debian/gamera-gui/ -name has_gui.py -delete
- pngtopnm < gamera/pixmaps/icon.png | ppmtoxpm > debian/gamera-gui/usr/share/pixmaps/gamera-gui.xpm
-endif
-
-.PHONY: override_dh_link
-override_dh_link:
-ifneq ($(shell dh_listpackages | grep -x -F python-gamera-dev),)
+ dh_installchangelogs -i
+ dh_installmenu -i
+ dh_installman -i
+ dh_pysupport -i
set -e; cd debian/python-gamera-dev/usr/include/; \
mv $(shell pyversions -d)/gamera .; \
rm -Rf python2.*/; \
@@ -115,34 +113,37 @@
ln -sf ../gamera $$version$$suffix/gamera; \
done; \
done
-endif
- dh_link
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i -- -Zxz
-.PHONY: override_dh_strip
-override_dh_strip:
- dh_strip --dbg-package=python-gamera-dbg
- debian/dh_buildid
+doc/manpage/gamera_gui.1: build/build-stamp
+ mkdir -p doc/manpage/
+ ln -sf $(CURDIR)/debian/manpage-helper-1 doc/manpage/
+ ln -sf $(CURDIR)/debian/manpage-helper-2 doc/manpage/gamera_gui
+ cd doc/manpage/ && \
+ PYTHONPATH=$(default_pythonpath) \
+ help2man --version-string=$(version) --name='GUI for the Gamera framework' --no-info ./gamera_gui > gamera_gui.1
-.PHONY: override_dh_gencontrol
-override_dh_gencontrol:
- dh_gencontrol -- -Vvigra:Version=$(vigra_version)
+build/doc-stamp: build/build-stamp
+ cd doc && PYTHONPATH=$(default_pythonpath) python gendoc.py
+ touch $(@)
-.PHONY: override_dh_builddeb
-override_dh_builddeb:
- dh_builddeb -- -Zxz
# clean target
# ============
.PHONY: clean
clean:
- dh clean
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
+ dh_testdir
find -name '*.py[co]' -delete
rm -Rf doc/html/images/
rm -Rf doc/manpage/
rm -Rf build/
+ dh_clean
# vim:ts=4 sw=4 noet
More information about the Python-modules-commits
mailing list