X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=postinst-setup;h=d24ae6e57f8ef94deeb599e97e9bdd1f92deb26f;hp=4d9c5aebbb886285ba46dcdf5ff5d29c0e08d7a4;hb=4339723cebbed55b9da66fb99d8c51900e04d922;hpb=349e9c013c473edf9782021b362fdbc1b069501d

diff --git a/postinst-setup b/postinst-setup
index 4d9c5ae..d24ae6e 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -61,7 +61,7 @@ locale-gen ru_RU ru_RU.UTF-8
 
 # remove packages that we do not need
 killall apt-get || true # cronjob goo
-apt-get purge -y --auto-remove hplip brltty bluez-cups gnome-accessibility-themes gnome-mag gnome-orca onboard tomboy ttf-lao ttf-thai-tlwg || true
+apt-get purge -y --auto-remove hplip hplip-data hpijs brltty bluez-cups gnome-accessibility-themes gnome-mag gnome-orca onboard tomboy ttf-lao ttf-thai-tlwg || true
 
 rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 
@@ -69,13 +69,9 @@ 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 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 germinate debootstrap seahorse-plugins wmctrl
-apt-get -y build-dep postgresql-8.4 cups apport calibre gvfs udisks upower gnome-disk-utility
+DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim bzrtools patchutils offlineimap wipe diffstat gtimelog 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 fakechroot ubuntu-dev-tools dput dchroot easytag rsnapshot texlive-lang-german texlive-latex-extra powertop qemu-kvm bzr-buildpackage git-core greasemonkey build-essential fakeroot devscripts libglib2.0-doc libgtk3.0-doc git-buildpackage d-feet germinate debootstrap seahorse-plugins wmctrl mumble qemu-kvm flashplugin-installer
 
-# basic 32 bit libraries (for adb)
-if [ `uname -m` = x86_64 ]; then
-    apt-get install -y lib32stdc++6 lib32ncurses5 libc6-i386
-fi
+apt-get -y build-dep postgresql-8.4 cups apport calibre gvfs udisks upower gnome-disk-utility
 
 # crontabs
 crontab -u martin - <<EOF
@@ -84,5 +80,5 @@ crontab -u martin - <<EOF
 EOF
 
 if [ -x /usr/bin/gtimelog ]; then
-    patch --no-backup-if-mismatch /usr/bin/gtimelog ~martin/archiv/gtimelog.tuesday.patch
+    patch --no-backup-if-mismatch /usr/share/pyshared/gtimelog/main.py ~martin/archiv/gtimelog.tuesday.patch
 fi