postinst-setup: updates

diff --git a/postinst-setup b/postinst-setup
index 06b6bd035cd690d3e1d6e051fb95d72ac53c3a35..7dac672fa003df3b3cf35a327a44b1ba2d7d000d 100755 (executable)
--- 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
@@ -69,16 +69,12 @@ apt-get purge -y --auto-remove hplip hplip-data printer-driver-hpijs printer-dri
 killall apt-get || true
 apt-get update
 
-DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim patchutils offlineimap 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 build-essential fakeroot devscripts libglib2.0-doc libgtk-3-doc git-buildpackage d-feet germinate debootstrap wmctrl mumble qemu-kvm libnotify-bin pbuilder svn-buildpackage
+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 --no-install-recommends build-dep postgresql-9.1 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