From: Tuomo Tanskanen <tumi@tumi.fi>
Date: Mon, 28 Dec 2009 11:35:11 +0000 (+0200)
Subject: optified, fixed uninstall issue
X-Git-Tag: v0.3-0
X-Git-Url: http://git.maemo.org/git/?p=cell-modem-ui;a=commitdiff_plain;h=refs%2Ftags%2Fv0.3-0

optified, fixed uninstall issue
---

diff --git a/cell-modem-ui/debian/cell-modem-ui.install b/cell-modem-ui/debian/cell-modem-ui.install
index 376a032..bb92e74 100644
--- a/cell-modem-ui/debian/cell-modem-ui.install
+++ b/cell-modem-ui/debian/cell-modem-ui.install
@@ -1 +1 @@
-etc/systemui/*
+opt/cell-modem-ui/*
diff --git a/cell-modem-ui/debian/cell-modem-ui.postinst b/cell-modem-ui/debian/cell-modem-ui.postinst
new file mode 100644
index 0000000..4f970e9
--- /dev/null
+++ b/cell-modem-ui/debian/cell-modem-ui.postinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+case "$1" in
+    configure)
+    if [ -e /etc/systemui/cell-modem-ui.xml ]; then
+      rm -f /etc/systemui/cell-modem-ui.xml
+    fi
+    ln -s /opt/cell-modem-ui/cell-modem-ui.xml /etc/systemui/cell-modem-ui.xml 
+    ;;
+
+    *)
+    ;;
+esac
+
diff --git a/cell-modem-ui/debian/cell-modem-ui.postrm b/cell-modem-ui/debian/cell-modem-ui.postrm
deleted file mode 100644
index 535e466..0000000
--- a/cell-modem-ui/debian/cell-modem-ui.postrm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rm -f /etc/systemui/cell-modem-ui.xml
diff --git a/cell-modem-ui/debian/cell-modem-ui.prerm b/cell-modem-ui/debian/cell-modem-ui.prerm
new file mode 100644
index 0000000..535e466
--- /dev/null
+++ b/cell-modem-ui/debian/cell-modem-ui.prerm
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rm -f /etc/systemui/cell-modem-ui.xml
diff --git a/cell-modem-ui/debian/changelog b/cell-modem-ui/debian/changelog
index 8f7a499..5ffe084 100644
--- a/cell-modem-ui/debian/changelog
+++ b/cell-modem-ui/debian/changelog
@@ -1,10 +1,8 @@
-cell-modem-ui (0.3-1) unstable; urgency=low
+cell-modem-ui (0.3-0) unstable; urgency=low
 
-  * Added postrm script to remove files installed in /etc
-    as normally they're considered as config and are only
-    removed when purged, not when uninstalled.
-    This fixed uninstall issue sometimes experienced.
+  * Fixed uninstall issue sometimes experienced
   * Fixed XB-Maemo-Display-Name to be shorter
+  * Optified
 
  -- Tuomo Tanskanen <tumi@tumi.fi>  Sun, 27 Dec 2009 18:44:35 +0200
 
diff --git a/cell-modem-ui/debian/rules b/cell-modem-ui/debian/rules
index d1acf3e..eec4bbb 100755
--- a/cell-modem-ui/debian/rules
+++ b/cell-modem-ui/debian/rules
@@ -40,8 +40,9 @@ install: build
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	mkdir -p $(CURDIR)/debian/tmp/etc/systemui/
-	cp $(CURDIR)/etc/systemui/*.xml $(CURDIR)/debian/tmp/etc/systemui/
+	#mkdir -p $(CURDIR)/debian/tmp/etc/systemui
+	mkdir -p $(CURDIR)/debian/tmp/opt/cell-modem-ui
+	cp $(CURDIR)/etc/systemui/*.xml $(CURDIR)/debian/tmp/opt/cell-modem-ui/
 
 binary-indep: build install