diff options
Diffstat (limited to 'debian/_base/applications/multimedia')
55 files changed, 185 insertions, 176 deletions
diff --git a/debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/amarok/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/debian/_base/applications/multimedia/amarok/debian/compat b/debian/_base/applications/multimedia/amarok/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/amarok/debian/compat +++ b/debian/_base/applications/multimedia/amarok/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/amarok/debian/control b/debian/_base/applications/multimedia/amarok/debian/control index 6341db84b..a71ba59fc 100644 --- a/debian/_base/applications/multimedia/amarok/debian/control +++ b/debian/_base/applications/multimedia/amarok/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, bzip2, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, bzip2, tdelibs14-trinity-dev, tdebase-trinity-dev, libakode-dev, libxine2-dev | libxine-dev, libtag1-dev, libsqlite3-dev, diff --git a/debian/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/codeine/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/debian/_base/applications/multimedia/codeine/debian/compat b/debian/_base/applications/multimedia/codeine/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/codeine/debian/compat +++ b/debian/_base/applications/multimedia/codeine/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/codeine/debian/control b/debian/_base/applications/multimedia/codeine/debian/control index dd69b3c03..e1ca4d568 100644 --- a/debian/_base/applications/multimedia/codeine/debian/control +++ b/debian/_base/applications/multimedia/codeine/debian/control @@ -2,7 +2,7 @@ Source: codeine-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev Standards-Version: 3.7.3 Homepage: http://codeine.sourceforge.net/ diff --git a/debian/_base/applications/multimedia/codeine/debian/patches/series b/debian/_base/applications/multimedia/codeine/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/debian/_base/applications/multimedia/codeine/debian/patches/series +++ b/debian/_base/applications/multimedia/codeine/debian/patches/series @@ -1 +0,0 @@ - diff --git a/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/k3b-i18n/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/debian/_base/applications/multimedia/k3b-i18n/debian/compat b/debian/_base/applications/multimedia/k3b-i18n/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/k3b-i18n/debian/compat +++ b/debian/_base/applications/multimedia/k3b-i18n/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/k3b-i18n/debian/control b/debian/_base/applications/multimedia/k3b-i18n/debian/control index 9264af04e..426d3811a 100644 --- a/debian/_base/applications/multimedia/k3b-i18n/debian/control +++ b/debian/_base/applications/multimedia/k3b-i18n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build Build-Depends-Indep: tdelibs14-trinity-dev Standards-Version: 3.8.3 diff --git a/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES index 7b99dabec..7b65b9a3f 100644 --- a/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -1,8 +1,5 @@ remove build-dep on libdvdread-dev -libk3b3-extracodecs conflicts libk3b2-extracodecs -transitional libk3b2-extracodecs package - Do not recommend on tdebase-tdeio-plugins, kcontrol, Change recommend to suggest for vcdimager diff --git a/debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/k3b/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/debian/_base/applications/multimedia/k3b/debian/compat b/debian/_base/applications/multimedia/k3b/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/k3b/debian/compat +++ b/debian/_base/applications/multimedia/k3b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/k3b/debian/control b/debian/_base/applications/multimedia/k3b/debian/control index d71060cbf..ca1eb6f17 100644 --- a/debian/_base/applications/multimedia/k3b/debian/control +++ b/debian/_base/applications/multimedia/k3b/debian/control @@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> Build-Depends: - cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, + cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libdvdread-dev, libasound2-dev, lame, libmp3lame-dev, libflac++-dev (>= 1.1.2), flac, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, libavformat-dev, libavcodec-dev, libvorbis-dev, libsamplerate0-dev, libsndfile1-dev @@ -63,7 +63,7 @@ Section: libs Architecture: any Replaces: libk3b3-trinity (<< 4:14.0.0~) Breaks: libk3b3-trinity (<< 4:14.0.0~) -Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity, libk3b2-trinity +Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity Depends: ${shlibs:Depends} Description: The TDE cd burning application library - runtime files [Trinity] K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord. @@ -78,7 +78,6 @@ Architecture: any Replaces: libk3b3-extracodecs-trinity (<< 4:14.0.0~) Breaks: libk3b3-extracodecs-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends} -Conflicts: libk3b2-mp3-trinity Description: The TDE cd burning application library - extra decoders [Trinity] K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord. Its aim is to provide a very user friendly interface to all the tasks @@ -86,17 +85,6 @@ Description: The TDE cd burning application library - extra decoders [Trinity] . This package contains runtime libraries for the MP3 and FFMPEG decoder plugin. -Package: libk3b2-extracodecs-trinity -Architecture: all -Priority: extra -Replaces: libk3b2-extracodecs-trinity (<< 4:14.0.0~) -Breaks: libk3b2-extracodecs-trinity (<< 4:14.0.0~) -Depends: libk3b3-extracodecs-trinity -Description: transitional package for K3b's extra decoders [Trinity] - This is a dummy transitional package to enable a smooth transition from - libk3b2-extracodecs to libk3b3-extracodecs. - It may safely be removed after installation. - Package: k3b-trinity-dbg Priority: extra Architecture: any diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b-data.files b/debian/_base/applications/multimedia/k3b/debian/k3b-data.files deleted file mode 100644 index 3b3a0add7..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/k3b-data.files +++ /dev/null @@ -1,5 +0,0 @@ -usr/share/apps/* -usr/share/icons/* -usr/share/kde/* -usr/share/sounds/* -usr/share/doc/tde/* diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b-data.install b/debian/_base/applications/multimedia/k3b/debian/k3b-data.install deleted file mode 100644 index b7175c514..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/k3b-data.install +++ /dev/null @@ -1,11 +0,0 @@ -debian/tmp/usr/share/applnk/.hidden/* -debian/tmp/usr/share/apps/* -debian/tmp/usr/share/icons/* -debian/tmp/usr/share/doc/tde/* -debian/tmp/usr/share/sounds/* -debian/tmp/usr/share/mimelnk/* -debian/tmp/usr/share/services/* -debian/k3b-rip-audiocd.desktop usr/share/kde4/apps/solid/actions -debian/k3b-rip-videodvd.desktop usr/share/kde4/apps/solid/actions -debian/k3b-write-iso-image.desktop usr/share/kde4/services/ServiceMenus -debian/k3b-write-bin-image.desktop usr/share/kde4/services/ServiceMenus diff --git a/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.files b/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.files deleted file mode 100644 index d45003d06..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.files +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/* -usr/lib/*.la -usr/lib/*.so diff --git a/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.install b/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.install deleted file mode 100644 index 6257a06d1..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/tmp/usr/lib/libk3b.so -debian/tmp/usr/lib/libk3bdevice.so -debian/tmp/usr/include/* diff --git a/debian/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install b/debian/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install deleted file mode 100644 index 0e57a97dc..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/trinity/libk3bmaddecoder.* -#debian/tmp/usr/lib/trinity/libk3bffmpegdecoder.* diff --git a/debian/_base/applications/multimedia/k3b/debian/libk3b3.files b/debian/_base/applications/multimedia/k3b/debian/libk3b3.files deleted file mode 100644 index d77e53e7c..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/libk3b3.files +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*.so.* -usr/lib/libk3baudio*.{so,la} -usr/lib/trinity/* diff --git a/debian/_base/applications/multimedia/k3b/debian/libk3b3.install b/debian/_base/applications/multimedia/k3b/debian/libk3b3.install deleted file mode 100644 index 69b7f7909..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/libk3b3.install +++ /dev/null @@ -1,25 +0,0 @@ -debian/tmp/usr/lib/libk3b.so.* -debian/tmp/usr/lib/libk3bdevice.so.* -debian/tmp/usr/lib/*.la -debian/tmp/usr/lib/trinity/libk3balsaoutputplugin.la -debian/tmp/usr/lib/trinity/libk3balsaoutputplugin.so -debian/tmp/usr/lib/trinity/libk3bexternalencoder.la -debian/tmp/usr/lib/trinity/libk3bexternalencoder.so -debian/tmp/usr/lib/trinity/libk3bflacdecoder.la -debian/tmp/usr/lib/trinity/libk3bflacdecoder.so -debian/tmp/usr/lib/trinity/libk3bmpcdecoder.la -debian/tmp/usr/lib/trinity/libk3bmpcdecoder.so -debian/tmp/usr/lib/trinity/libk3boggvorbisdecoder.la -debian/tmp/usr/lib/trinity/libk3boggvorbisdecoder.so -debian/tmp/usr/lib/trinity/libk3boggvorbisencoder.la -debian/tmp/usr/lib/trinity/libk3boggvorbisencoder.so -debian/tmp/usr/lib/trinity/libk3bsoxencoder.la -debian/tmp/usr/lib/trinity/libk3bsoxencoder.so -debian/tmp/usr/lib/trinity/libk3bwavedecoder.la -debian/tmp/usr/lib/trinity/libk3bwavedecoder.so -debian/tmp/usr/lib/trinity/libk3baudioprojectcddbplugin.so -debian/tmp/usr/lib/trinity/libk3baudioprojectcddbplugin.la -debian/tmp/usr/lib/trinity/libk3baudiometainforenamerplugin.so -debian/tmp/usr/lib/trinity/libk3baudiometainforenamerplugin.la -debian/tmp/usr/lib/trinity/tdeio_videodvd.so -debian/tmp/usr/lib/trinity/tdeio_videodvd.la diff --git a/debian/_base/applications/multimedia/k3b/debian/rules b/debian/_base/applications/multimedia/k3b/debian/rules index 72db8e489..0cd87b24d 100755 --- a/debian/_base/applications/multimedia/k3b/debian/rules +++ b/debian/_base/applications/multimedia/k3b/debian/rules @@ -4,6 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk +DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) +ifeq ($(DEB_TIME64_API),true) +DEB_TIME64_SUFFIX = t64 +else +DEB_TIME64_SUFFIX = +endif + + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -14,3 +22,41 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DWITH_ALL_OPTIONS="ON" + + +post-patches:: + dh_testdir +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/libk3b3-trinity\." | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libk3b3$(DEB_TIME64_SUFFIX)-$${a##*-} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libk3b3\\)-trinity$$/Package: \\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libk3b3-trinity\\)\\( [^,]*\|$$\)/\\1:\\2\\3/" \ + -e "s/\\(libk3b3\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + debian/control +endif + +clean:: + dh_testdir + dh_clean + +ifeq ($(DEB_TIME64_API),true) + # revert library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "\.t64$$" | \ + while read a; do \ + mv $$a $${a%.t64}; \ + done + ls -d debian/* | \ + grep -E "/libk3b3$(DEB_TIME64_SUFFIX)-" | \ + xargs -r rm + [ ! -f debian/control.t64 ] || \ + mv debian/control.t64 debian/control +endif diff --git a/debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/k9copy/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/debian/_base/applications/multimedia/k9copy/debian/compat b/debian/_base/applications/multimedia/k9copy/debian/compat index 48c962ffa..021ea30c0 100644 --- a/debian/_base/applications/multimedia/k9copy/debian/compat +++ b/debian/_base/applications/multimedia/k9copy/debian/compat @@ -1,2 +1,2 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/k9copy/debian/control b/debian/_base/applications/multimedia/k9copy/debian/control index 9899669c7..e94e97d8c 100644 --- a/debian/_base/applications/multimedia/k9copy/debian/control +++ b/debian/_base/applications/multimedia/k9copy/debian/control @@ -3,7 +3,8 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com> -Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, libswscale-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 10~), quilt, cdbs, tde-cmake, ninja-build, tdelibs14-trinity-dev, + libdvdread-dev, libk3b-trinity-dev, libavformat-dev, libswscale-dev Standards-Version: 3.8.4 Package: k9copy-trinity diff --git a/debian/_base/applications/multimedia/k9copy/debian/rules b/debian/_base/applications/multimedia/k9copy/debian/rules index 6219a645e..a6797f19a 100755 --- a/debian/_base/applications/multimedia/k9copy/debian/rules +++ b/debian/_base/applications/multimedia/k9copy/debian/rules @@ -1,30 +1,17 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" --enable-k3bdevices - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/kaffeine-mozilla/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/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat +++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control index a0e8f1850..f5edfda31 100644 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control +++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Riku Voipio <riku.voipio@iki.fi> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, pkg-config, libxaw7-dev, libnspr4-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libxaw7-dev, libnspr4-dev Standards-Version: 3.8.4 Package: kaffeine-mozilla-trinity diff --git a/debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/kaffeine/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/debian/_base/applications/multimedia/kaffeine/debian/compat b/debian/_base/applications/multimedia/kaffeine/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/kaffeine/debian/compat +++ b/debian/_base/applications/multimedia/kaffeine/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/kaffeine/debian/control b/debian/_base/applications/multimedia/kaffeine/debian/control index 92b18a7e3..e0a2aa138 100644 --- a/debian/_base/applications/multimedia/kaffeine/debian/control +++ b/debian/_base/applications/multimedia/kaffeine/debian/control @@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Riku Voipio <riku.voipio@iki.fi>, Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libcdparanoia0-dev, libogg-dev, libxine2-dev | libxine-dev (>= 1.1.7), libxcb1-dev, libxtst-dev, libgstreamer1.0-dev | libgstreamer0.10-dev, libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, diff --git a/debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/kmplayer/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/debian/_base/applications/multimedia/kmplayer/debian/compat b/debian/_base/applications/multimedia/kmplayer/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/kmplayer/debian/compat +++ b/debian/_base/applications/multimedia/kmplayer/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/kmplayer/debian/control b/debian/_base/applications/multimedia/kmplayer/debian/control index 53a4a5df9..72e4988de 100644 --- a/debian/_base/applications/multimedia/kmplayer/debian/control +++ b/debian/_base/applications/multimedia/kmplayer/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libnspr4-dev, libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev, libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, libxtst-dev, diff --git a/debian/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/kplayer/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/debian/_base/applications/multimedia/kplayer/debian/compat b/debian/_base/applications/multimedia/kplayer/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/kplayer/debian/compat +++ b/debian/_base/applications/multimedia/kplayer/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/kplayer/debian/control b/debian/_base/applications/multimedia/kplayer/debian/control index 70c39e61e..20fdf0f39 100644 --- a/debian/_base/applications/multimedia/kplayer/debian/control +++ b/debian/_base/applications/multimedia/kplayer/debian/control @@ -2,7 +2,7 @@ Source: kplayer-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev Standards-Version: 3.8.4 Homepage: http://kplayer.sourceforge.net/ #Vcs-Git: git://anonscm.debian.org/collab-maint/kplayer-trinity.git diff --git a/debian/_base/applications/multimedia/kplayer/debian/patches/series b/debian/_base/applications/multimedia/kplayer/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/debian/_base/applications/multimedia/kplayer/debian/patches/series +++ b/debian/_base/applications/multimedia/kplayer/debian/patches/series @@ -1 +0,0 @@ - diff --git a/debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/mplayerthumbs/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/debian/_base/applications/multimedia/mplayerthumbs/debian/compat b/debian/_base/applications/multimedia/mplayerthumbs/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/mplayerthumbs/debian/compat +++ b/debian/_base/applications/multimedia/mplayerthumbs/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/mplayerthumbs/debian/control b/debian/_base/applications/multimedia/mplayerthumbs/debian/control index cbe09f5c7..675c8fd5f 100644 --- a/debian/_base/applications/multimedia/mplayerthumbs/debian/control +++ b/debian/_base/applications/multimedia/mplayerthumbs/debian/control @@ -2,7 +2,7 @@ Source: mplayerthumbs-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.2 Package: mplayerthumbs-trinity diff --git a/debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/rosegarden/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/debian/_base/applications/multimedia/rosegarden/debian/compat b/debian/_base/applications/multimedia/rosegarden/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/rosegarden/debian/compat +++ b/debian/_base/applications/multimedia/rosegarden/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/rosegarden/debian/control b/debian/_base/applications/multimedia/rosegarden/debian/control index c8ccdda28..d2fdae5f5 100644 --- a/debian/_base/applications/multimedia/rosegarden/debian/control +++ b/debian/_base/applications/multimedia/rosegarden/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org> Uploaders: Mike O'Connor <stew@debian.org>, Free Ekanayaka <freee@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblirc-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev Standards-Version: 3.8.4 Homepage: http://www.rosegardenmusic.com/ diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rules b/debian/_base/applications/multimedia/rosegarden/debian/rules index 1372a08f8..5839a4d6d 100755 --- a/debian/_base/applications/multimedia/rosegarden/debian/rules +++ b/debian/_base/applications/multimedia/rosegarden/debian/rules @@ -21,7 +21,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEB_COMPRESS_EXCLUDE += .rg .wav .docbook +DEB_COMPRESS_EXCLUDE_ALL += .rg .wav .docbook binary-install/rosegarden-trinity:: dh_testdir diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/soundkonverter/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/debian/_base/applications/multimedia/soundkonverter/debian/compat b/debian/_base/applications/multimedia/soundkonverter/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/soundkonverter/debian/compat +++ b/debian/_base/applications/multimedia/soundkonverter/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/control b/debian/_base/applications/multimedia/soundkonverter/debian/control index 730a04490..d5d1bbcd5 100644 --- a/debian/_base/applications/multimedia/soundkonverter/debian/control +++ b/debian/_base/applications/multimedia/soundkonverter/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>, Michael Meskes <meskes@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, libcdparanoia0-dev, libtag1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libcdparanoia0-dev, libtag1-dev Standards-Version: 3.8.4 Homepage: http://www.kde-apps.org/content/show.php?content=29024 diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore b/debian/_base/applications/multimedia/soundkonverter/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore +++ b/debian/_base/applications/multimedia/soundkonverter/debian/patches/series diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/rules b/debian/_base/applications/multimedia/soundkonverter/debian/rules index fa0a1f580..a6797f19a 100755 --- a/debian/_base/applications/multimedia/soundkonverter/debian/rules +++ b/debian/_base/applications/multimedia/soundkonverter/debian/rules @@ -1,38 +1,17 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_EXTRA_FLAGS = --with-extra-libs=/opt/trinity/lib - -install/soundkonverter-trinity:: - install -D -p -m0644 debian/soundkonverter-trinity.lintian-overrides \ - debian/soundkonverter-trinity/usr/share/lintian/overrides/soundkonverter-trinity - -install/soundkonverter-amarok-trinity:: - chmod 0755 debian/tmp/opt/trinity/share/apps/soundkonverter/amarokscript/soundKonverter.rb - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install index fcfaef212..485f58a96 100644 --- a/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install +++ b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install @@ -2,10 +2,10 @@ opt/trinity/bin/soundkonverter opt/trinity/share/applications/tde/soundkonverter.desktop opt/trinity/share/apps/soundkonverter/soundkonverterui.rc opt/trinity/share/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop -opt/trinity/share/apps/soundkonverter/format_infos/ -opt/trinity/share/apps/soundkonverter/pics/ -opt/trinity/share/apps/soundkonverter/plugins/ -opt/trinity/share/doc/ -opt/trinity/share/icons/ -opt/trinity/share/locale/ -opt/trinity/share/mimelnk/ +opt/trinity/share/apps/soundkonverter/format_infos +opt/trinity/share/apps/soundkonverter/pics +opt/trinity/share/apps/soundkonverter/plugins +opt/trinity/share/doc +opt/trinity/share/icons +opt/trinity/share/locale +opt/trinity/share/mimelnk diff --git a/debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/tderadio/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/debian/_base/applications/multimedia/tderadio/debian/compat b/debian/_base/applications/multimedia/tderadio/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/tderadio/debian/compat +++ b/debian/_base/applications/multimedia/tderadio/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/tderadio/debian/control b/debian/_base/applications/multimedia/tderadio/debian/control index 91e1c4141..655104221 100644 --- a/debian/_base/applications/multimedia/tderadio/debian/control +++ b/debian/_base/applications/multimedia/tderadio/debian/control @@ -2,8 +2,8 @@ Source: tderadio-trinity Section: sound Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, - liblircclient-dev, libsndfile1-dev, libmp3lame-dev, libogg-dev, libvorbis-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, + liblirc-dev, libsndfile1-dev, libmp3lame-dev, libogg-dev, libvorbis-dev Standards-Version: 3.8.4 Package: tderadio-trinity |