Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

1 files changed, 35 insertions, 0 deletions

diff --git a/ubuntu/maverick/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff b/ubuntu/maverick/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
new file mode 100644
index 000000000..a794f17ff
--- /dev/null
+++ b/ubuntu/maverick/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
@@ -0,0 +1,35 @@
+diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
+index 4dfb247..cd8f4b0 100644
+--- a/klaptopdaemon/acpi.cpp
++++ b/klaptopdaemon/acpi.cpp
+@@ -178,7 +178,7 @@ void AcpiConfig::setupHelper()
+ 			proc << tdesu;
+ 			proc << "-u";
+ 			proc << "root";
+-			proc <<  "chown root "+helper+"; chmod +s "+helper;
++			proc <<  "dpkg-statoverride --update --add root root 6755 "+helper;
+ 			proc.start(KProcess::Block);	// run it sync so has_acpi below sees the results
+ 		}
+ 	} else {
+diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
+index 9de0c85..e348943 100644
+--- a/klaptopdaemon/apm.cpp
++++ b/klaptopdaemon/apm.cpp
+@@ -166,7 +166,7 @@ void ApmConfig::setupHelper()
+ 			proc << tdesu;
+ 			proc << "-u";
+ 			proc << "root";
+-			proc <<  TQString("chown root ")+apm_name+TQString("; chmod +s ")+apm_name;
++			proc <<  TQString("dpkg-statoverride --update --add root root 6755 ")+apm_name;
+ 			proc.start(KProcess::Block);	// run it sync so has_apm below sees the results
+ 		}
+ 	} else {
+@@ -200,7 +200,7 @@ void ApmConfig::setupHelper2()	// we use the acpi helper to do software suspend
+ 			proc << tdesu;
+ 			proc << "-u";
+ 			proc << "root";
+-			proc <<  "chown root "+helper+"; chmod +s "+helper;
++			proc <<  "dpkg-statoverride --update --add root root 6755 "+helper;
+ 			proc.start(KProcess::Block);	// run it sync so has_acpi below sees the results
+ 		}
+ 	} else {