X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=scripts%2Frelease_helper.sh;h=cb32c51a02d0212d580168565f7df2eb29399b0f;hp=1bc6ffa7d8988e94e225a4eb0c981f4bfa55a447;hb=4d1178f7de7bb4da7a26979da47ce11ab1ccc1b2;hpb=c6bcaeb5c892666d0fc1b04b67dffbb7f50eb7e0

diff --git a/scripts/release_helper.sh b/scripts/release_helper.sh
index 1bc6ffa..cb32c51 100755
--- a/scripts/release_helper.sh
+++ b/scripts/release_helper.sh
@@ -5,21 +5,6 @@
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 ################################################################################
-## How to set up autobuild (for automatically updating grml-live.git and
-## build packages out of git tree and install them, e.g. for usage on
-## daily.grml.org):
-# echo "deb file:/home/grml-live-git/grml-live.build-area/ ./" >> /etc/apt/sources.list.d/grml-live.list
-# adduser --disabled-login --disabled-password grml-live-git
-# visudo -> add "grml-live-git ALL=NOPASSWD: /usr/bin/apt-get"
-# su - grml-live-git
-# mkdir /home/grml-live-git/grml-live.build-area
-# git clone git://git.grml.org/grml-live.git
-# git config --global user.name "Grml-Live Git Autobuild"
-# git config --global user.email "grml-live-git@$(hostname)"
-#
-# Finally install a cron job (as user grml-live-git) like:
-# 30 00 * * * cd /home/grml-live-git/grml-live.git/ && env AUTOBUILD=1 /home/grml-live-git/release_helper.sh >/home/grml-live-git/grml-live-build.log
-################################################################################
 
 set -e
 set -u
@@ -55,9 +40,11 @@ grml-live (${GRML_LIVE_VERSION}~autobuild${UNIXTIME}) UNRELEASED; urgency=low
 
   * Automatically built package based on the state of
     git repository at http://git.grml.org/?p=grml-live.git
-    on $DATE
+    on $DATE ->
+
+    $(git log --format=oneline -1)
 
- -- grml-live Auto Build <mika@grml.org>  $DATE
+ -- grml-live Auto Build <grml-live-git@$(hostname)>  $DATE
 
 EOF
   git add debian/changelog
@@ -108,6 +95,7 @@ fi
 printf "Building debian packages:\n"
 if [ -n "${AUTOBUILD:-}" ] ; then
   [ -d ../grml-live.build-area ] || mkdir ../grml-live.build-area
+  rm -rf ../grml-live.build-area/grml-live* # otherwise we're keeping files forever...
   git-buildpackage --git-ignore-branch --git-ignore-new --git-export-dir=../grml-live.build-area -us -uc
 else
   git-buildpackage --git-ignore-branch --git-ignore-new $*