postinst-setup: update default packages

diff --git a/postinst-setup b/postinst-setup
index b1871093c720008c6d5e08a4f2813fc0045c839b..5dd64ce254ede21a07dbdaa8370092b4b798264e 100755 (executable)
--- a/postinst-setup
+++ b/postinst-setup
@@ -69,8 +69,8 @@ rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 killall apt-get || true
 apt-get update
 
-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 dchroot fakechroot imagemagick pngquant pdfjam easytag rsnapshot texlive-lang-german texlive-latex-extra python-coverage powertop sane-utils vim-scripts libtemplate-perl kvm bzr-buildpackage git-core greasemonkey build-essential fakeroot devscripts libglib2.0-doc libgtk2.0-doc git-buildpackage corkscrew d-feet
-apt-get -y build-dep postgresql-8.4 hal cups apport jockey calibre gvfs devicekit-disks devicekit-power gnome-disk-utility
+DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim bzrtools patchutils offlineimap wipe diffstat gtimelog jigdo-file libtool devhelp python-doc manpages-dev gstreamer0.10-fluendo-mp3 gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff ccache listadmin quilt cryptsetup mutt editmoin lintian python-gtk2-doc fakechroot ubuntu-dev-tools dput dchroot fakechroot easytag rsnapshot texlive-lang-german texlive-latex-extra powertop vim-scripts libtemplate-perl kvm bzr-buildpackage git-core greasemonkey build-essential fakeroot devscripts libglib2.0-doc libgtk2.0-doc git-buildpackage corkscrew d-feet
+apt-get -y build-dep postgresql-8.4 cups apport jockey calibre gvfs udisks upower gnome-disk-utility
 
 # basic 32 bit libraries (for adb)
 if [ `uname -m` = x86_64 ]; then
@@ -84,5 +84,5 @@ crontab -u martin - <<EOF
 EOF
 
 if [ -x /usr/bin/gtimelog ]; then
-    patch /usr/bin/gtimelog ~martin/archiv/gtimelog.tuesday.patch
+    patch --no-backup-if-mismatch /usr/bin/gtimelog ~martin/archiv/gtimelog.tuesday.patch
 fi