git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9fbdce4
)
use new names when debian building
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Thu, 2 May 2013 09:25:03 +0000
(11:25 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Thu, 2 May 2013 10:58:49 +0000
(12:58 +0200)
Makefile.debian
patch
|
blob
|
history
diff --git
a/Makefile.debian
b/Makefile.debian
index
031f547
..
c4afb77
100644
(file)
--- a/
Makefile.debian
+++ b/
Makefile.debian
@@
-1,15
+1,16
@@
-#
Warning, t
his is called from the build with the following variables set
+#
T
his is called from the build with the following variables set
# (see build/Makefile and target_debian)
# (see build/Makefile and target_debian)
-# (.) TARBALL
-# (.) VERSION
-# (.) RELEASE
-# (.) NAME
+# (.)
RPM
TARBALL
+# (.)
RPM
VERSION
+# (.) R
PMR
ELEASE
+# (.)
RPM
NAME
#
#
-PROJECT=$(NAME)
+PROJECT=$(
RPM
NAME)
#PYVERSION=$(shell python -c "from sfa.util.version import version_tag; print version_tag" | sed -e s,-,.,)
#PYVERSION=$(shell python -c "from sfa.util.version import version_tag; print version_tag" | sed -e s,-,.,)
-DEBVERSION=$(VERSION).$(RELEASE)
+DEBVERSION=$(RPMVERSION).$(RPMRELEASE)
+DEBTARBALL=../$(PROJECT)_$(DEBVERSION).orig.tar.bz2
+
DATE=$(shell date -u +"%a, %d %b %Y %T")
DATE=$(shell date -u +"%a, %d %b %Y %T")
-DEBIAN_TARBALL=../$(PROJECT)_$(VERSION).orig.tar.bz2
debian: debian/changelog debian.source debian.package
debian: debian/changelog debian.source debian.package
@@
-20,7
+21,7
@@
debian/changelog: debian/changelog.in
# TARBALL is passed from the main build (/build/Makefile) to the 'make debian' call
debian.source: force
# 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) $(DEB
TARBALL)
debian.package:
debuild -uc -us -b
debian.package:
debuild -uc -us -b