summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-29 15:07:49 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-29 15:07:49 +0200
commit96cd6c807c759c0aa9a42d4b8a2c4e65e9465c27 (patch)
tree3435e9e11db943d9da641af2c9a2f0e210009dd4
parent08239218fe4a7b455a4ae58d9ba25586ccc46e06 (diff)
downloadtde-packaging-96cd6c807c759c0aa9a42d4b8a2c4e65e9465c27.tar.gz
tde-packaging-96cd6c807c759c0aa9a42d4b8a2c4e65e9465c27.zip
Refresh patches for kvpnc on Debian and Ubuntu
This resolves Bug 1531
-rw-r--r--debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff12
-rw-r--r--debian/lenny/applications/kvpnc/debian/patches/series2
-rw-r--r--debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff12
-rw-r--r--debian/squeeze/applications/kvpnc/debian/patches/series2
-rw-r--r--debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff12
-rw-r--r--debian/wheezy/applications/kvpnc/debian/patches/series2
-rw-r--r--ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff12
-rw-r--r--ubuntu/maverick/applications/kvpnc/debian/patches/series2
-rw-r--r--ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff12
-rw-r--r--ubuntu/precise/applications/kvpnc/debian/patches/series2
-rw-r--r--ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff12
-rw-r--r--ubuntu/raring/applications/kvpnc/debian/patches/series2
12 files changed, 42 insertions, 42 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 826d4e236..0729793b7 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
@@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644
}
else
{
--// if (getenv("USER") != "root")
+-// if (getenv("USER") != TQString("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);
-+ }
++ if (getenv("USER") != TQString("root"))
++ {
++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
++ exit(0);
++ }
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/debian/lenny/applications/kvpnc/debian/patches/series b/debian/lenny/applications/kvpnc/debian/patches/series
index 09040ada9..d29c3ca91 100644
--- a/debian/lenny/applications/kvpnc/debian/patches/series
+++ b/debian/lenny/applications/kvpnc/debian/patches/series
@@ -1,2 +1,2 @@
-10_su-to-root_usage.diff
+# 10_su-to-root_usage.diff
13_add_kuser_issuperuser.diff
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 826d4e236..0729793b7 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
@@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644
}
else
{
--// if (getenv("USER") != "root")
+-// if (getenv("USER") != TQString("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);
-+ }
++ if (getenv("USER") != TQString("root"))
++ {
++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
++ exit(0);
++ }
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/debian/squeeze/applications/kvpnc/debian/patches/series b/debian/squeeze/applications/kvpnc/debian/patches/series
index 09040ada9..d29c3ca91 100644
--- a/debian/squeeze/applications/kvpnc/debian/patches/series
+++ b/debian/squeeze/applications/kvpnc/debian/patches/series
@@ -1,2 +1,2 @@
-10_su-to-root_usage.diff
+# 10_su-to-root_usage.diff
13_add_kuser_issuperuser.diff
diff --git a/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index 826d4e236..0729793b7 100644
--- a/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644
}
else
{
--// if (getenv("USER") != "root")
+-// if (getenv("USER") != TQString("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);
-+ }
++ if (getenv("USER") != TQString("root"))
++ {
++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
++ exit(0);
++ }
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/debian/wheezy/applications/kvpnc/debian/patches/series b/debian/wheezy/applications/kvpnc/debian/patches/series
index 09040ada9..d29c3ca91 100644
--- a/debian/wheezy/applications/kvpnc/debian/patches/series
+++ b/debian/wheezy/applications/kvpnc/debian/patches/series
@@ -1,2 +1,2 @@
-10_su-to-root_usage.diff
+# 10_su-to-root_usage.diff
13_add_kuser_issuperuser.diff
diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index 826d4e236..0729793b7 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644
}
else
{
--// if (getenv("USER") != "root")
+-// if (getenv("USER") != TQString("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);
-+ }
++ if (getenv("USER") != TQString("root"))
++ {
++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
++ exit(0);
++ }
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/series b/ubuntu/maverick/applications/kvpnc/debian/patches/series
index 09040ada9..d29c3ca91 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/patches/series
+++ b/ubuntu/maverick/applications/kvpnc/debian/patches/series
@@ -1,2 +1,2 @@
-10_su-to-root_usage.diff
+# 10_su-to-root_usage.diff
13_add_kuser_issuperuser.diff
diff --git a/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index 826d4e236..0729793b7 100644
--- a/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644
}
else
{
--// if (getenv("USER") != "root")
+-// if (getenv("USER") != TQString("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);
-+ }
++ if (getenv("USER") != TQString("root"))
++ {
++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
++ exit(0);
++ }
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/ubuntu/precise/applications/kvpnc/debian/patches/series b/ubuntu/precise/applications/kvpnc/debian/patches/series
index 09040ada9..d29c3ca91 100644
--- a/ubuntu/precise/applications/kvpnc/debian/patches/series
+++ b/ubuntu/precise/applications/kvpnc/debian/patches/series
@@ -1,2 +1,2 @@
-10_su-to-root_usage.diff
+# 10_su-to-root_usage.diff
13_add_kuser_issuperuser.diff
diff --git a/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index 826d4e236..0729793b7 100644
--- a/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644
}
else
{
--// if (getenv("USER") != "root")
+-// if (getenv("USER") != TQString("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);
-+ }
++ if (getenv("USER") != TQString("root"))
++ {
++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
++ exit(0);
++ }
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/ubuntu/raring/applications/kvpnc/debian/patches/series b/ubuntu/raring/applications/kvpnc/debian/patches/series
index 09040ada9..d29c3ca91 100644
--- a/ubuntu/raring/applications/kvpnc/debian/patches/series
+++ b/ubuntu/raring/applications/kvpnc/debian/patches/series
@@ -1,2 +1,2 @@
-10_su-to-root_usage.diff
+# 10_su-to-root_usage.diff
13_add_kuser_issuperuser.diff