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

diff --git a/Makefile.debian b/Makefile.debian
index 078c9376..c4afb771 100644
--- a/Makefile.debian
+++ b/Makefile.debian
@@ -1,21 +1,30 @@
-PROJECT=sfa
-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_TARBALL=../$(PROJECT)_$(VERSION).orig.tar.bz2
 
 debian: debian/changelog debian.source debian.package
 
 force:
 
 debian/changelog: debian/changelog.in
-	sed -e "s|@VERSION@|$(VERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog
+	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 $(TARBALL) $(DEBIAN_TARBALL)
+	rsync -a $(RPMTARBALL) $(DEBTARBALL)
 
 debian.package:
-	debuild -uc -us --source-option=--include-binaries --source-option=-isession
+	debuild -uc -us -b 
 
 debian.clean:
 	$(MAKE) -f debian/rules clean