X-Git-Url: https://piware.de/gitweb/?a=blobdiff_plain;f=postinst-setup;h=06b6bd035cd690d3e1d6e051fb95d72ac53c3a35;hb=3f5ad33396d35586aeb24184741c675b6a059db5;hp=2b74f97fdd13c5e33b806b875f06af7d831b50e3;hpb=a047f014d90af793588c612cbaa17a77b3fbcdb4;p=bin.git

diff --git a/postinst-setup b/postinst-setup
index 2b74f97..06b6bd0 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -6,13 +6,8 @@ if [ -d /home/martin/backup ] && [ ! -d /var/backups/martin ]; then
     rm -rf /home/martin/backup
 fi
 
-# install already shipped debs
-UBUNTU_CD="/home/martin/download/ubuntu/`lsb_release -c`-alternate-`dpkg --print-architecture`.iso"
-if [ -r "$UBUNTU_CD" ]; then
-    mount -o loop "$UBUNTU_CD" /cdrom
-    apt-cdrom -m add
-fi
-DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends build-essential fakeroot devscripts postfix openssh-server bzr python-paramiko 
+# need bzr and postfix for the setup below
+DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends postfix openssh-server bzr python-paramiko 
 
 # root's ssh stuff
 if [ ! -d /root/.ssh ] && [ -d /home/martin/.ssh ]; then
@@ -40,7 +35,7 @@ if [ ! -d /etc/.bzr ]; then
     chown root:ssl-cert /etc/ssl/private/ssl-cert*
 
     # only restore dchroot part into fstab
-    grep -A 200 "^# sid chroot" fstab >> fstab.originst || true
+    grep -A 200 "^#.*chroot" fstab >> fstab.originst || true
     mv fstab.originst fstab
 
     # only restore the human users from passwd/group
@@ -60,30 +55,23 @@ fi
 newaliases
 /etc/init.d/postfix restart
 
-# copy apt cache
-if [ -d /home/aptcache ]; then
-    find /home/aptcache/ -name "*.deb" -exec cp '{}' /var/cache/apt/archives/ \;
-    rm -rf /home/aptcache
-fi
-
 # 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 brltty bluez-cups gnome-accessibility-themes gnome-mag gnome-orca onboard tomboy ttf-arabeyes ttf-arphic-uming ttf-lao ttf-thai-tlwg update-motd || 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 -o Acquire::Http::No-Cache=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
-apt-get -y build-dep postgresql-8.4 hal cups apport jockey calibre gvfs devicekit-disks devicekit-power
+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
 
-umount /cdrom || true
+apt-get -y --no-install-recommends build-dep postgresql-9.1 cups apport calibre gvfs udisks upower gnome-disk-utility udev python-gobject
 
 # crontabs
 crontab -u martin - <<EOF
@@ -91,6 +79,6 @@ crontab -u martin - <<EOF
 05 * * * * \$HOME/bin/backup >/dev/null
 EOF
 
-if [ -x /usr/bin/gtimelog ]; then
-    patch /usr/bin/gtimelog ~martin/archiv/gtimelog.tuesday.patch
-fi
+#if [ -x /usr/bin/gtimelog ]; then
+#    patch --no-backup-if-mismatch /usr/share/pyshared/gtimelog/main.py ~martin/archiv/gtimelog.tuesday.patch
+#fi