From 285b33853b7a4a896eba13deb67425bb16735ed3 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 30 Aug 2018 18:37:02 +0900 Subject: DEB/UBU: make kmrml deprecated in R14.1 series. Signed-off-by: Michele Calgaro --- ubuntu/maverick/tdegraphics/debian/control | 20 ++------------------ ubuntu/maverick/tdegraphics/debian/control.in | 18 ++---------------- .../tdegraphics/debian/kmrml-trinity.install | 18 ------------------ .../tdegraphics/debian/kmrml-trinity.lintian | 4 ---- .../tdegraphics/debian/kmrml-trinity.postinst | 13 ------------- ubuntu/maverick/tdegraphics/debian/rules | 2 +- .../debian/tdegraphics-trinity-dev.install | 1 - 7 files changed, 5 insertions(+), 71 deletions(-) delete mode 100644 ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install delete mode 100644 ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian delete mode 100644 ubuntu/maverick/tdegraphics/debian/kmrml-trinity.postinst (limited to 'ubuntu/maverick/tdegraphics') diff --git a/ubuntu/maverick/tdegraphics/debian/control b/ubuntu/maverick/tdegraphics/debian/control index 89e18d570..226749935 100644 --- a/ubuntu/maverick/tdegraphics/debian/control +++ b/ubuntu/maverick/tdegraphics/debian/control @@ -12,7 +12,7 @@ Section: tde Architecture: all Replaces: kdegraphics-kde3 (<< 4:14.0.0~), kdegraphics-trinity (<< 4:14.0.0~) Breaks: kdegraphics-kde3 (<< 4:14.0.0~), kdegraphics-trinity (<< 4:14.0.0~) -Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), tdeiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version}) +Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), tdeiconedit-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version}) Suggests: tdegraphics-trinity-doc-html (>= ${source:Version}) Description: graphics apps from the official Trinity release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical @@ -76,7 +76,7 @@ Section: devel Architecture: any Replaces: kdegraphics-kde3-dev (<< 4:14.0.0~), kdegraphics-trinity-dev (<< 4:14.0.0~) Breaks: kdegraphics-kde3-dev (<< 4:14.0.0~), kdegraphics-trinity-dev (<< 4:14.0.0~) -Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs14-trinity-dev +Depends: kghostview-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs14-trinity-dev Description: development files for the TDE graphics module This package contains headers and other development files for the TDE graphics module. @@ -189,22 +189,6 @@ Description: an icon editor for Trinity This package is part of Trinity, as a component of the TDE graphics module. See the 'tde-trinity' and 'tdegraphics-trinity' packages for more information. -Package: kmrml-trinity -Section: tde -Architecture: any -Replaces: kmrml-kde3 (<< 4:14.0.0~), kmrml-trinity (<< 4:14.0.0~) -Breaks: kmrml-kde3 (<< 4:14.0.0~), kmrml-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends} -Recommends: gnuift -Description: a Konqueror plugin for searching pictures - MRML is short for Multimedia Retrieval Markup Language, which defines a - protocol for querying a server for images based on their content. See - http://www.mrml.net about MRML and the GNU Image Finding Tool (GIFT), an - MRML server. - . - This package is part of Trinity, as a component of the TDE graphics module. - See the 'tde-trinity' and 'tdegraphics-trinity' packages for more information. - Package: kolourpaint-trinity Section: graphics Architecture: any diff --git a/ubuntu/maverick/tdegraphics/debian/control.in b/ubuntu/maverick/tdegraphics/debian/control.in index 77384bace..c84b5608c 100644 --- a/ubuntu/maverick/tdegraphics/debian/control.in +++ b/ubuntu/maverick/tdegraphics/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.7.2 Package: tdegraphics Section: tde Architecture: all -Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), tdeiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version}) +Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), tdeiconedit (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version}) Suggests: tdegraphics-doc-html (>= ${source:Version}) Description: graphics apps from the official TDE release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical @@ -66,7 +66,7 @@ Description: a color palette editor and color picker for TDE Package: tdegraphics-dev Section: devel Architecture: any -Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), tdelibs4-dev +Depends: kghostview (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), tdelibs4-dev Description: development files for the TDE graphics module This package contains headers and other development files for the TDE graphics module. @@ -165,20 +165,6 @@ Description: an icon editor for TDE This package is part of TDE, as a component of the TDE graphics module. See the 'tde' and 'tdegraphics' packages for more information. -Package: kmrml -Section: tde -Architecture: any -Depends: ${shlibs:Depends} -Recommends: gnuift -Description: a Konqueror plugin for searching pictures - MRML is short for Multimedia Retrieval Markup Language, which defines a - protocol for querying a server for images based on their content. See - http://www.mrml.net about MRML and the GNU Image Finding Tool (GIFT), an - MRML server. - . - This package is part of TDE, as a component of the TDE graphics module. - See the 'tde' and 'tdegraphics' packages for more information. - Package: kolourpaint Section: graphics Architecture: any diff --git a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install deleted file mode 100644 index f5de1ad92..000000000 --- a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install +++ /dev/null @@ -1,18 +0,0 @@ -debian/tmp/opt/trinity/bin/mrmlsearch -debian/tmp/opt/trinity/lib/trinity/kcm_kmrml.la -debian/tmp/opt/trinity/lib/trinity/kcm_kmrml.so -debian/tmp/opt/trinity/lib/trinity/kded_daemonwatcher.la -debian/tmp/opt/trinity/lib/trinity/kded_daemonwatcher.so -debian/tmp/opt/trinity/lib/trinity/tdeio_mrml.la -debian/tmp/opt/trinity/lib/trinity/tdeio_mrml.so -debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.la -debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.so -debian/tmp/opt/trinity/lib/trinity/mrmlsearch.la -debian/tmp/opt/trinity/lib/trinity/mrmlsearch.so -debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.so -debian/tmp/opt/trinity/share/applications/tde/kcmkmrml.desktop -debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/mrml-servicemenu.desktop -debian/tmp/opt/trinity/share/mimelnk/text/mrml.desktop -debian/tmp/opt/trinity/share/services/kded/daemonwatcher.desktop -debian/tmp/opt/trinity/share/services/mrml.protocol -debian/tmp/opt/trinity/share/services/mrml_part.desktop diff --git a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian deleted file mode 100644 index 0193c9699..000000000 --- a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian +++ /dev/null @@ -1,4 +0,0 @@ -kmrml-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so -kmrml-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so -kmrml-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so -kmrml-trinity: package-name-doesnt-match-sonames libtdeinit-mrmlsearch diff --git a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.postinst b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.postinst deleted file mode 100644 index 62563a4a4..000000000 --- a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kmrml-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/maverick/tdegraphics/debian/rules b/ubuntu/maverick/tdegraphics/debian/rules index 6d3995324..9ab00fe32 100755 --- a/ubuntu/maverick/tdegraphics/debian/rules +++ b/ubuntu/maverick/tdegraphics/debian/rules @@ -39,7 +39,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -PACKAGES_WITH_LIBS := kfaxview-trinity kghostview-trinity kmrml-trinity kpovmodeler-trinity ksvg-trinity \ +PACKAGES_WITH_LIBS := kfaxview-trinity kghostview-trinity kpovmodeler-trinity ksvg-trinity \ kuickshow-trinity kview-trinity kviewshell-trinity libkscan1-trinity DEB_DH_MAKESHLIBS_ARGS_kghostview-trinity := -V'kghostview-trinity (>= 4:3.5.5-1)' diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-trinity-dev.install b/ubuntu/maverick/tdegraphics/debian/tdegraphics-trinity-dev.install index f5f48fee4..b7c990473 100644 --- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-trinity-dev.install +++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-trinity-dev.install @@ -180,7 +180,6 @@ debian/tmp/opt/trinity/include/libtext2path-0.1/BezierPath.h debian/tmp/opt/trinity/include/libtext2path-0.1/Glyph.h debian/tmp/opt/trinity/include/libtext2path-0.1/GlyphTracer.h debian/tmp/opt/trinity/lib/libtdeinit_kview.la -debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la debian/tmp/opt/trinity/lib/libkghostviewlib.la debian/tmp/opt/trinity/lib/libkghostviewlib.so debian/tmp/opt/trinity/lib/libkimageviewer.la -- cgit v1.2.3