summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-07-11 18:59:27 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-07-11 18:59:27 +0200
commit941a9e3b8de513e4d2dbdfaec253b449f0d3d607 (patch)
tree894f8d4c658dd89d1ea1d18eb2dc4dcc86c1bf10
parenta3e98678b8df1d8bd9d4509bc629c012fe507878 (diff)
downloadtde-packaging-941a9e3b8de513e4d2dbdfaec253b449f0d3d607.tar.gz
tde-packaging-941a9e3b8de513e4d2dbdfaec253b449f0d3d607.zip
Change klaptopdamon setupHandler to use dpkg on Debian and Ubuntu
-rw-r--r--debian/lenny/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff35
-rw-r--r--debian/squeeze/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff35
-rw-r--r--ubuntu/maverick/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff35
3 files changed, 105 insertions, 0 deletions
diff --git a/debian/lenny/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff b/debian/lenny/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
new file mode 100644
index 000000000..a794f17ff
--- /dev/null
+++ b/debian/lenny/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 {
diff --git a/debian/squeeze/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff b/debian/squeeze/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
new file mode 100644
index 000000000..a794f17ff
--- /dev/null
+++ b/debian/squeeze/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 {
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 {