summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdenetwork/debian
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2013-07-21 12:42:38 +0200
committerFrançois Andriot <[email protected]>2013-07-21 12:42:38 +0200
commitd2a5ae6eee8f77ba301f22a990fd68944c94d4ad (patch)
tree0bdfdcb57898584e87d89ab3a0172d5b6ce28ce6 /ubuntu/maverick/tdenetwork/debian
parent65166dbf185e59a4f874392b40c7f974e7ae5fb8 (diff)
parent0657be6a3626991da456db3946ed1ec316ce6fb7 (diff)
downloadtde-packaging-d2a5ae6eee8f77ba301f22a990fd68944c94d4ad.tar.gz
tde-packaging-d2a5ae6eee8f77ba301f22a990fd68944c94d4ad.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdenetwork/debian')
-rw-r--r--ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdenetwork/debian/kopete-trinity.menu2
-rw-r--r--ubuntu/maverick/tdenetwork/debian/kppp-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdenetwork/debian/ksirc-trinity.menu2
-rw-r--r--ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.lintian6
6 files changed, 12 insertions, 12 deletions
diff --git a/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.lintian b/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.lintian
index c7c412887..566329697 100644
--- a/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.lintian
+++ b/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.lintian
@@ -1 +1 @@
-knewsticker: menu-command-not-in-package /opt/trinity/lib/menu/knewsticker:8 /opt/trinity/bin/appletproxy
+knewsticker-trinity: menu-command-not-in-package /opt/trinity/lib/menu/knewsticker:8 /opt/trinity/bin/appletproxy
diff --git a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.menu b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.menu
index 4f809de8d..b74f7ab77 100644
--- a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.menu
+++ b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.menu
@@ -1,7 +1,7 @@
?package(kopete):\
needs="X11"\
section="Apps/Net"\
- hints="KDE,IM"\
+ hints="TDE,IM"\
title="Kopete"\
icon32x32="/opt/trinity/share/pixmaps/kopete.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kopete-16.xpm"\
diff --git a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.lintian b/ubuntu/maverick/tdenetwork/debian/kppp-trinity.lintian
index 58308748b..5a3a22357 100644
--- a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.lintian
+++ b/ubuntu/maverick/tdenetwork/debian/kppp-trinity.lintian
@@ -1,3 +1,3 @@
-kppp: setuid-binary opt/trinity/bin/kppp 4754 root/dip
-kppp: non-standard-executable-perm opt/trinity/bin/kppplogview 0754 != 0755
-kppp: non-standard-file-perm etc/ppp/peers/kppp-options 0640 != 0644
+kppp-trinity: setuid-binary opt/trinity/bin/kppp 4754 root/dip
+kppp-trinity: non-standard-executable-perm opt/trinity/bin/kppplogview 0754 != 0755
+kppp-trinity: non-standard-file-perm etc/ppp/peers/kppp-options 0640 != 0644
diff --git a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian b/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian
index 265515419..f219b1176 100644
--- a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian
+++ b/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1,3 @@
-ksirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
-ksirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
-ksirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
diff --git a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.menu b/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.menu
index 7d0ac36b3..1ae203b55 100644
--- a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.menu
+++ b/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.menu
@@ -1,7 +1,7 @@
?package(ksirc):\
needs="X11"\
section="Apps/Net"\
- hints="KDE,IRC"\
+ hints="TDE,IRC"\
title="KSirc"\
icon32x32="/opt/trinity/share/pixmaps/ksirc.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksirc-16.xpm"\
diff --git a/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.lintian b/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.lintian
index c953beb6c..1586f0f0a 100644
--- a/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.lintian
+++ b/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.lintian
@@ -1,3 +1,3 @@
-kwifimanager: no-shlibs-control-file opt/trinity/lib/libkwireless.so
-kwifimanager: postinst-must-call-ldconfig opt/trinity/lib/libkwireless.so
-kwifimanager: postrm-should-call-ldconfig opt/trinity/lib/libkwireless.so
+kwifimanager-trinity: no-shlibs-control-file opt/trinity/lib/libkwireless.so
+kwifimanager-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkwireless.so
+kwifimanager-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkwireless.so