From 95457fe14b73966c74117032869c0510ad63f52e Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 16 Jan 2013 15:43:17 +0100 Subject: [PATCH] various tweaks for debian --- Makefile | 2 ++ Makefile.debian | 40 +++++++++++++++------------------------- debian/changelog | 5 ----- debian/changelog.in | 5 +++++ debian/control | 10 ++++------ debian/copyright | 0 debian/source/format | 1 + setup.py | 4 ++++ 8 files changed, 31 insertions(+), 36 deletions(-) delete mode 100644 debian/changelog create mode 100644 debian/changelog.in create mode 100644 debian/copyright create mode 100644 debian/source/format diff --git a/Makefile b/Makefile index 013d83b0..1d15c401 100644 --- a/Makefile +++ b/Makefile @@ -64,6 +64,8 @@ wsdl-clean: ########## debian: version $(MAKE) -f Makefile.debian +debian.clean: + $(MAKE) -f Makefile.debian clean ########## tests-install: diff --git a/Makefile.debian b/Makefile.debian index 1a483181..0ff8bacc 100644 --- a/Makefile.debian +++ b/Makefile.debian @@ -2,37 +2,27 @@ 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") -all: builddeb +debian: sourcedeb pkgdeb -source: - $(PYTHON) setup.py sdist $(SETUPOPTS) - -install: - $(PYTHON) setup.py install --root $(DESTDIR) $(SETUPOPTS) - -#buildrpm: -# $(PYTHON) setup.py bdist_rpm --post-install=rpm/postinstall --pre-uninstall=rpm/preuninstall +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 -builddeb: - rm -f sfaadmin sfascan sfi - $(PYTHON) setup.py sdist $(SETUPOPTS) --formats=gztar --dist-dir=../ --prune - rename -f 's/$(PROJECT)-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../* +sourcedeb: force + rm -f sfaadmin sfascan sfi + 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/' ../* + +pkgdeb: dpkg-buildpackage -i -I -rfakeroot -clean: - $(PYTHON) setup.py clean - $(MAKE) -f $(CURDIR)/debian/rules clean - rm -rf build/ MANIFEST +debian.clean clean: + -$(PYTHON) setup.py clean + $(MAKE) -f debian/rules clean + rm -rf build/ MANIFEST ../*.tar.gz ../*.dsc ../*.build find . -name '*.pyc' -delete - -help: - @echo "make source - Create source package" - @echo "make install - Install on local system" -# @echo "make buildrpm - Generate an rpm package" - @echo "make builddeb - Generate a deb package" - @echo "make clean - Get rid of scratch and byte files" - diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 5e538ac1..00000000 --- a/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -sfa (0.2.0) UNRELEASED; urgency=low - - * Initial release. (Closes: #XXXXXX) - - -- Jordan Augé Tue, 12 Jun 2012 17:22:18 +0300 diff --git a/debian/changelog.in b/debian/changelog.in new file mode 100644 index 00000000..381dc15a --- /dev/null +++ b/debian/changelog.in @@ -0,0 +1,5 @@ +sfa (@VERSION@) UNRELEASED; urgency=low + + * Initial release. + + -- Thierry Parmentelat @DATE@ +0000 diff --git a/debian/control b/debian/control index d6b7182d..ea14718a 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,11 @@ Source: sfa +Maintainer: Thierry Parmentelat Section: misc Priority: optional -Maintainer: Jordan Augé +Standards-Version: 3.9.2 Build-Depends: debhelper (>=7.0.50~), debconf, dpatch -Homepage: http://www.joomla.org -Standards-Version: 3.9.3.1 Package: sfa -Architecture: all +Architecture: any Depends: python-openssl, python-m2crypto, python-dateutil -Description: SFA - SFA +Description: Slice Facility Architecture, generic implementation derived from PlanetLab diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..e69de29b diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/setup.py b/setup.py index e9a34292..239820dc 100755 --- a/setup.py +++ b/setup.py @@ -48,6 +48,7 @@ packages = [ 'sfatables/processors', ] +# need to do something about functions initscripts = [ 'functions', 'sfa', 'sfa-cm' ] data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml', @@ -108,5 +109,8 @@ else: packages = packages, data_files = data_files, scripts = scripts, + url="http://svn.planet-lab.org/wiki/SFATutorial", + author="Thierry Parmentelat, Tony Mack, Scott Baker", + author_email="thierry.parmentelat@inria.fr, tmack@princeton.cs.edu, smbaker@gmail.com", version=version_tag) -- 2.43.0