From 8891dad0d9b06d7b7a7372f731f5fe48a32dc327 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Mon, 12 Jan 2015 20:42:21 +1100 Subject: [PATCH] =?utf8?q?Remove=20rules=20code=20obsoleted=20by=20?= =?utf8?q?=E2=80=98pybuild=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- debian/rules | 52 ++++------------------------------------------------ 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/debian/rules b/debian/rules index aa1cfcc..4bb6034 100755 --- a/debian/rules +++ b/debian/rules @@ -3,25 +3,12 @@ # debian/rules # Part of Debian ‘xkcdpass’ package. # -# Copyright © 2010–2014 Ben Finney +# Copyright © 2010–2015 Ben Finney # This is free software; you may copy, modify and/or distribute this work # under the terms of the BSD 3-clause license. # No warranty expressed or implied. # See the file ‘xkcdpass/xkcd_password.py’ for details. -SOURCE_PACKAGE_NAME = xkcdpass -PYTHON3_PACKAGE_NAME = python3-xkcdpass -package_working_root = debian -package_install_root = ${package_working_root}/tmp -package_install_bin_dir = ${package_install_root}/usr/bin - -PYTHON3_VERSIONS = $(shell py3versions -vr) -PYTHON_VERSIONS = ${PYTHON3_VERSIONS} - -DISTRIBUTION_NAME = xkcdpass -egg_info_dir = ${DISTRIBUTION_NAME}.egg-info -GENERATED_FILES += ${egg_info_dir}/PKG-INFO ${egg_info_dir}/SOURCES.txt - DOCUMENTATION_DIR = debian MANPAGE_SUFFIX = .1 TEMPFILE_SUFFIX = .tmp @@ -44,36 +31,19 @@ RST_SUFFIX = .txt RST2MAN = rst2man -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) -.PHONY: test-python% -test-python%: - python$* setup.py test -vv - -.PHONY: override_dh_auto_test -override_dh_auto_test: $(foreach pyversion,${PYTHON_VERSIONS},$(pyversion:%=test-python%)) -endif - - .PHONY: build build: build-arch build-indep build: ${manpages} dh $@ --with python3 --buildsystem=pybuild .PHONY: build-arch -build-arch: build-stamp +build-arch: dh $@ --with python3 --buildsystem=pybuild .PHONY: build-indep -build-indep: build-stamp +build-indep: dh $@ --with python3 --buildsystem=pybuild -build-stamp: - touch $@ - -.PHONY: build-python% -build-python%: - python$* setup.py build - %.1: %.1${RST_SUFFIX} $(RST2MAN) $< > $@${TEMPFILE_SUFFIX} @@ -83,13 +53,11 @@ build-python%: .PHONY: clean clean: dh $@ --with python3 --buildsystem=pybuild - $(RM) -r ${GENERATED_FILES} .PHONY: override_dh_auto_clean override_dh_auto_clean: dh_auto_clean - $(RM) -r build - $(RM) -r ${egg_info_dir} + $(RM) -r ${GENERATED_FILES} .PHONY: get-packaged-orig-source @@ -124,12 +92,6 @@ endef # uscan-download-source install: build dh $@ --with python3 --buildsystem=pybuild -.PHONY: install-python% -install-python%: python_version_major = $(firstword $(subst ., ,$*)) -install-python%: - python$* setup.py install --install-layout=deb \ - --root=$(CURDIR)/${package_install_root} - .PHONY: binary-indep binary-indep: build install @@ -142,12 +104,6 @@ binary-arch: build install binary: build binary-indep binary-arch -.PHONY: override_dh_auto_build -override_dh_auto_build: $(foreach pyversion,${PYTHON_VERSIONS},$(pyversion:%=build-python%)) -override_dh_auto_build: - dh_auto_build - - # Local variables: # mode: makefile # coding: utf-8 -- 2.11.4.GIT