diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index e88b905..43d1a4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ colobot (0.1.0~pre-alpha-git-dev~r211-gcd60d92-1~OdyX0) UNRELEASED; urgency=low * Initial release. (Closes: #695829) - * New snapshot of dev branch (211-gcd60d92) -- Didier Raboud <odyx@debian.org> Mon, 25 Mar 2013 08:08:32 +0100 diff --git a/debian/rules b/debian/rules index bc96db7..5cb315b 100755 --- a/debian/rules +++ b/debian/rules @@ -20,5 +20,6 @@ merge-dev: DEV_COMMIT=$$(git describe --tags dev | sed -e 's/^colobot-gold-pre_alpha-//g'); \ git merge --no-commit dev; \ dch -b -v 0.1.0~pre-alpha-git-dev~r$${DEV_COMMIT}-1~OdyX0 "New snapshot of dev branch ($${DEV_COMMIT})"; \ + sed -e "/New snapshot of dev branch ($${DEV_COMMIT})/d" -i debian/changelog ; \ git add debian/changelog; \ - git commit -m "Merge snapshot of dev branch ($${DEV_COMMIT})" + git commit -m "New snapshot of dev branch ($${DEV_COMMIT})" |