X-Git-Url: https://piware.de/gitweb/?a=blobdiff_plain;f=postinst-setup;h=7dac672fa003df3b3cf35a327a44b1ba2d7d000d;hb=5761fe30125cfdda1e9c6300642da71600398b7a;hp=104c586b0b93c5d64be4825eeffdead6df6477d5;hpb=cb8a08ad8b0c1fe8ed3b0f3ba1852ea43661132d;p=bin.git

diff --git a/postinst-setup b/postinst-setup
index 104c586..7dac672 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -23,7 +23,7 @@ if [ ! -d /etc/.bzr ]; then
     for i in passwd group shadow fstab; do
         [ -e $i.originst ] || cp $i $i.originst
     done
-    [ -e /backup-etc ] || bzr get bzr+ssh://martin@piware.de/home/martin/backup/`hostname`-etc /backup-etc
+    [ -e /backup-etc ] || bzr branch bzr+ssh://martin@piware.de/home/martin/backup/`hostname`-etc /backup-etc
     cp -av /backup-etc/* /etc/
     cp -av /backup-etc/.bzr/ /etc/
     rm -rf /backup-etc
@@ -56,29 +56,25 @@ newaliases
 /etc/init.d/postfix restart
 
 # other setup
-dpkg -i /home/martin/download/libdvdcss2_*deb || true
+dpkg -i /home/martin/download/libdvdcss2_*amd64.deb || true
 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 hplip-data hpijs 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 printer-driver-hpijs printer-driver-hpcups brltty bluez-cups gnome-accessibility-themes gnome-orca onboard thunderbird || true
 
-rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
+#rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 
 # install packages from network sources
 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 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
+DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim patchutils offlineimap diffstat gtimelog libtool devhelp python3-doc manpages-dev weechat weechat-plugins weechat-scripts dpatch wdiff ccache listadmin quilt mutt editmoin lintian fakechroot ubuntu-dev-tools dput dchroot easytag rsnapshot texlive-lang-german texlive-latex-extra powertop qemu-kvm bzr-buildpackage git-core build-essential fakeroot devscripts libglib2.0-doc libgtk-3-doc git-buildpackage d-feet debootstrap wmctrl mumble libnotify-bin pbuilder svn-buildpackage pastebinit lptools openvpn pdfjam
 
-apt-get -y build-dep postgresql-8.4 cups apport calibre gvfs udisks upower gnome-disk-utility udev python-gobject
+apt-get -y --no-install-recommends build-dep postgresql-9.1 apport calibre gvfs udisks2 upower gnome-disk-utility udev pygobject
 
 # crontabs
 crontab -u martin - <<EOF
 # m h  dom mon dow   command
 05 * * * * \$HOME/bin/backup >/dev/null
 EOF
-
-if [ -x /usr/bin/gtimelog ]; then
-    patch --no-backup-if-mismatch /usr/share/pyshared/gtimelog/main.py ~martin/archiv/gtimelog.tuesday.patch
-fi