X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;f=src%2Fdata.sh;h=fe7114aa33e9e27ca6ec55c1538ea79d563be721;hb=2ca0dbd0c6c05c77ff6b438ac1183c609c36caa6;hp=8bd40388d130c583789a5894685ee131898686f9;hpb=a23afa2a6cd0f080bd80d3d02bcfe37684039b4d;p=carnet-upgrade.git

diff --git a/src/data.sh b/src/data.sh
index 8bd4038..fe7114a 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -12,7 +12,7 @@ apache2-cn	2.2-5lenny1
 bind9-cn	2:9.5.1-3
 carnet-tools-cn	2.8.3
 clamav-cn	3:0.95.3-1lenny1
-debian-archive-keyring	2010.08.28
+debian-archive-keyring	2010.08.28~lenny1
 dovecot-cn	1:1.0.15-2lenny2
 fail2ban-cn	0.8.3-2lenny1
 freeradius-aai	1.1.7-2
@@ -42,7 +42,7 @@ packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-squeeze/main/binar
 # Packages to forcibly install before installing the rest with dist-upgrade,
 # because dist-upgrade would rather remove or keep them back them.
 packages_first='
-libkrb5-17-heimdal postgresql-client unixodbc iptables oidentd libpam-modules procps base-passwd
+libkrb5-17-heimdal postgresql-client unixodbc iptables oidentd libpam-modules procps base-passwd dhcp3-client
 '
 
 # Packages that provide crucial services, upgrade them before the rest
@@ -112,8 +112,12 @@ xinetd-cn xinetd
 
 # simulate deborphan
 orphaned_packages='
-libsnmp9
 libsensors3
+diff
+libcompress-zlib-perl
+dhcp3-client
+dhcp3-common
+mktemp
 '
 
 # new packages to be installed