From: martin@piware.de <>
Date: Sun, 8 Feb 2009 18:15:55 +0000 (+0100)
Subject: postinst-setup: donald is gone, update gtimelog patch
X-Git-Url: https://piware.de/gitweb/?a=commitdiff_plain;h=6bcab33f8bbc664c2b32b5b6b1e9b75c3df48225;p=bin.git

postinst-setup: donald is gone, update gtimelog patch
---

diff --git a/postinst-setup b/postinst-setup
index abab0c9..43de50a 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -75,16 +75,9 @@ rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 killall apt-get || true
 apt-get update -o Acquire::Http::No-Cache=true
 
-DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim bzrtools bzr-svn patchutils offlineimap wipe diffstat gtimelog jigdo-file libtool devhelp python-doc manpages-dev gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-plugins-bad-multiverse gstreamer0.10-plugins-ugly-multiverse gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff debian-goodies ccache subversion listadmin quilt python-dev cryptsetup mutt editmoin lintian python-gtk2-doc fakechroot ubuntu-dev-tools dput gnome-blog dchroot fakechroot imagemagick pngquant pdfjam easytag rsnapshot openvpn texlive-lang-german python-coverage
+DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim bzrtools bzr-svn patchutils offlineimap wipe diffstat gtimelog jigdo-file libtool devhelp python-doc manpages-dev gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-plugins-bad-multiverse gstreamer0.10-plugins-ugly-multiverse gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff debian-goodies ccache subversion listadmin quilt python-dev cryptsetup mutt editmoin lintian python-gtk2-doc fakechroot ubuntu-dev-tools dput gnome-blog dchroot fakechroot imagemagick pngquant pdfjam easytag rsnapshot openvpn texlive-lang-german python-coverage powertop sane-utils
 apt-get -y build-dep postgresql-8.3 gnome-mount hal cups apport jockey
 
-if [ `hostname` = donald ]; then
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes dhcp3-server ia32-libs latex-beamer sane-utils
-fi
-if [ `hostname` = tick ]; then
-    DEBIAN_FRONTEND=noninteractive apt-get install -y powertop 
-fi
-
 umount /cdrom || true
 
 # crontabs
@@ -93,13 +86,6 @@ crontab -u martin - <<EOF
 05 * * * * \$HOME/bin/backup >/dev/null
 EOF
 
-# other setup
-if [ `hostname` = "donald" ]; then
-    ifdown eth1
-    ifup eth1
-    /etc/init.d/dhcp3-server restart
-
-fi
 if [ -x /usr/bin/gtimelog ]; then
-    patch /usr/bin/gtimelog ~martin/archiv/gtimelog.wednesday.patch
+    patch /usr/bin/gtimelog ~martin/archiv/gtimelog.tuesday.patch
 fi