Some more updates and removal of mentions of squeeze

3 files changed, 12 insertions, 14 deletions

diff --git a/README b/README
index 13fc280..35bed18 100644
--- a/README
+++ b/README
@@ -22,30 +22,28 @@ This means I have the appropriate aptcache and buildresult directories set up
 under /var/cache/pbuilder. I have several pbuilder images used for package
 creation under /var/cache/pbuilder, among others:
 
-  /var/cache/pbuilder/squeeze-i386-base.tgz
+  /var/cache/pbuilder/jessie-i386-base.tgz
 
 With the pbuilderrc mentioned above, this can be created as a normal user with
 
   export ARCH=i386
-  export DIST=squeeze
+  export DIST=jessie
   sudo -E pbuilder create
 
 Then, using
 
   sudo -E pbuilder login --save-after-login
 
-these have a standard Debian mirror, the security sources and the Debian
-backports repository setup in their /etc/apt/sources.list, as well as my local
-http package source where the r-base package build results are available. I
-have also imported the apt key of my repository inside the pbuilder chroots.
-
-In the wheezy pbuilder images, the backports repository is not necessary.
+these have a standard Debian mirror, the security sources setup in their
+/etc/apt/sources.list, as well as my local http package source where the r-base
+package build results are available. I have also imported the apt key of my
+repository inside the pbuilder chroots.
 
 For some reason, the keyring option to debootstrap is not used (necessary on
-Ubuntu) so I need to pass this on the commandline when building the pbuilder
+Ubuntu) so I needed to pass this on the commandline when building the pbuilder
 chroot for wheezy-i386.
 
 When using these scripts on Debian, I used to configure sudo to allow my normal
 user to use pbuilder, apt-get and the backporting scripts. Currently, I have 
-set up my wheezy installation using the Ubuntu like sudo configuration that
-can be selected during installation.
+set up my jessie installation using the Ubuntu like sudo configuration that
+I selected during the original installation of wheezy.
diff --git a/build_others b/build_others
index 8f69203..739ec5c 100755
--- a/build_others
+++ b/build_others
@@ -38,7 +38,7 @@ fi
 # When doing a new repository, lattice, r-cran-mass and survival have to be
 # built first, then nlme and rmatrix, then the rest
 
-# squeeze/wheezy/jessie
+# wheezy/jessie
 #for i in  lattice r-cran-mass survival; do
 #for i in  nlme rmatrix; do
 #for i in cluster foreign r-cran-class r-cran-spatial r-cran-nnet kernsmooth mgcv rodbc rpart littler rpy rpy2 rkward r-cran-rjags; do
diff --git a/clean b/clean
index d88d8d2..cc55406 100755
--- a/clean
+++ b/clean
@@ -4,14 +4,14 @@
 
 usage()
 {
-echo "Usage: ./clean [squeeze|wheezy|jessie]"
+echo "Usage: ./clean [wheezy|jessie]"
 }
 
 if [ $# -gt 1 ]; then usage; exit 1; fi
 if [ $# -eq 1 ]
 then
   DIST=$1
-  if [ $DIST != "squeeze" ] && [ $DIST != "wheezy" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi
+  if [ $DIST != "wheezy" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi
   cd $DIST
 fi