From ab08f8d003c50363172a64f403f819977e7db743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 15 Sep 2012 15:37:56 +0200 Subject: Fix install directories for rosegargen on Debian and Ubuntu (cherry picked from commit 63d3f5481d5cb6d09080bdf495236bc5c03134ba) --- ubuntu/maverick/applications/rosegarden/debian/README.Debian | 4 ++-- ubuntu/maverick/applications/rosegarden/debian/lintianoverrides | 4 ++-- .../applications/rosegarden/debian/rosegarden-trinity.dirs | 2 +- .../applications/rosegarden/debian/rosegarden-trinity.links | 2 +- .../applications/rosegarden/debian/rosegarden-trinity.menu | 4 ++-- ubuntu/maverick/applications/rosegarden/debian/rules | 7 +++---- 6 files changed, 11 insertions(+), 12 deletions(-) (limited to 'ubuntu') diff --git a/ubuntu/maverick/applications/rosegarden/debian/README.Debian b/ubuntu/maverick/applications/rosegarden/debian/README.Debian index 2e0393b3f..0719da93f 100644 --- a/ubuntu/maverick/applications/rosegarden/debian/README.Debian +++ b/ubuntu/maverick/applications/rosegarden/debian/README.Debian @@ -35,11 +35,11 @@ Rosegarden configuration dialog. You can find some Rosegarden example files in this directory: -/usr/share/apps/rosegarden/examples +/usr/share/doc/rosegarden-rosegarden/examples And some additional test files can be found under: -/usr/share/doc/rosegarden/testfiles +/usr/share/doc/rosegarden-trinity/testfiles Real Time issues diff --git a/ubuntu/maverick/applications/rosegarden/debian/lintianoverrides b/ubuntu/maverick/applications/rosegarden/debian/lintianoverrides index 9172bd3bd..135ea69e9 100644 --- a/ubuntu/maverick/applications/rosegarden/debian/lintianoverrides +++ b/ubuntu/maverick/applications/rosegarden/debian/lintianoverrides @@ -1,2 +1,2 @@ -rosegarden: menu-icon-missing /usr/share/icons/locolor/32x32/apps/rosegarden.xpm -rosegarden: menu-icon-missing /usr/share/icons/locolor/16x16/apps/rosegarden.xpm +rosegarden-trinity: menu-icon-missing /opt/trinity/share/icons/locolor/32x32/apps/rosegarden.xpm +rosegarden-trinity: menu-icon-missing /opt/trinity/share/icons/locolor/16x16/apps/rosegarden.xpm diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.dirs b/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.dirs index 202932f7b..1dffbd19c 100644 --- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.dirs +++ b/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.dirs @@ -1,2 +1,2 @@ -usr/share/doc/rosegarden/examples/ +usr/share/doc/rosegarden-trinity/examples/ usr/share/lintian/overrides/ diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.links b/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.links index 5137f635f..f3d6d1228 100644 --- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.links +++ b/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.links @@ -1 +1 @@ -/opt/trinity/share/man/man1/rosegarden.1.gz /opt/trinity/share/man/man1/rosegardensequencer.1.gz +/opt/trinity/share/man/man1/rosegarden.1 /opt/trinity/share/man/man1/rosegardensequencer.1 diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.menu b/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.menu index 354215272..ca56a8f26 100644 --- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.menu +++ b/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.menu @@ -6,8 +6,8 @@ longtitle="Rosegarden Music Editor"\ hotkey="rg"\ hints="MIDI,Music Editor"\ - icon16x16="/usr/share/icons/locolor/16x16/apps/rosegarden.xpm"\ - icon32x32="/usr/share/icons/locolor/32x32/apps/rosegarden.xpm"\ + icon16x16="/opt/trinity/share/icons/locolor/16x16/apps/rosegarden.xpm"\ + icon32x32="/opt/trinity/share/icons/locolor/32x32/apps/rosegarden.xpm"\ description="Rosegarden is a musical notation editor and \ a MIDI and Audio sequencer, with both score and piano-roll notations." diff --git a/ubuntu/maverick/applications/rosegarden/debian/rules b/ubuntu/maverick/applications/rosegarden/debian/rules index 8577daf04..b64b765bd 100755 --- a/ubuntu/maverick/applications/rosegarden/debian/rules +++ b/ubuntu/maverick/applications/rosegarden/debian/rules @@ -72,20 +72,19 @@ binary-indep: build install # Build architecture-dependent files here. binary-arch: build install mkdir -p debian/rosegarden-trinity/opt/trinity/share/ - cp -Rp debian/rosegarden-trinity/usr/share/* debian/rosegarden-trinity/opt/trinity/share/ - rm -rf debian/rosegarden-trinity/usr/share/* dh_testdir dh_testroot dh_installexamples - find debian/rosegarden-trinity/opt/trinity/share/doc/rosegarden -type f -exec chmod 664 {} \; + find debian/rosegarden-trinity/usr/share/doc/rosegarden-trinity/examples -type f -exec chmod 664 {} \; dh_installdirs dh_installdocs dh_installmenu dh_installmime dh_installcron dh_installman debian/rosegarden.1 debian/rosegarden-lilypondview.1 debian/rosegarden-project-package.1 debian/rosegarden-audiofile-importer.1 + mv debian/rosegarden-trinity/usr/share/man debian/rosegarden-trinity/opt/trinity/share/ dh_desktop - cp debian/lintianoverrides debian/rosegarden-trinity/opt/trinity/share/lintian/overrides/rosegarden + cp debian/lintianoverrides debian/rosegarden-trinity/usr/share/lintian/overrides/rosegarden-trinity dh_installinfo dh_installchangelogs dh_install -- cgit v1.2.3