1 files changed, 79 insertions, 79 deletions
diff --git a/update_jdn.sh b/update_jdn.sh
index 0d089c0b..13875320 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -55,108 +55,108 @@ fi
 
 #
 # install packages we need
-# (more or less grouped into more-then-nice-to-have, needed-while-things-are-new, needed)
 #
-sudo apt-get install 	vim \
-			screen \
-			less \
-			etckeeper \
-			moreutils \
-			curl \
-			mtr-tiny \
-			dstat \
-			devscripts \
-			bash-completion \
-			shorewall \
-			shorewall6 \
-			cron-apt \
+sudo apt-get install	apache2 \
+			apt-file \
 			apt-listchanges \
-			calamaris \
-			procmail \
-			libjson-rpc-perl \
-			libfile-touch-perl \
-			zutils \
-			ip2host \
-			pigz \
+			bash-completion \
+			bc \
 			build-essential \
-			python-setuptools \
-			molly-guard \
+			calamaris \
+			cron-apt \
+			curl \
 			debootstrap \
-			sudo \
+			devscripts \
+			devscripts \
+			dnsmasq-base \
+			dose-extra \
+			dstat \
+			etckeeper \
+			ffmpeg \
 			figlet \
+			gawk \
+			ghc \
+			gocr \
 			graphviz \
-			apache2 \
+			guestmount \
+			haveged \
+			imagemagick \
+			ip2host \
+			less \
 			libapache2-mod-macro \
-			python-yaml \
-			python-pip \
+			libav-tools \
+			libavcodec-extra-53 \
+			libcap2-bin \
+			libfile-touch-perl \
+			libjson-rpc-perl \
+			libsikuli-script-java \
+			libsoap-lite-perl \
+			libvirt-ruby \
+			libvpx1 \
+			libxslt1-dev \
+			molly-guard \
+			moreutils \
 			mr \
-			subversion \
-			subversion-tools \
-			vnstat \
+			mtr-tiny \
+			ntp \
+			openjdk-7-jre \
+			pigz \
+			postgresql-client-9.1 \
 			poxml \
-			vncsnapshot \
-			imagemagick \
-			libav-tools \
-			python-twisted \
+			procmail \
+			python-hachoir-metadata \
 			python-imaging \
-			gocr \
-			guestmount \
-			schroot \
-			sqlite3 \
-			dose-extra \
-			apt-file \
 			python-lzma \
-			bc \
-			unzip \
-			python-hachoir-metadata \
-			ghc \
+			python-pip \
 			python-rpy2 \
-			libsoap-lite-perl \
-			haveged \
-			postgresql-client-9.1 \
-			xvfb \
-			virt-viewer \
-			libsikuli-script-java \
-			libxslt1-dev \
+			python-setuptools \
+			python-twisted \
+			python-yaml \
+			python3-psycopg2 \
+			python3-yaml \
+			radvd \
+			ruby-json \
+			ruby-rspec \
+			schroot \
+			screen \
+			shorewall \
+			shorewall6 \
+			sqlite3 \
+			subversion \
+			subversion-tools \
+			sudo \
+			syslinux \
 			tcpdump \
 			unclutter \
-			radvd \
+			unzip \
+			vim \
+			virt-viewer \
+			vncsnapshot \
+			vnstat \
 			x11-apps \
-			syslinux \
-			libcap2-bin \
-			devscripts \
-			libvirt-ruby \
-			ruby-rspec \
-			gawk \
-			ntp \
-			ruby-json \
 			x11vnc \
 			xtightvncviewer \
-			ffmpeg \
-			libavcodec-extra-53 \
-			libvpx1 \
-			dnsmasq-base \
-			openjdk-7-jre \
-			python3-yaml \
-			python3-psycopg2
-# debootstrap is affected by #766459 in wheezy
+			xvfb \
+			zutils
+
 sudo apt-get install -t wheezy-backports \
-			qemu \
+			binfmt-support \
+			cucumber \
 			debootstrap \
+			libvirt-bin \
+			libvirt-dev \
+			libvirt0 \
+			linux-image-amd64 \
+			munin \
+			munin-plugins-extra \
+			qemu \
 			qemu-kvm \
 			qemu-system-x86 \
-			libvirt0 \
 			qemu-user-static \
-			binfmt-support \
-			libvirt-dev \
-			libvirt-bin \
-			seabios \
-			ruby-rjb \
 			ruby-packetfu \
-			cucumber \
-			linux-image-amd64 \
-			munin \
-			munin-plugins-extra
+			ruby-rjb \
+			seabios
+
 explain "Packages installed."
 
 echo "Also needs python-arpy from jessie..."