update postinst-setup

diff --git a/postinst-setup b/postinst-setup
index ddcacf9e0365ac6379c2282e906c0c87aa909095..1ffb93786e82968c0e76525ef00eecfd32843fe9 100755 (executable)
--- a/postinst-setup
+++ b/postinst-setup
@@ -8,7 +8,7 @@ fi
 
 # install already shipped debs
 [ -e /mirror ] || ln -s /home/ubuntu-mirror /mirror
-mount -o loop /home/martin/download/ubuntu/gutsy-alternate-amd64.iso /cdrom
+mount -o loop /home/martin/download/ubuntu/hardy-alternate-amd64.iso /cdrom
 apt-cdrom -m add
 DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential fakeroot devscripts postfix openssh-server bzr
 
@@ -44,7 +44,7 @@ for i in passwd group; do
 done
 
 # only restore some passwords from shadow
-egrep 'martin|netti|test|joe' shadow >> shadow.originst
+egrep 'martin|netti|joe' shadow >> shadow.originst
 mv shadow.originst shadow
 
 # update postfix for new configuration
@@ -65,7 +65,7 @@ locale-gen ru_RU ru_RU.UTF-8
 killall apt-get || true
 
 # remove packages that we do not need
-apt-get remove --purge -y --auto-remove hplip brltty bluez-cups gnome-accessibility-themes gnome-mag gnome-orca onboard tomboy ttf-arabeyes ttf-arphic-ukai ttf-arphic-uming ttf-baekmuk ttf-gentium ttf-indic-fonts ttf-kochi-gothic ttf-kochi-mincho ttf-lao ttf-malayalam-fonts ttf-mgopen ttf-thai-tlwg
+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-baekmuk ttf-gentium ttf-kochi-gothic ttf-kochi-mincho ttf-lao ttf-malayalam-fonts ttf-mgopen ttf-thai-tlwg
 
 rm /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 
@@ -76,7 +76,7 @@ killall apt-get || true
 apt-get update -o Acquire::Http::No-Cache=true
 
 DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes vim bzrtools bzr-svn python-paramiko patchutils offlineimap wipe gnome-gpg diffstat dchroot gtimelog rsnapshot 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 dhcp3-server grep-dctrl ccache subversion listadmin quilt apache2 python-dev cryptsetup mutt editmoin lintian ia32-libs easytag latex-beamer python-gtk2-doc
-apt-get -y build-dep postgresql-8.2 gnome-volume-manager hal cupsys apport restricted-manager
+apt-get -y build-dep postgresql-8.3 gnome-volume-manager hal cupsys apport jockey
 
 umount /cdrom