summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/core/tdemultimedia
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base/core/tdemultimedia')
-rw-r--r--ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdemultimedia/debian/compat2
-rw-r--r--ubuntu/_base/core/tdemultimedia/debian/control2
-rw-r--r--ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install27
-rw-r--r--ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian2
6 files changed, 12 insertions, 30 deletions
diff --git a/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/ubuntu/_base/core/tdemultimedia/debian/compat b/ubuntu/_base/core/tdemultimedia/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/compat
+++ b/ubuntu/_base/core/tdemultimedia/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdemultimedia/debian/control b/ubuntu/_base/core/tdemultimedia/debian/control
index 7ae0e8b3b..3ac50dd74 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/control
+++ b/ubuntu/_base/core/tdemultimedia/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev
Standards-Version: 3.8.4
Package: tdemultimedia-trinity
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install
index 3e0d2daf7..4ee39eb84 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install
+++ b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install
@@ -12,29 +12,10 @@ debian/tmp/opt/trinity/share/applications/tde/kmix.desktop
debian/tmp/opt/trinity/share/apps/kicker/applets/kmixapplet.desktop
debian/tmp/opt/trinity/share/apps/kmix/kmixui.rc
debian/tmp/opt/trinity/share/apps/kmix/pics/Listener.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerFrontLeft.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerFrontRight.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerRearLeft.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerRearRight.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/kmixdocked.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/kmixdocked_error.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/kmixdocked_mute.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_ac97.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_audio.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_bass.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_cd.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_digital.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_ext.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_headphone.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_microphone.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_midi.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_recmon.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_record.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_surround.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_treble.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_unknown.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_video.png
-debian/tmp/opt/trinity/share/apps/kmix/pics/mix_volume.png
+debian/tmp/opt/trinity/share/apps/kmix/pics/Speaker*.png
+debian/tmp/opt/trinity/share/apps/kmix/pics/mix*.png
+debian/tmp/opt/trinity/share/apps/kmix/pics/crystal/*.png
+debian/tmp/opt/trinity/share/apps/kmix/pics/oldcrystal/*.png
debian/tmp/opt/trinity/share/autostart/restore_kmix_volumes.desktop
debian/tmp/opt/trinity/share/autostart/kmix.desktop
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/common
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian
index c802a5b07..914623090 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian
+++ b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,2 @@
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/_base/core/tdemultimedia/debian/krec-trinity.lintian b/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian
index 9cba1f36a..e5e13fb57 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian
+++ b/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1 @@
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