From 241a860fe856b1dfad6e792736313648300d5c24 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 12 Oct 2009 16:48:43 -0600 Subject: flush repetitive junk out of debian/changelog, and update the prebuild target in debian/rules to put git commit details into the Debian changelog --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 74cc078d..0033fcbe 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p') # this target invoked by git-buildpackage using a clean hook, see .gbp.conf prebuild: - dch -v `git describe | tr - +` "build for Debian from git" + git-dch --release --new-version=`git describe | tr - +` git log > ChangeLog git commit ChangeLog debian/changelog \ -m "update changelogs for Debian build" -- cgit v1.2.3 From 7da56ad8576ef212ffb6cb573bdaf578453e3fe0 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 12 Oct 2009 16:52:52 -0600 Subject: add support for tagging git repository on each Debian package build --- debian/rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 0033fcbe..384bacf6 100755 --- a/debian/rules +++ b/debian/rules @@ -3,13 +3,15 @@ export DH_VERBOSE=1 PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p') +DEB_VERSION := $(shell git describe | tr - +) # this target invoked by git-buildpackage using a clean hook, see .gbp.conf prebuild: - git-dch --release --new-version=`git describe | tr - +` + git-dch --release --new-version=$(DEB_VERSION) git log > ChangeLog git commit ChangeLog debian/changelog \ -m "update changelogs for Debian build" + git tag debian/$(DEB_VERSION) configure: configure-stamp configure-stamp: -- cgit v1.2.3 From 513328ac5f7c25f9ee144ab6befbea60d69eed1a Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 12 Oct 2009 16:56:50 -0600 Subject: automate push of updated and tagged master branch during debian/rules prebuild --- debian/rules | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 384bacf6..f306f1df 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,7 @@ prebuild: git commit ChangeLog debian/changelog \ -m "update changelogs for Debian build" git tag debian/$(DEB_VERSION) + git push --tags master configure: configure-stamp configure-stamp: -- cgit v1.2.3 From 2de548f45d0f50b558acc83f57e1e2fc1223ab92 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 12 Oct 2009 16:58:19 -0600 Subject: oops, forgot to specify the repo to push to --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index f306f1df..ac594c07 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ prebuild: git commit ChangeLog debian/changelog \ -m "update changelogs for Debian build" git tag debian/$(DEB_VERSION) - git push --tags master + git push --tags origin master configure: configure-stamp configure-stamp: -- cgit v1.2.3