From: Dennis Groenen <tj.groenen@gmail.com>
Date: Thu, 20 Sep 2012 16:55:16 +0000 (+0200)
Subject: remove workaround for bug 5317
X-Git-Tag: 1.20.2power2~1
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=7aa6ae1025dbcc882c47126561e8fa09dfc0f0c7;hp=6e15aba5c330236e0d5691b8571af67802d89daf;p=busybox-power

remove workaround for bug 5317
---

diff --git a/debian/busybox-power.postinst b/debian/busybox-power.postinst
index 74c57df..d900083 100644
--- a/debian/busybox-power.postinst
+++ b/debian/busybox-power.postinst
@@ -3,12 +3,6 @@ set -e
 
 /opt/busybox-power/busybox.power sh /opt/busybox-power/install-binary.sh
 
-# Workaround for bug 5317
-line="trap exit SIGHUP #by busybox-power"
-if ! grep -F -q "$line" /etc/profile; then
-  echo "$line" >> /etc/profile
-fi
-
 # Clean up conffile (from busybox-power 1.19.3power4 & 1.19.3power5)
 if test -e /etc/environment; then
   ORIGCONFIG_MD5="d23caa13476e0d872d23e7290b52f544"
diff --git a/debian/busybox-power.prerm b/debian/busybox-power.prerm
index 74a9f95..9d2978d 100644
--- a/debian/busybox-power.prerm
+++ b/debian/busybox-power.prerm
@@ -3,6 +3,10 @@ set -e
 
 sh /opt/busybox-power/uninstall-binary.sh
 
+# Clean up trap (from busybox-power <= 1.20.2power1)
+# Should be removed by the old prerm, but may be left behind when that one fails
+# and dpkg uses this one instead. Therefore, keep this cleanup included for a 
+# few busybox-power releases.
 line="trap exit SIGHUP #by busybox-power"
 if grep -F -q "$line" /etc/profile; then
   sed "/$line/d" /etc/profile > /tmp/profile.sed