diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-07-21 12:42:38 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-07-21 12:42:38 +0200 |
| commit | d2a5ae6eee8f77ba301f22a990fd68944c94d4ad (patch) | |
| tree | 0bdfdcb57898584e87d89ab3a0172d5b6ce28ce6 /ubuntu/maverick/tdeadmin/debian | |
| parent | 65166dbf185e59a4f874392b40c7f974e7ae5fb8 (diff) | |
| parent | 0657be6a3626991da456db3946ed1ec316ce6fb7 (diff) | |
| download | tde-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/tdeadmin/debian')
7 files changed, 17 insertions, 17 deletions
diff --git a/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk index d135c4257..4a11bc028 100644 --- a/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/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/maverick/tdeadmin/debian/kcron-trinity.menu b/ubuntu/maverick/tdeadmin/debian/kcron-trinity.menu index 40ce7f089..0bb50e9c8 100644 --- a/ubuntu/maverick/tdeadmin/debian/kcron-trinity.menu +++ b/ubuntu/maverick/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/maverick/tdeadmin/debian/kdat-trinity.menu b/ubuntu/maverick/tdeadmin/debian/kdat-trinity.menu index 398c54bd6..dc7ab1da7 100644 --- a/ubuntu/maverick/tdeadmin/debian/kdat-trinity.menu +++ b/ubuntu/maverick/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/maverick/tdeadmin/debian/kpackage-trinity.menu b/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.menu index 0274b1556..fb84cc32b 100644 --- a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.menu +++ b/ubuntu/maverick/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/maverick/tdeadmin/debian/ksysv-trinity.menu b/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.menu index 1da3e1e60..45353ae4b 100644 --- a/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.menu +++ b/ubuntu/maverick/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/maverick/tdeadmin/debian/kuser-trinity.menu b/ubuntu/maverick/tdeadmin/debian/kuser-trinity.menu index b66726e62..52d2a8afc 100644 --- a/ubuntu/maverick/tdeadmin/debian/kuser-trinity.menu +++ b/ubuntu/maverick/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" diff --git a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.lintian b/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.lintian index dc8ec46fb..f268b6b2a 100644 --- a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.lintian +++ b/ubuntu/maverick/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 |