Merge branch 'master' of git://git.debian.org/pkg-exppsy/neurodebian

* 'master' of git://git.debian.org/pkg-exppsy/neurodebian:
  updated stimfit entry with wnpp

diff --git a/live/auto/config b/live/auto/config
index 30bcc3be92963ebbbfc8fc43c758171243e75d7f..c804d4e400568394208b42a1add92264c019a62d 100755 (executable)
--- a/live/auto/config
+++ b/live/auto/config
@@ -4,7 +4,7 @@ set -eu
 
 # the Debian release to use as a basis for the live-cd
 nd_basedist="squeeze"
-nd_version="6.0.0"
+nd_version="6.0.1"
 nd_arch=i386
 
 deb_mirror="http://debproxy:9999"

diff --git a/tools/nd-autoinstall b/tools/nd-autoinstall
index dd71b3f47012c915b42c38aae5418db9c77cda09..05721f78c42b83769c453da6989631ecb117be75 100755 (executable)
--- a/tools/nd-autoinstall
+++ b/tools/nd-autoinstall
@@ -149,7 +149,7 @@ fi
 
 if [ $do_install -eq 1 ]; then
     # Figure out amount of space to download/occupy
-    space_info="$(LC_ALL=C apt-get --print-uris install $ai_package 2>/dev/null \
+    space_info="$(LC_ALL=C apt-get --trivial-only --print-uris install $ai_package 2>/dev/null \
         | grep -e '^\(Need to get \|After this\)' || : )"
     if [ $ai_force -eq 0 ]; then
                if ! zenity --question \

diff --git a/tools/nd-vmsetupwizard b/tools/nd-vmsetupwizard
index 6c69486d667f504b25ec1b45ebab9d4d0e983d26..abc58211a2f490435ebd7522adddd612ddbb2cb7 100755 (executable)
--- a/tools/nd-vmsetupwizard
+++ b/tools/nd-vmsetupwizard
@@ -34,6 +34,10 @@ fi
 # initialize apt
 update-manager -c
 
+sudo update-software-center --debug 2>&1 | \
+       zenity $icon_opt --title="Updating Software Center Repository"  \
+               --progress  --pulsate --auto-close --auto-kill 
+
 popconf=/etc/popularity-contest.conf
 if [ ! -e "$popconf" ] || grep -q -e '^PARTICIPATE.*no' "$popconf" ;
 then
@@ -96,6 +100,7 @@ on the system. No installed packages will be reinstalled or removed, only
 additional components will be installed." \
 FALSE "Emacs" "emacs" \
 FALSE "GNU Image Manipulation Program (Gimp)" "gimp" \
+FALSE "Octave" "octave,qtoctave" \
 FALSE "OpenOffice.org" "openoffice.org" \
 FALSE "Scientific Python" "ipython,python-numpy,python-matplotlib" \
 FALSE "TeX Live" "texlive" \

diff --git a/vm/d-i/tools/initial_setup b/vm/d-i/tools/initial_setup
index 8261b317869c3ee31c20df861ddc332889648e74..c0466e4a577a54ba31bffd38f37f256901504816 100755 (executable)
--- a/vm/d-i/tools/initial_setup
+++ b/vm/d-i/tools/initial_setup
@@ -73,9 +73,20 @@ apt-get install -y dkms neurodebian-guest-additions
 
 apt-get install --no-install-recommends -y \
  gnome-core mc evince bash-completion ntpdate file-roller gnome-utils \
- gnome-themes eog vim \
+ gnome-themes eog vim reportbug \
  software-center gdebi gedit-plugins gnome-media synaptic menu less libxp6
 
+# Clean-up installed development files which got pulled in for
+# VM guest additions (to build kernel modules via DKMS)
+apt-get purge -y libc6-dev
+dpkg -l | awk '/^ii.*[ \t]linux-headers/{print $2;}' | xargs -r apt-get purge -y
+
+# Gnome optional pulled by gnome-core:
+apt-get purge -y gnome-core evolution-common evolution libevolution
+
+# And utter cleanup
+apt-get -y autoremove
+
 # intermediate cleanup to prevent virtual harddrive from fragmenting too much
 find /var/cache/apt/archives/ -name '*.deb' -delete