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/applications/amarok | |
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/applications/amarok')
-rw-r--r-- | ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu | 4 | ||||
-rwxr-xr-x | ubuntu/maverick/applications/amarok/debian/rules | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu b/ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu index 7bd18dffa..51d4e1f8b 100644 --- a/ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu +++ b/ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu @@ -3,6 +3,6 @@ section="Applications/Sound"\ hints="TDE"\ title="Amarok"\ - icon32x32="/usr/share/pixmaps/amarok.xpm"\ - icon16x16="/usr/share/pixmaps/amarok-16.xpm"\ + icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\ + icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\ command="/opt/trinity/bin/amarok" diff --git a/ubuntu/maverick/applications/amarok/debian/rules b/ubuntu/maverick/applications/amarok/debian/rules index 277aff4ec..1b6f7c5fe 100755 --- a/ubuntu/maverick/applications/amarok/debian/rules +++ b/ubuntu/maverick/applications/amarok/debian/rules @@ -72,7 +72,7 @@ debian/stamp-automake: $(patsubst %,binary-install/%,$(DEB_PACKAGES)):: 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 clean:: |