From 566be0ad500289e58ba6ecb0ac5279f7c0dcf759 Mon Sep 17 00:00:00 2001
From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Tue, 22 Jul 2008 13:15:43 +0200
Subject: [PATCH] Release version 4.0.5.

---
 debian/changelog        |    7 +++++++
 doc/carnet-upgrade.sgml |    2 +-
 src/cn-upgrade          |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee5dc5b..4de9b01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+carnet-upgrade (4.0.5) stable; urgency=low
+
+  * Make sure /etc/init.d/amavis diversion is preserved.
+  * Upgrade config files before kernel-2.6-cn gets them.
+
+ -- Valentin Vidic <Valentin.Vidic@CARNet.hr>  Tue, 22 Jul 2008 11:55:33 +0200
+
 carnet-upgrade (4.0.4) stable; urgency=low
 
   * Fix parsing of apt-get download size.
diff --git a/doc/carnet-upgrade.sgml b/doc/carnet-upgrade.sgml
index 49285b9..5238dd9 100644
--- a/doc/carnet-upgrade.sgml
+++ b/doc/carnet-upgrade.sgml
@@ -8,7 +8,7 @@
         <name>Grupa za izradu paketa</name>
         <email>paketi@carnet.hr</email>
       </author>
-      <version>Verzija 4.0.4</version>
+      <version>Verzija 4.0.5</version>
 
       <abstract>
         CARNet Debian <em>etch</em> je treća generacija CARNet Debian
diff --git a/src/cn-upgrade b/src/cn-upgrade
index 0083b51..173a9b7 100755
--- a/src/cn-upgrade
+++ b/src/cn-upgrade
@@ -2,7 +2,7 @@
 # last update: 2005-01-07
 # Zoran 'jelly' Dzelajlija <jelly@srce.hr>
 # Ivan 'ico' Rako <irako@srce.hr>
-version="carnet-upgrade v4.0.4"
+version="carnet-upgrade v4.0.5"
 
 # restart upgrade under script for logging purposes
 if [ "$1" == "--no-script" ]; then
-- 
1.7.10.4