From: Valentin Vidic <vvidic@carnet.hr>
Date: Fri, 11 Jan 2008 09:23:34 +0000 (+0100)
Subject: Changed names of debconf templates to match package name.
X-Git-Tag: debian/4.0.1~80
X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=commitdiff_plain;h=c45a2c532414ceebe73d11d03a8857167c0cbd69;p=carnet-upgrade.git

Changed names of debconf templates to match package name.
---

diff --git a/debian/postinst b/debian/postinst
index b182185..6515061 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -31,6 +31,15 @@ case "$1" in
     ;;
 esac
 
+# clear old cached values
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt 4.0; then
+    if [ -e /usr/share/debconf/confmodule ]; then
+        . /usr/share/debconf/confmodule
+        db_set carnet-upgrade/debconf-priority ""
+        db_set carnet-upgrade/check-services   ""
+    fi    
+fi
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 
diff --git a/debian/templates b/debian/templates
index b48f309..37be75c 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,9 +1,9 @@
-Template: cn-upgrade/debconf-priority
+Template: carnet-upgrade/debconf-priority
 Type: string
 Description: Backup of debconf/priority
  Backup of debconf/priority
 
-Template: cn-upgrade/check-services
+Template: carnet-upgrade/check-services
 Type: string
 Description: Check services
  Check services
diff --git a/src/scripts/check_services b/src/scripts/check_services
index ee5a9e6..3780f23 100755
--- a/src/scripts/check_services
+++ b/src/scripts/check_services
@@ -26,7 +26,7 @@ cs_preupgrade () {
   done
 
   if [ -n "$services" ]; then
-    db_set cn-upgrade/check-services "$services"
+    db_set carnet-upgrade/check-services "$services"
     db_go || true
   fi
 }
@@ -62,7 +62,7 @@ cs_postupgrade () {
       ;;
   esac
 
-  db_get cn-upgrade/check-services || true
+  db_get carnet-upgrade/check-services || true
   services="${RET// /|}"
 
   failed_services=$(
@@ -81,7 +81,7 @@ cs_postupgrade () {
 
 # checkiraj da li je sto zapisano u debconf
 cs_check () {
-  db_get cn-upgrade/check-services || true
+  db_get carnet-upgrade/check-services || true
   debconf="$RET"
 
   if [ -n "$debconf" ]; then
diff --git a/src/scripts/debconf_priority b/src/scripts/debconf_priority
index 028b445..f7809c9 100755
--- a/src/scripts/debconf_priority
+++ b/src/scripts/debconf_priority
@@ -15,7 +15,7 @@ debconf_priority_preupgrade () {
   old_debconf="$RET"
 
   if [ -n "$old_debconf" ]; then
-    db_set cn-upgrade/debconf-priority "$old_debconf"
+    db_set carnet-upgrade/debconf-priority "$old_debconf"
   fi
 
   db_set debconf/priority high
@@ -27,12 +27,12 @@ debconf_priority_preupgrade () {
 debconf_priority_postupgrade () {
   local new_debconf
 
-  db_get cn-upgrade/debconf-priority || true
+  db_get carnet-upgrade/debconf-priority || true
   new_debconf="$RET"
 
   if [ -n "$new_debconf" ]; then
     db_set debconf/priority "$new_debconf"
-    db_set cn-upgrade/debconf-priority ""
+    db_set carnet-upgrade/debconf-priority ""
   fi
 
   db_go || true
@@ -40,7 +40,7 @@ debconf_priority_postupgrade () {
 
 # checkiraj
 debconf_priority_check () {
-  db_get cn-upgrade/debconf-priority || true
+  db_get carnet-upgrade/debconf-priority || true
   debconf="$RET"
 
   if [ -n "$debconf" ]; then