X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=scripts%2Frelease_helper.sh;h=40c532d11a58084cc2bb941a18d3df9f89f8340e;hp=a5fba5572f2f7dfd907f070b413086f27f743eb6;hb=4cd65718be7890b8dec7939c0af769da9bc8e320;hpb=1c0980c3242f3da5242cab8a874f5d2e4860755b

diff --git a/scripts/release_helper.sh b/scripts/release_helper.sh
index a5fba55..40c532d 100755
--- a/scripts/release_helper.sh
+++ b/scripts/release_helper.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Filename:      scripts/release_helper.sh
-# Purpose:       helper script to build grml-live Debian packages (WFM style though)
+# Purpose:       helper script to build grml-live Debian packages
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
@@ -36,13 +36,15 @@ if [ -n "${AUTOBUILD:-}" ] ; then
   UNIXTIME=$(date +%s)
 
   cat > debian/changelog << EOF
-grml-live (${GRML_LIVE_VERSION}~autobuild${UNIXTIME}) UNRELEASED; urgency=low
+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 ->
 
- -- grml-live Auto Build <mika@grml.org>  $DATE
+    $(git log --format=oneline -1)
+
+ -- grml-live Auto Build <grml-live-git@$(hostname)>  $DATE
 
 EOF
   git add debian/changelog
@@ -93,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 $*
@@ -103,12 +106,18 @@ if [ -n "${AUTOBUILD:-}" ] ; then
    (
      cd ../grml-live.build-area
      dpkg-scanpackages . /dev/null > Packages
+     dpkg-scanpackages . /dev/null | gzip > Packages.gz
    )
    git checkout master
    git branch -D ${autobuild_branch} || true
-   apt-get update
+
+   env APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none sudo apt-get update
+
    PACKAGES=$(dpkg --list grml-live\* | awk '/^ii/ {print $2}')
-   apt-get -y --allow-unauthenticated install $PACKAGES
+   env APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none sudo apt-get -y \
+     -o DPkg::Options::=--force-confmiss \
+     -o DPkg::Options::=--force-confnew  \
+     --allow-unauthenticated install $PACKAGES
 fi
 
 ## END OF FILE #################################################################