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/tdeadmin/debian/cdbs/debian-qt-kde.mk | 4 ++-- ubuntu/raring/tdeadmin/debian/lilo-config-trinity.lintian | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ubuntu/raring/tdeadmin') diff --git a/ubuntu/raring/tdeadmin/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdeadmin/debian/cdbs/debian-qt-kde.mk index d135c4257..4a11bc028 100644 --- a/ubuntu/raring/tdeadmin/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/raring/tdeadmin/debian/cdbs/debian-qt-kde.mk @@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: diff --git a/ubuntu/raring/tdeadmin/debian/lilo-config-trinity.lintian b/ubuntu/raring/tdeadmin/debian/lilo-config-trinity.lintian index dc8ec46fb..f268b6b2a 100644 --- a/ubuntu/raring/tdeadmin/debian/lilo-config-trinity.lintian +++ b/ubuntu/raring/tdeadmin/debian/lilo-config-trinity.lintian @@ -1 +1 @@ -lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/tdesu +lilo-config-trinity: menu-command-not-in-package /usr/share/menu/lilo-config-trinity:6 /opt/trinity/bin/tdesu -- 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/tdeadmin/debian/kcron-trinity.menu | 6 +++--- ubuntu/raring/tdeadmin/debian/kdat-trinity.menu | 4 ++-- ubuntu/raring/tdeadmin/debian/kpackage-trinity.menu | 6 +++--- ubuntu/raring/tdeadmin/debian/ksysv-trinity.menu | 6 +++--- ubuntu/raring/tdeadmin/debian/kuser-trinity.menu | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'ubuntu/raring/tdeadmin') diff --git a/ubuntu/raring/tdeadmin/debian/kcron-trinity.menu b/ubuntu/raring/tdeadmin/debian/kcron-trinity.menu index 40ce7f089..0bb50e9c8 100644 --- a/ubuntu/raring/tdeadmin/debian/kcron-trinity.menu +++ b/ubuntu/raring/tdeadmin/debian/kcron-trinity.menu @@ -2,7 +2,7 @@ needs="X11"\ section="Applications/Editors"\ hints="TDE"\ - title="KDE Task Scheduler"\ - icon32x32="/usr/share/pixmaps/kcron.xpm"\ - icon16x16="/usr/share/pixmaps/kcron-16.xpm"\ + title="TDE Task Scheduler"\ + icon32x32="/opt/trinity/share/pixmaps/kcron.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kcron-16.xpm"\ command="/opt/trinity/bin/kcron" diff --git a/ubuntu/raring/tdeadmin/debian/kdat-trinity.menu b/ubuntu/raring/tdeadmin/debian/kdat-trinity.menu index 398c54bd6..dc7ab1da7 100644 --- a/ubuntu/raring/tdeadmin/debian/kdat-trinity.menu +++ b/ubuntu/raring/tdeadmin/debian/kdat-trinity.menu @@ -3,6 +3,6 @@ section="Applications/System/Hardware"\ hints="TDE"\ title="KDat"\ - icon32x32="/usr/share/pixmaps/kdat.xpm"\ - icon16x16="/usr/share/pixmaps/kdat-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/kdat.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kdat-16.xpm"\ command="/opt/trinity/bin/kdat" diff --git a/ubuntu/raring/tdeadmin/debian/kpackage-trinity.menu b/ubuntu/raring/tdeadmin/debian/kpackage-trinity.menu index 0274b1556..fb84cc32b 100644 --- a/ubuntu/raring/tdeadmin/debian/kpackage-trinity.menu +++ b/ubuntu/raring/tdeadmin/debian/kpackage-trinity.menu @@ -2,7 +2,7 @@ needs="X11"\ section="Applications/System/Package Management"\ hints="TDE"\ - title="KDE Package Manager"\ - icon32x32="/usr/share/pixmaps/kpackage.xpm"\ - icon16x16="/usr/share/pixmaps/kpackage-16.xpm"\ + title="TDE Package Manager"\ + icon32x32="/opt/trinity/share/pixmaps/kpackage.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kpackage-16.xpm"\ command="/opt/trinity/bin/kpackage" diff --git a/ubuntu/raring/tdeadmin/debian/ksysv-trinity.menu b/ubuntu/raring/tdeadmin/debian/ksysv-trinity.menu index 1da3e1e60..45353ae4b 100644 --- a/ubuntu/raring/tdeadmin/debian/ksysv-trinity.menu +++ b/ubuntu/raring/tdeadmin/debian/ksysv-trinity.menu @@ -2,7 +2,7 @@ needs="X11"\ section="Applications/Editors"\ hints="TDE"\ - title="KDE SysV-Init Editor"\ - icon32x32="/usr/share/pixmaps/ksysv.xpm"\ - icon16x16="/usr/share/pixmaps/ksysv-16.xpm"\ + title="TDE SysV-Init Editor"\ + icon32x32="/opt/trinity/share/pixmaps/ksysv.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/ksysv-16.xpm"\ command="/opt/trinity/bin/ksysv" diff --git a/ubuntu/raring/tdeadmin/debian/kuser-trinity.menu b/ubuntu/raring/tdeadmin/debian/kuser-trinity.menu index b66726e62..52d2a8afc 100644 --- a/ubuntu/raring/tdeadmin/debian/kuser-trinity.menu +++ b/ubuntu/raring/tdeadmin/debian/kuser-trinity.menu @@ -2,7 +2,7 @@ needs="X11"\ section="Applications/System/Administration"\ hints="TDE"\ - title="KDE User Manager"\ - icon32x32="/usr/share/pixmaps/kuser.xpm"\ - icon16x16="/usr/share/pixmaps/kuser-16.xpm"\ + title="TDE User Manager"\ + icon32x32="/opt/trinity/share/pixmaps/kuser.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/kuser-16.xpm"\ command="/opt/trinity/bin/kuser" -- cgit v1.2.1