From: Valentin Vidic <vvidic@carnet.hr>
Date: Fri, 14 Dec 2007 09:52:10 +0000 (+0100)
Subject: Changed dist names. Updated package lists.
X-Git-Tag: debian/4.0.1~108
X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=commitdiff_plain;h=c3bc8ee970201031dd93362baa6e1d625555cdbf;p=carnet-upgrade.git

Changed dist names. Updated package lists.
---

diff --git a/usr/share/carnet-upgrade/data.sh b/usr/share/carnet-upgrade/data.sh
index f063868..08f0d7a 100644
--- a/usr/share/carnet-upgrade/data.sh
+++ b/usr/share/carnet-upgrade/data.sh
@@ -3,53 +3,78 @@ min_var_space=250
 
 # carnet-upgrade aborts if these packages are not up to date
 # name		wanted version
-needed_woody_versions='
-amavisd-cn	20030616p10-2
-nessus-cn	2.0.7-1cn0
-bind9-cn	1:9.2.4-0cn1
-clamav-cn	0.80-2
+needed_versions='
+amavisd-cn	20030616p10-12
+apache-cn	1.3.33-5
+bind9-cn	9.2.4-1
+clamav-cn	0.91.2-1
+dovecot-cn	0.99.14-0
+iptables-cn	1.2.11-6
+kernel-2.6-cn	2.6.22.9-1
+mysql-cn	4.0.24-10.5
+ntp-cn	4.2.0a+stable-2sarge1.1
+openssh-cn	3.8p1-8
+php4-cn	4.3.11-6
+postfix-cn	2.1.5-11
+procmail-cn	3.22-2
+razor-cn	2.361-0
+samba-cn	3.0.10-1
+spamassassin-cn	3.1.7-3
+squirrelmail-cn	1.4.4-5
+vsftpd-cn	2.0.3-1
+xinetd-cn	2.3.13-1
+aosi-aai	1.6.3
+aosi-www-aai	1.5.7sarge0
+freeradius-aai	1.1.7-0
+openldap-aai	2.2.23-13
 '
 
 # Packages to forcibly install before installing the rest with dist-upgrade,
 # because dist-upgrade would rather remove them.
 packages_first='
-dpkg
-apt
-php4-cn
-apache-cn
-squirrelmail-cn
-amavisd-cn
-amavisd-new
-aide-arms-client
-raidtools2
-openldap-cn
-sweep-cn
+php4-odbc
+php4-xslt
+apache2-cn php5-cn squirrelmail-cn
 '
 
 # Packages that provide crucial services, upgrade them before the rest
 packages_second='
-bind9-cn		
-clamav-cn		
-mysql-cn		
-sendmail-cn		
-oidentd-cn		
-openssh-cn		
-postgresql-cn		
-proftpd-cn		
-spamassassin-cn		
-xinetd-cn	
-ntp-cn
+bind9-cn bind9
+openssh-cn openssh-server		
+clamav-cn clamav-daemon
+spamassassin-cn	spamassassin razor dcc-client
+amavisd-cn
+postfix-cn
+dovecot-cn dovecot
+squirrelmail-cn
+openldap-aai
+freeradius-aai freeradius
+aosi-aai
+aosi-www-aai
+mysql-cn
+ntp-cn ntp
+vsftpd-cn vsftpd
+xinetd-cn xinetd	
+monit-cn
+munin-cn
+ossec-hids-cn
+amavis-stats-cn
+webalizer-cn
 '
 
 # We want to remove these packages, used in remove_bloat()
 # nice name		packages to remove
 bloats='
-Abiword			abiword-common
-Emacs i XEmacs		emacsen-common
-Gimp			gimp1.2
-Gnome			gnome-common libgnome2-common libgnome32
-KDE			kdelibs3 kdelibs4 kdebase-doc kdelibs3-doc kdevelop-doc
-Wine			libwine wine-doc
+Autoconf	autoconf-cn autoconf
+Automake	automake-cn automake autotools-dev
+Bison		bison-cn bison
+CVS		cvs-cn cvs
+Expect		expect-cn expect
+GCC		gcc-2.95-cn gcc-2.95 g++-2.95 gcc-2.95-doc gcc-cn gcc g++ gcc-doc gcc-misc-cn gobjc gpc gcj gij chill g77
+GDB		gdb-cn gdb
+Gettext		gettext-cn gettext
+Make		make-cn make
+Nessus		nessus-cn nessus nessusd
 '
 # php4-gd -> libgd1 -> xlibs -> xfree86-common -> suxx
 #X Window System		xfree86-common
diff --git a/usr/share/carnet-upgrade/functions.sh b/usr/share/carnet-upgrade/functions.sh
index 4c89f36..7fb574e 100644
--- a/usr/share/carnet-upgrade/functions.sh
+++ b/usr/share/carnet-upgrade/functions.sh
@@ -241,11 +241,11 @@ run_actions() {
 what_upgrade () {
   local IFSOLD name version package
 
-  for package in `echo "$needed_woody_versions" | awk '{print $1}'| grep -v ^$`; do
+  for package in `echo "$needed_versions" | awk '{print $1}'| grep -v ^$`; do
     IFSOLD="$IFS"
     IFS="	" # tab
     read name version <<-EOPTS
-	$(echo "$needed_woody_versions" | sed 's/		*/	/g' | grep ^$package)
+	$(echo "$needed_versions" | sed 's/		*/	/g' | grep ^$package)
 	EOPTS
     IFS="$IFSOLD"
     if pkg "$name" lt "$version"; then
diff --git a/usr/share/carnet-upgrade/messages.sh b/usr/share/carnet-upgrade/messages.sh
index 18001ef..7621d61 100644
--- a/usr/share/carnet-upgrade/messages.sh
+++ b/usr/share/carnet-upgrade/messages.sh
@@ -1,6 +1,6 @@
 ###
 # dialog stuff
-title="CARNet upgrade Woody->Sarge"
+title="CARNet upgrade Sarge->Etch"
 
 msg_first_warning="PAZNJA! PAZNJA!
 Pokrenuli ste proceduru nadogradnje CARNet Linux distribucije.\
@@ -52,16 +52,16 @@ Koristenje: $(basename $0) [<akcija>] | -h | --help
 
 <akcija> moze biti:
   - main 
-         izvrsava potpunu proceduru za upgrade sa CARNet Debian 1.x (woody)
-         na CARNet Debian 2.x (sarge) distribuciju.  Ovo je pretpostavljena
+         izvrsava potpunu proceduru za upgrade sa CARNet Debian 2.x (sarge)
+         na CARNet Debian 3.x (etch) distribuciju.  Ovo je pretpostavljena
          vrijednost.
          
   - post_upgrade
          izvrsava samo one akcije iz procedure za upgrade koje dolaze
          nakon apt-get dist-upgrade.
 
-  - sarge
-         izvrsava akcije podobne za CARNet Debian 2.x (sarge) instalaciju.
+  - etch
+         izvrsava akcije podobne za CARNet Debian 3.x (etch) instalaciju.
          
   - new
          izvrsava samo akcije koje su dodane u ovoj inacici.