projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'branch-1.2' into debian
[fw/altos]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index 1353321d49be85562e4f5868a2b928992c24cd57..4e927977fe8a9f55481cd355f669409bf240e569 100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-3,17
+3,10
@@
export DH_VERBOSE=1
PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
export DH_VERBOSE=1
PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
-DEB_VERSION := $(shell if [ -x /usr/bin/git ]; then git describe; else echo 0; fi | tr - +)
# this target invoked by git-buildpackage using a clean hook, see .gbp.conf
prebuild:
# this target invoked by git-buildpackage using a clean hook, see .gbp.conf
prebuild:
- echo $(DEB_VERSION)
- git-dch --release --new-version=$(DEB_VERSION)
- git log > ChangeLog
- git commit -n ChangeLog debian/changelog \
- -m "update changelogs for Debian build"
- git tag debian/$(DEB_VERSION)
-# git push --tags origin master
+ echo "not frobbing changelog for official builds"
configure: configure-stamp
configure-stamp:
configure: configure-stamp
configure-stamp:
@@
-27,7
+20,7
@@
build-indep: build-stamp
build-stamp: configure-stamp
dh_testdir
build-stamp: configure-stamp
dh_testdir
- $(MAKE)
VERSION=$(PKG_VERSION)
+ $(MAKE)
(cd doc ; $(MAKE))
touch $@
(cd doc ; $(MAKE))
touch $@