From 527f3958dd2c3b65f1ccb68c496656cda3b3b223 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 16 Jan 2013 20:38:51 +0100 Subject: [PATCH] another simpler, cleaner angle --- Makefile | 2 +- Makefile.debian | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 1d15c401..4c148c99 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ wsdl-clean: ########## debian: version - $(MAKE) -f Makefile.debian + $(MAKE) -f Makefile.debian debian debian.clean: $(MAKE) -f Makefile.debian clean diff --git a/Makefile.debian b/Makefile.debian index 93167cb5..24967ada 100644 --- a/Makefile.debian +++ b/Makefile.debian @@ -1,29 +1,24 @@ PROJECT=sfa -PYTHON=python -DESTDIR=/ -SETUPOPTS= VERSION=$(shell python -c "from sfa.util.version import version_tag; print version_tag" | sed -e s,-,.,) DATE=$(shell date -u +"%a, %d %b %Y %T") +DEBIAN_TARBALL=../$(PROJECT)_$(VERSION).orig.tar.bz2 -debian: debian.source debian.package +debian: deban/changelog debian.source debian.package force: -# build the source package in the parent directory -# then rename it to project_version.orig.tar.gz as expected for debian packaging -# finally build the package -debian.source: force - rm -f sfaadmin sfascan sfi +debian/changelog: debian/changelog.in sed -e "s|@VERSION@|$(VERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog - $(PYTHON) setup.py sdist $(SETUPOPTS) --formats=gztar --dist-dir=../ --prune - rename -f 's/$(PROJECT)-(.*)-(.*)\.tar\.gz/$(PROJECT)_$$1.$$2\.orig\.tar\.gz/' ../* + +# TARBALL is passed from the main build (/build/Makefile) to the 'make debian' call +debian.source: force + rsync -a $(TARBALL) $(DEBIAN_TARBALL) debian.package: -# dpkg-buildpackage -i -I -rfakeroot debuild -uc -us --source-option=--include-binaries --source-option=-isession debian.clean: - -$(PYTHON) setup.py clean $(MAKE) -f debian/rules clean rm -rf build/ MANIFEST ../*.tar.gz ../*.dsc ../*.build find . -name '*.pyc' -delete + -- 2.43.0