X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.debian;h=4ac9c58d2ae5993dac0c0036778da167dc31f724;hb=5368ae9d54d4b00d5adf0f8c20b6b7192945dbb8;hp=1a4831819040061e8c7bf2ad8e5cf0540abf2450;hpb=fa84efd60c5932c6962a311336281f94c83c82bb;p=sfa.git

diff --git a/Makefile.debian b/Makefile.debian
index 1a483181..4ac9c58d 100644
--- a/Makefile.debian
+++ b/Makefile.debian
@@ -1,38 +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
 
-all: builddeb 
+debian: debian/changelog debian.source debian.package
 
-source:
-	$(PYTHON) setup.py sdist $(SETUPOPTS)
+force:
 
-install:
-	$(PYTHON) setup.py install --root $(DESTDIR) $(SETUPOPTS)
+debian/changelog: debian/changelog.in
+	sed -e "s|@VERSION@|$(VERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog
 
-#buildrpm:
-#	$(PYTHON) setup.py bdist_rpm --post-install=rpm/postinstall --pre-uninstall=rpm/preuninstall
+# TARBALL is passed from the main build (/build/Makefile) to the 'make debian' call
+debian.source: force 
+	rsync -a $(TARBALL) $(DEBIAN_TARBALL)
 
-# 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/' ../*
-	dpkg-buildpackage -i -I -rfakeroot
+debian.package:
+	debuild -uc -us -b 
 
-clean:
-	$(PYTHON) setup.py clean
-	$(MAKE) -f $(CURDIR)/debian/rules clean
-	rm -rf build/ MANIFEST
+debian.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"
-