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

diff --git a/Makefile.debian b/Makefile.debian
index 1a483181..c4afb771 100644
--- a/Makefile.debian
+++ b/Makefile.debian
@@ -1,38 +1,33 @@
-PROJECT=sfa
-PYTHON=python
-DESTDIR=/
-SETUPOPTS=
-
-all: builddeb 
-
-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
-
-# 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
-
-clean:
-	$(PYTHON) setup.py clean
-	$(MAKE) -f $(CURDIR)/debian/rules clean
-	rm -rf build/ MANIFEST
-	find . -name '*.pyc' -delete
+# This is called from the build with the following variables set 
+# (see build/Makefile and target_debian)
+# (.) RPMTARBALL
+# (.) RPMVERSION
+# (.) RPMRELEASE
+# (.) RPMNAME
+#
+PROJECT=$(RPMNAME)
+#PYVERSION=$(shell python -c "from sfa.util.version import version_tag; print version_tag" | sed -e s,-,.,)
+DEBVERSION=$(RPMVERSION).$(RPMRELEASE)
+DEBTARBALL=../$(PROJECT)_$(DEBVERSION).orig.tar.bz2
+
+DATE=$(shell date -u +"%a, %d %b %Y %T")
+
+debian: debian/changelog debian.source debian.package
+
+force:
 
-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"
+debian/changelog: debian/changelog.in
+	sed -e "s|@VERSION@|$(DEBVERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog
+
+# TARBALL is passed from the main build (/build/Makefile) to the 'make debian' call
+debian.source: force 
+	rsync -a $(RPMTARBALL) $(DEBTARBALL)
+
+debian.package:
+	debuild -uc -us -b 
+
+debian.clean:
+	$(MAKE) -f debian/rules clean
+	rm -rf build/ MANIFEST ../*.tar.gz ../*.dsc ../*.build
+	find . -name '*.pyc' -delete