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/precise/tdewebdev | |
| 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/precise/tdewebdev')
3 files changed, 7 insertions, 7 deletions
diff --git a/ubuntu/precise/tdewebdev/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdewebdev/debian/cdbs/debian-qt-kde.mk index d135c4257..4a11bc028 100644 --- a/ubuntu/precise/tdewebdev/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/precise/tdewebdev/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/precise/tdewebdev/debian/quanta-data-trinity.lintian b/ubuntu/precise/tdewebdev/debian/quanta-data-trinity.lintian index d8906a5be..1b1814f88 100644 --- a/ubuntu/precise/tdewebdev/debian/quanta-data-trinity.lintian +++ b/ubuntu/precise/tdewebdev/debian/quanta-data-trinity.lintian @@ -1,6 +1,6 @@ # These are shipped with quanta's kommander scripts and do not need to be # executable. -quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/dwt.pl -quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/TemplateMagic.pl -quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/externalpreview.sh +quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/dwt.pl +quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/TemplateMagic.pl +quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/externalpreview.sh diff --git a/ubuntu/precise/tdewebdev/debian/quanta-trinity.lintian b/ubuntu/precise/tdewebdev/debian/quanta-trinity.lintian index 09ae4739d..f46ec301f 100644 --- a/ubuntu/precise/tdewebdev/debian/quanta-trinity.lintian +++ b/ubuntu/precise/tdewebdev/debian/quanta-trinity.lintian @@ -1,4 +1,4 @@ # This tag is required for apps already in the KDE menu. -quanta: menu-item-contains-unknown-tag kderemove /opt/trinity/lib/menu/quanta:9 +quanta-trinity: menu-item-contains-unknown-tag kderemove /opt/trinity/lib/menu/quanta:9 # This is part of the docbook docs. -quanta: extra-license-file opt/trinity/share/doc/tde/HTML/en/quanta/credits-license.docbook +quanta-trinity: extra-license-file opt/trinity/share/doc/tde/HTML/en/quanta/credits-license.docbook |