summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdemultimedia/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/tdemultimedia/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/tdemultimedia/debian')
-rw-r--r--ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian8
-rw-r--r--ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdemultimedia/debian/libarts1-xine-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian8
5 files changed, 14 insertions, 14 deletions
diff --git a/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdemultimedia/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/tdemultimedia/debian/kmix-trinity.lintian b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian
index a2a96f9ee..c802a5b07 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian
+++ b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,4 @@
-kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
-kmix: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
+kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
diff --git a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian
index b09b553d8..9cba1f36a 100644
--- a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian
+++ b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1,3 @@
-krec: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
-krec: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
-krec: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
diff --git a/ubuntu/maverick/tdemultimedia/debian/libarts1-xine-trinity.lintian b/ubuntu/maverick/tdemultimedia/debian/libarts1-xine-trinity.lintian
index bfbcf2995..ef72447cf 100644
--- a/ubuntu/maverick/tdemultimedia/debian/libarts1-xine-trinity.lintian
+++ b/ubuntu/maverick/tdemultimedia/debian/libarts1-xine-trinity.lintian
@@ -1 +1 @@
-libarts1-xine: no-shlibs-control-file opt/trinity/lib/libarts_xine.so
+libarts1-xine-trinity: no-shlibs-control-file opt/trinity/lib/libarts_xine.so
diff --git a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian
index 89faa71aa..834dbc664 100644
--- a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian
+++ b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian
@@ -1,4 +1,4 @@
-noatun: shlib-missing-in-control-file libwinskinvis.so opt/trinity/lib/libwinskinvis.so
-noatun: shlib-missing-in-control-file libartseffects.so opt/trinity/lib/libartseffects.so
-noatun: shlib-missing-in-control-file libnoatunarts.so opt/trinity/lib/libnoatunarts.so
-noatun: shlib-missing-in-control-file libtdeinit_noatun.so opt/trinity/lib/libtdeinit_noatun.so
+noatun-trinity: shlib-missing-in-control-file libwinskinvis.so opt/trinity/lib/libwinskinvis.so
+noatun-trinity: shlib-missing-in-control-file libartseffects.so opt/trinity/lib/libartseffects.so
+noatun-trinity: shlib-missing-in-control-file libnoatunarts.so opt/trinity/lib/libnoatunarts.so
+noatun-trinity: shlib-missing-in-control-file libtdeinit_noatun.so opt/trinity/lib/libtdeinit_noatun.so