Paride Legovini has proposed merging ~paride/curtin:update-packaging into curtin:master.
Commit message: Bring the debian/* packaging in sync with ubuntu/devel Requested reviews: curtin developers (curtin-dev) For more details, see: https://code.launchpad.net/~paride/curtin/+git/curtin/+merge/390827 -- Your team curtin developers is requested to review the proposed merge of ~paride/curtin:update-packaging into curtin:master.
diff --git a/debian/control b/debian/control index cea1af8..9fddcbd 100644 --- a/debian/control +++ b/debian/control @@ -5,21 +5,11 @@ Standards-Version: 3.9.6 Maintainer: Ubuntu Developers <[email protected]> Build-Depends: debhelper (>= 7), dh-python, - pep8, - pyflakes, - python-all, - python-coverage, - python-mock, - python-nose, - python-oauthlib, - python-setuptools, - python-yaml, python3, python3-coverage, python3-mock, python3-nose, python3-oauthlib, - python3-pyflakes | pyflakes (<< 1.1.0-2), python3-setuptools, python3-yaml Homepage: http://launchpad.net/curtin @@ -54,19 +44,6 @@ Depends: ${misc:Depends} Description: Library and tools for curtin installer This package contains utilities for the curtin installer. -Package: python-curtin -Section: python -Architecture: all -Priority: extra -Depends: curtin-common (= ${binary:Version}), - python-oauthlib, - python-yaml, - wget, - ${misc:Depends}, - ${python:Depends} -Description: Library and tools for curtin installer - This package provides python library for use by curtin. - Package: python3-curtin Section: python Architecture: all diff --git a/debian/rules b/debian/rules index af2ebab..74be87c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,5 @@ #!/usr/bin/make -f -PYVERS := $(shell pyversions -r) PY3VERS := $(shell py3versions -r) DEB_VERSION := $(shell dpkg-parsechangelog --show-field=Version) @@ -8,14 +7,16 @@ UPSTREAM_VERSION := $(shell x="$(DEB_VERSION)"; echo "$${x%-*}") PKG_VERSION := $(shell x="$(DEB_VERSION)"; echo "$${x\#\#*-}") %: - dh $@ --with=python2,python3 + dh $@ --with=python3 override_dh_auto_install: dh_auto_install - set -ex; for python in $(PY3VERS) $(PYVERS); do \ + set -ex; for python in $(PY3VERS); do \ $$python setup.py build --executable=/usr/bin/python && \ $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \ done chmod 755 $(CURDIR)/debian/tmp/usr/lib/curtin/helpers/* - find $(CURDIR)/debian/tmp for f in $$(find $(CURDIR)/debian/tmp/usr/lib -type f -name version.py); do [ -f "$$f" ] || continue; sed -i 's,@@PACKAGED_VERSION@@,$(DEB_VERSION),' "$$f"; done + +override_dh_auto_test: + make unittest3
-- Mailing list: https://launchpad.net/~curtin-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~curtin-dev More help : https://help.launchpad.net/ListHelp
