summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdeaddons/debian
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-07-21 12:42:38 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-07-21 12:42:38 +0200
commitd2a5ae6eee8f77ba301f22a990fd68944c94d4ad (patch)
tree0bdfdcb57898584e87d89ab3a0172d5b6ce28ce6 /ubuntu/maverick/tdeaddons/debian
parent65166dbf185e59a4f874392b40c7f974e7ae5fb8 (diff)
parent0657be6a3626991da456db3946ed1ec316ce6fb7 (diff)
downloadtde-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/tdeaddons/debian')
-rw-r--r--ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu2
-rw-r--r--ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.lintian4
4 files changed, 6 insertions, 6 deletions
diff --git a/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu b/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu
index 3f5845f50..f010da8d3 100644
--- a/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu
+++ b/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu
@@ -1,6 +1,6 @@
?package(atlantikdesigner):needs="X11"\
section="Games/Tool"\
- hints="KDE,Monopoly"\
+ hints="TDE,Monopoly"\
title="Atlantik Designer"\
longtitle="Atlantik Designer (Monopoly(R)-like Board Designer)"\
command="/opt/trinity/bin/atlantikdesigner"\
diff --git a/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeaddons/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/tdeaddons/debian/kate-plugins-trinity.lintian b/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.lintian
index d4625a389..27eca0292 100644
--- a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.lintian
+++ b/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.lintian
@@ -1,2 +1,2 @@
# Doesn't need to be executable - only run from within kate.
-kate-plugins: script-not-executable ./usr/share/apps/kate/scripts/html-tidy.sh
+kate-plugins-trinity: script-not-executable ./opt/trinity/share/apps/kate/scripts/html-tidy.sh
diff --git a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.lintian b/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.lintian
index 3007e3556..705d74139 100644
--- a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.lintian
+++ b/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.lintian
@@ -1,3 +1,3 @@
# Call is inserted by debhelper and is correct.
-kicker-applets: postinst-has-useless-call-to-ldconfig
-kicker-applets: postrm-has-useless-call-to-ldconfig
+kicker-applets-trinity: postinst-has-useless-call-to-ldconfig
+kicker-applets-trinity: postrm-has-useless-call-to-ldconfig