summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2013-11-04 09:05:41 +0100
committerDidier Raboud <odyx@debian.org>2013-11-04 09:05:41 +0100
commit2ae9ad78069800fb726ef545a0560beeefd9f049 (patch)
treea00d06ab75d108ddfabb430dfdaf210f63d01213
parent8a0c09d0f0905596bad2a6cd1d5a6d3b78eb6738 (diff)
downloadcolobot-2ae9ad78069800fb726ef545a0560beeefd9f049.tar.gz
colobot-2ae9ad78069800fb726ef545a0560beeefd9f049.tar.bz2
colobot-2ae9ad78069800fb726ef545a0560beeefd9f049.zip
Drop noisy development-merging machinery in debian/rules
-rwxr-xr-xdebian/rules9
1 files changed, 0 insertions, 9 deletions
diff --git a/debian/rules b/debian/rules
index 5cb315b..171cbb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,12 +14,3 @@ override_dh_auto_configure:
override_dh_auto_build:
dh_auto_build -a
dh_auto_build -i -- doc
-
-merge-dev:
- set -e; \
- 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 "New snapshot of dev branch ($${DEV_COMMIT})"