From 09baa28aa4748c02ca157089cac90ed45c767dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 20 Jul 2013 04:24:36 +0200 Subject: Fix lintian overrides on Debian and Ubuntu --- ubuntu/raring/tdebase/debian/kate-trinity.lintian | 4 ++-- ubuntu/raring/tdebase/debian/kcontrol-trinity.lintian | 6 +++--- ubuntu/raring/tdebase/debian/kdesktop-trinity.lintian | 2 +- ubuntu/raring/tdebase/debian/khelpcenter-trinity.lintian | 6 +++--- ubuntu/raring/tdebase/debian/kicker-trinity.lintian | 6 +++--- ubuntu/raring/tdebase/debian/klipper-trinity.lintian | 6 +++--- ubuntu/raring/tdebase/debian/kmenuedit-trinity.lintian | 8 ++++---- ubuntu/raring/tdebase/debian/konqueror-trinity.lintian | 6 +++--- ubuntu/raring/tdebase/debian/konsole-trinity.lintian | 6 +++--- ubuntu/raring/tdebase/debian/ksmserver-trinity.lintian | 4 ++-- ubuntu/raring/tdebase/debian/tdebase-trinity-bin.lintian | 12 ++++++------ ubuntu/raring/tdebase/debian/tdeprint-trinity.lintian | 8 ++++---- ubuntu/raring/tdebase/debian/twin-trinity.lintian | 4 ++-- 13 files changed, 39 insertions(+), 39 deletions(-) (limited to 'ubuntu/raring/tdebase') diff --git a/ubuntu/raring/tdebase/debian/kate-trinity.lintian b/ubuntu/raring/tdebase/debian/kate-trinity.lintian index 0ad1f24b6..d6a673d2f 100644 --- a/ubuntu/raring/tdebase/debian/kate-trinity.lintian +++ b/ubuntu/raring/tdebase/debian/kate-trinity.lintian @@ -1,2 +1,2 @@ -kate: shlib-missing-in-control-file libtdeinit_kwrite.so usr/lib/libtdeinit_kwrite.so -kate: shlib-missing-in-control-file libtdeinit_kate.so usr/lib/libtdeinit_kate.so +kate-trinity: shlib-missing-in-control-file libtdeinit_kwrite.so opt/trinity/lib/libtdeinit_kwrite.so +kate-trinity: shlib-missing-in-control-file libtdeinit_kate.so opt/trinity/lib/libtdeinit_kate.so diff --git a/ubuntu/raring/tdebase/debian/kcontrol-trinity.lintian b/ubuntu/raring/tdebase/debian/kcontrol-trinity.lintian index a1120501f..95c1d8196 100644 --- a/ubuntu/raring/tdebase/debian/kcontrol-trinity.lintian +++ b/ubuntu/raring/tdebase/debian/kcontrol-trinity.lintian @@ -1,3 +1,3 @@ -kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so -kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so -kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so +kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kaccess.so opt/trinity/lib/libtdeinit_kaccess.so +kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kcontrol.so opt/trinity/lib/libtdeinit_kcontrol.so +kcontrol-trinity: shlib-missing-in-control-file libtdeinit_tderandrinithack.so opt/trinity/lib/libtdeinit_tderandrinithack.so diff --git a/ubuntu/raring/tdebase/debian/kdesktop-trinity.lintian b/ubuntu/raring/tdebase/debian/kdesktop-trinity.lintian index 478f4fbc8..caf101636 100644 --- a/ubuntu/raring/tdebase/debian/kdesktop-trinity.lintian +++ b/ubuntu/raring/tdebase/debian/kdesktop-trinity.lintian @@ -1 +1 @@ -kdesktop: no-shlibs-control-file usr/lib/libtdeinit_kdesktop.so +kdesktop-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kdesktop.so diff --git a/ubuntu/raring/tdebase/debian/khelpcenter-trinity.lintian b/ubuntu/raring/tdebase/debian/khelpcenter-trinity.lintian index 44eb5fc11..3a278bff7 100644 --- a/ubuntu/raring/tdebase/debian/khelpcenter-trinity.lintian +++ b/ubuntu/raring/tdebase/debian/khelpcenter-trinity.lintian @@ -1,3 +1,3 @@ -khelpcenter: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so -khelpcenter: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so -khelpcenter: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so +khelpcenter-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khelpcenter.so +khelpcenter-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so +khelpcenter-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so diff --git a/ubuntu/raring/tdebase/debian/kicker-trinity.lintian b/ubuntu/raring/tdebase/debian/kicker-trinity.lintian index f600f5d82..9f6cb2e4d 100644 --- a/ubuntu/raring/tdebase/debian/kicker-trinity.lintian +++ b/ubuntu/raring/tdebase/debian/kicker-trinity.lintian @@ -1,3 +1,3 @@ -kicker: shlib-missing-in-control-file libtdeinit_extensionproxy.so usr/lib/libtdeinit_extensionproxy.so -kicker: shlib-missing-in-control-file libtdeinit_kicker.so usr/lib/libtdeinit_kicker.so -kicker: shlib-missing-in-control-file libtdeinit_appletproxy.so usr/lib/libtdeinit_appletproxy.so +kicker-trinity: shlib-missing-in-control-file libtdeinit_extensionproxy.so opt/trinity/lib/libtdeinit_extensionproxy.so +kicker-trinity: shlib-missing-in-control-file libtdeinit_kicker.so opt/trinity/lib/libtdeinit_kicker.so +kicker-trinity: shlib-missing-in-control-file libtdeinit_appletproxy.so opt/trinity/lib/libtdeinit_appletproxy.so diff --git a/ubuntu/raring/tdebase/debian/klipper-trinity.lintian b/ubuntu/raring/tdebase/debian/klipper-trinity.lintian index f7bcf9946..bee8b8020 100644 --- a/ubuntu/raring/tdebase/debian/klipper-trinity.lintian +++ b/ubuntu/raring/tdebase/debian/klipper-trinity.lintian @@ -1,3 +1,3 @@ -klipper: no-shlibs-control-file usr/lib/libtdeinit_klipper.so -klipper: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so -klipper: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so +klipper-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_klipper.so +klipper-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so +klipper-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so diff --git a/ubuntu/raring/tdebase/debian/kmenuedit-trinity.lintian b/ubuntu/raring/tdebase/debian/kmenuedit-trinity.lintian index 154077ad9..c36dd0445 100644 --- a/ubuntu/raring/tdebase/debian/kmenuedit-trinity.lintian +++ b/ubuntu/raring/tdebase/debian/kmenuedit-trinity.lintian @@ -1,4 +1,4 @@ -kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so -kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so -kmenuedit: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so -kmenuedit: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so +kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcontroledit.so +kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmenuedit.so +kmenuedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so +kmenuedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so diff --git a/ubuntu/raring/tdebase/debian/konqueror-trinity.lintian b/ubuntu/raring/tdebase/debian/konqueror-trinity.lintian index 243cafb9f..670ed2c27 100644 --- a/ubuntu/raring/tdebase/debian/konqueror-trinity.lintian +++ b/ubuntu/raring/tdebase/debian/konqueror-trinity.lintian @@ -1,3 +1,3 @@ -konqueror: shlib-missing-in-control-file libtdeinit_keditbookmarks.so usr/lib/libtdeinit_keditbookmarks.so -konqueror: shlib-missing-in-control-file libtdeinit_kfmclient.so usr/lib/libtdeinit_kfmclient.so -konqueror: shlib-missing-in-control-file libtdeinit_konqueror.so usr/lib/libtdeinit_konqueror.so +konqueror-trinity: shlib-missing-in-control-file libtdeinit_keditbookmarks.so opt/trinity/lib/libtdeinit_keditbookmarks.so +konqueror-trinity: shlib-missing-in-control-file libtdeinit_kfmclient.so opt/trinity/lib/libtdeinit_kfmclient.so +konqueror-trinity: shlib-missing-in-control-file libtdeinit_konqueror.so opt/trinity/lib/libtdeinit_konqueror.so diff --git a/ubuntu/raring/tdebase/debian/konsole-trinity.lintian b/ubuntu/raring/tdebase/debian/konsole-trinity.lintian index 765754c3e..7006dfe10 100644 --- a/ubuntu/raring/tdebase/debian/konsole-trinity.lintian +++ b/ubuntu/raring/tdebase/debian/konsole-trinity.lintian @@ -1,3 +1,3 @@ -konsole: no-shlibs-control-file usr/lib/libtdeinit_konsole.so -konsole: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so -konsole: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so +konsole-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_konsole.so +konsole-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so +konsole-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so diff --git a/ubuntu/raring/tdebase/debian/ksmserver-trinity.lintian b/ubuntu/raring/tdebase/debian/ksmserver-trinity.lintian index 20f94f8ee..2c7c61596 100644 --- a/ubuntu/raring/tdebase/debian/ksmserver-trinity.lintian +++ b/ubuntu/raring/tdebase/debian/ksmserver-trinity.lintian @@ -1,2 +1,2 @@ -ksmserver: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so -ksmserver: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so +ksmserver-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksmserver.so +ksmserver-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksmserver.so diff --git a/ubuntu/raring/tdebase/debian/tdebase-trinity-bin.lintian b/ubuntu/raring/tdebase/debian/tdebase-trinity-bin.lintian index 3f56c6d4a..07cf159e7 100644 --- a/ubuntu/raring/tdebase/debian/tdebase-trinity-bin.lintian +++ b/ubuntu/raring/tdebase/debian/tdebase-trinity-bin.lintian @@ -1,6 +1,6 @@ -tdebase-bin: setgid-binary usr/bin/tdesud 2755 root/nogroup -tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so -tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so -tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so -tdebase-bin: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so -tdebase-bin: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so +tdebase-bin-trinity: setgid-binary opt/trinity/bin/tdesud 2755 root/nogroup +tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcminit.so +tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khotkeys.so +tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kxkb.so +tdebase-bin-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so +tdebase-bin-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so diff --git a/ubuntu/raring/tdebase/debian/tdeprint-trinity.lintian b/ubuntu/raring/tdebase/debian/tdeprint-trinity.lintian index 9da8261d7..52cd10d88 100644 --- a/ubuntu/raring/tdebase/debian/tdeprint-trinity.lintian +++ b/ubuntu/raring/tdebase/debian/tdeprint-trinity.lintian @@ -1,4 +1,4 @@ -tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so -tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so -tdeprint: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so -tdeprint: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so +tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kjobviewer.so +tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kprinter.so +tdeprint-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so +tdeprint-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so diff --git a/ubuntu/raring/tdebase/debian/twin-trinity.lintian b/ubuntu/raring/tdebase/debian/twin-trinity.lintian index b6272e484..d0cfc8eb8 100644 --- a/ubuntu/raring/tdebase/debian/twin-trinity.lintian +++ b/ubuntu/raring/tdebase/debian/twin-trinity.lintian @@ -1,2 +1,2 @@ -twin: shlib-missing-in-control-file libtdeinit_twin.so usr/lib/libtdeinit_twin.so -twin: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so usr/lib/libtdeinit_twin_rules_dialog.so +twin-trinity: shlib-missing-in-control-file libtdeinit_twin.so opt/trinity/lib/libtdeinit_twin.so +twin-trinity: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so opt/trinity/lib/libtdeinit_twin_rules_dialog.so -- cgit v1.2.1 From 2c2abeaa3bfbfb7faf8148c71dade838ac74d527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 20 Jul 2013 17:00:35 +0200 Subject: Fix debian menu files on Debian and Ubuntu --- ubuntu/raring/tdebase/debian/kate-trinity.menu | 4 ++-- ubuntu/raring/tdebase/debian/khelpcenter-trinity.menu | 2 +- ubuntu/raring/tdebase/debian/konqueror-trinity.menu | 4 ++-- ubuntu/raring/tdebase/debian/ksysguard-trinity.menu | 4 ++-- ubuntu/raring/tdebase/debian/tdeprint-trinity.menu | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'ubuntu/raring/tdebase') diff --git a/ubuntu/raring/tdebase/debian/kate-trinity.menu b/ubuntu/raring/tdebase/debian/kate-trinity.menu index 378fa940e..b22f58e72 100644 --- a/ubuntu/raring/tdebase/debian/kate-trinity.menu +++ b/ubuntu/raring/tdebase/debian/kate-trinity.menu @@ -1,7 +1,7 @@ ?package(kate):\ needs="X11"\ section="Applications/Editors"\ - hints="KDE,Text"\ + hints="TDE,Text"\ title="Kate"\ icon32x32="/opt/trinity/share/pixmaps/kate.xpm"\ icon16x16="/opt/trinity/share/pixmaps/kate-16.xpm"\ @@ -10,7 +10,7 @@ ?package(kate):\ needs="X11"\ section="Applications/Editors"\ - hints="KDE,Text"\ + hints="TDE,Text"\ title="KWrite"\ icon32x32="/opt/trinity/share/pixmaps/kwrite.xpm"\ icon16x16="/opt/trinity/share/pixmaps/kwrite-16.xpm"\ diff --git a/ubuntu/raring/tdebase/debian/khelpcenter-trinity.menu b/ubuntu/raring/tdebase/debian/khelpcenter-trinity.menu index e353cea94..06387a37b 100644 --- a/ubuntu/raring/tdebase/debian/khelpcenter-trinity.menu +++ b/ubuntu/raring/tdebase/debian/khelpcenter-trinity.menu @@ -2,7 +2,7 @@ needs="X11"\ section="Help"\ hints="TDE"\ - title="KDE Help Center"\ + title="TDE Help Center"\ icon32x32="/opt/trinity/share/pixmaps/khelpcenter.xpm"\ icon16x16="/opt/trinity/share/pixmaps/khelpcenter-16.xpm"\ command="/opt/trinity/bin/khelpcenter" diff --git a/ubuntu/raring/tdebase/debian/konqueror-trinity.menu b/ubuntu/raring/tdebase/debian/konqueror-trinity.menu index 7f2ffa797..5fed6cc8e 100644 --- a/ubuntu/raring/tdebase/debian/konqueror-trinity.menu +++ b/ubuntu/raring/tdebase/debian/konqueror-trinity.menu @@ -10,7 +10,7 @@ ?package(konqueror):\ needs="X11"\ section="Applications/Network/Web Browsing"\ - hints="KDE,Web browsers"\ + hints="TDE,Web browsers"\ title="Konqueror"\ icon32x32="/opt/trinity/share/pixmaps/konqueror.xpm"\ icon16x16="/opt/trinity/share/pixmaps/konqueror-16.xpm"\ @@ -19,7 +19,7 @@ ?package(konqueror):\ needs="X11"\ section="Applications/File Management"\ - hints="KDE,File managers"\ + hints="TDE,File managers"\ title="Konqueror"\ icon32x32="/opt/trinity/share/pixmaps/kfm.xpm"\ icon16x16="/opt/trinity/share/pixmaps/kfm-16.xpm"\ diff --git a/ubuntu/raring/tdebase/debian/ksysguard-trinity.menu b/ubuntu/raring/tdebase/debian/ksysguard-trinity.menu index 5b66c9a43..efe01ba5e 100644 --- a/ubuntu/raring/tdebase/debian/ksysguard-trinity.menu +++ b/ubuntu/raring/tdebase/debian/ksysguard-trinity.menu @@ -2,7 +2,7 @@ needs="X11"\ section="Applications/System/Monitoring"\ hints="TDE"\ - title="KDE System Guard"\ + title="TDE System Guard"\ icon32x32="/opt/trinity/share/pixmaps/ksysguard.xpm"\ icon16x16="/opt/trinity/share/pixmaps/ksysguard-16.xpm"\ command="/opt/trinity/bin/ksysguard" @@ -11,7 +11,7 @@ needs="X11"\ section="Applications/System/Monitoring"\ hints="TDE"\ - title="KDE System Guard - Process Table"\ + title="TDE System Guard - Process Table"\ command="/opt/trinity/bin/kpm" # Icon 32x32 ksysguard/cr32-app-ksysguard.png ksysguard.xpm diff --git a/ubuntu/raring/tdebase/debian/tdeprint-trinity.menu b/ubuntu/raring/tdebase/debian/tdeprint-trinity.menu index 1e840a172..44d628ae7 100644 --- a/ubuntu/raring/tdebase/debian/tdeprint-trinity.menu +++ b/ubuntu/raring/tdebase/debian/tdeprint-trinity.menu @@ -20,7 +20,7 @@ needs="X11"\ section="Applications/System/Administration"\ hints="TDE"\ - title="KDEPrintFax"\ + title="TDEPrintFax"\ icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\ icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\ command="/opt/trinity/bin/tdeprintfax" -- cgit v1.2.1