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

diff --git a/Makefile.debian b/Makefile.debian
index 0ff8bacc..c4afb771 100644
--- a/Makefile.debian
+++ b/Makefile.debian
@@ -1,28 +1,33 @@
-PROJECT=sfa
-PYTHON=python
-DESTDIR=/
-SETUPOPTS=
-VERSION=$(shell python -c "from sfa.util.version import version_tag; print version_tag" | sed -e s,-,.,)
+# 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: sourcedeb pkgdeb
+debian: debian/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
-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/' ../*
+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)
 
-pkgdeb:
-	dpkg-buildpackage -i -I -rfakeroot
+debian.package:
+	debuild -uc -us -b 
 
-debian.clean clean:
-	-$(PYTHON) setup.py clean
+debian.clean:
 	$(MAKE) -f debian/rules clean
 	rm -rf build/ MANIFEST ../*.tar.gz ../*.dsc ../*.build
 	find . -name '*.pyc' -delete
+