debian packaging: always reset superuser info on removal

diff --git a/debian/tvheadend.config b/debian/tvheadend.config
index 50da19160e68a11b85db61f660af21c36f0e2218..3c236bab575b18397739141de93fd665d1828de7 100644 (file)
--- a/debian/tvheadend.config
+++ b/debian/tvheadend.config
@@ -22,7 +22,7 @@ while [ "$STATE" != 0 -a "$STATE" != 4 ]; do
 
     3)
         # Display a final note
-       db_input high tvheadend/webinterface || true
+       db_input high tvheadend/last_notes || true
     ;;
     esac
 

diff --git a/debian/tvheadend.postrm b/debian/tvheadend.postrm
index 51d32b421f3a0d01dd4e354c11bb868c6c833c6c..e6ada61dd3f531ee3fed18ba59c938c74c874663 100644 (file)
--- a/debian/tvheadend.postrm
+++ b/debian/tvheadend.postrm
@@ -11,14 +11,19 @@ purge)
         HTS_HOME=`getent passwd $HTS_USER | cut -d':' -f6`
         rm -rf "${HTS_HOME}/.hts/tvheadend"
     fi
-    if db_get tvheadend/admin_username; then
-       db_reset tvheadend/admin_username;
-    fi
-
-    if db_get tvheadend/admin_password; then
-       db_reset tvheadend/admin_password;
-    fi
    ;;
 esac
 
+if db_get tvheadend/admin_username; then
+    db_reset tvheadend/admin_username;
+fi
+
+if db_get tvheadend/admin_password; then
+    db_reset tvheadend/admin_password;
+fi
+
+if db_get tvheadend/last_notes; then
+    db_reset tvheadend/last_notes;
+fi
+
 exit 0

diff --git a/debian/tvheadend.templates b/debian/tvheadend.templates
index 2e5a650c714a35f4373bbfad5a5f26143ce481d7..a28482ea261fec40583e1338d1b081a9c0ebfda5 100644 (file)
--- a/debian/tvheadend.templates
+++ b/debian/tvheadend.templates
@@ -12,6 +12,7 @@ Template: tvheadend/admin_password
 Type: password
 Description: Administrator password.
 
-Template: tvheadend/webinterface
+Template: tvheadend/last_notes
 Type: note
-Description: After installation Tvheadend can be accessed via HTTP on port 9981. From this machine you can point your web-browser to http://localhost:9981/
+Description: After installation Tvheadend can be accessed via HTTP on port 9981. From this machine you can point your web-browser to http://localhost:9981/.
+ If you want to completely remove configuration, use your package manager's --purge option, e.g, apt-get remove --purge tvheadend*