summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-06 18:06:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-06 18:06:32 -0600
commit3a09ccd89c3a627b3468bda68d0f621c9aa9bb41 (patch)
tree2c7129cd753f42af99b69024f5cff5b734ab01aa /debian
parent66b1ad31f7abb8603003f48c72b42c2bb34de816 (diff)
downloadtde-packaging-3a09ccd89c3a627b3468bda68d0f621c9aa9bb41.tar.gz
tde-packaging-3a09ccd89c3a627b3468bda68d0f621c9aa9bb41.zip
Fix kvpnc patch 13
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff29
-rw-r--r--debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff29
2 files changed, 34 insertions, 24 deletions
diff --git a/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index d7abf1b8f..70fd0192e 100644
--- a/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -1,3 +1,5 @@
+diff --git a/src/main.cpp b/src/main.cpp
+index 7c45fcf..b933832 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,6 +24,7 @@
@@ -8,17 +10,20 @@
#include <klocale.h>
#include <dcopclient.h>
-@@ -129,7 +130,12 @@
- // KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
- // exit(0);
- // }
--
-+ if (!KUser().isSuperUser())
-+ {
-+ KMessageBox::error( 0L, i18n( "Kvpnc must be started as root!" ) );
+@@ -134,11 +135,11 @@ int main ( int argc, char *argv[] )
+ }
+ else
+ {
+-// if (getenv("USER") != "root")
+-// {
+-// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
+-// exit(0);
+-// }
++ if (getenv("USER") != "root")
++ {
++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
+ exit(0);
-+ }
-+
++ }
+
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
- a.setMainWidget( kvpnc );
+
diff --git a/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index d7abf1b8f..70fd0192e 100644
--- a/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -1,3 +1,5 @@
+diff --git a/src/main.cpp b/src/main.cpp
+index 7c45fcf..b933832 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,6 +24,7 @@
@@ -8,17 +10,20 @@
#include <klocale.h>
#include <dcopclient.h>
-@@ -129,7 +130,12 @@
- // KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
- // exit(0);
- // }
--
-+ if (!KUser().isSuperUser())
-+ {
-+ KMessageBox::error( 0L, i18n( "Kvpnc must be started as root!" ) );
+@@ -134,11 +135,11 @@ int main ( int argc, char *argv[] )
+ }
+ else
+ {
+-// if (getenv("USER") != "root")
+-// {
+-// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
+-// exit(0);
+-// }
++ if (getenv("USER") != "root")
++ {
++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
+ exit(0);
-+ }
-+
++ }
+
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
- a.setMainWidget( kvpnc );
+