DEB tdelibs: Move the imagetops into a separate package.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 962965ffdd02aea9cfeb24005cb501e2457fb9a4)

18 files changed, 63 insertions, 12 deletions

diff --git a/debian/_base/core/tdelibs/debian/control b/debian/_base/core/tdelibs/debian/control
index e83bba239..80fba6fbb 100644
--- a/debian/_base/core/tdelibs/debian/control
+++ b/debian/_base/core/tdelibs/debian/control
@@ -60,7 +60,8 @@ Architecture: any
 Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity
 Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity
 Depends: ${shlibs:Depends}, tdelibs-data-trinity,
- tdelibs-data-trinity, libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients
+ netpbm (>= 2:10.0-15.1) | tdelibs14-imagetops-trinity,
+ libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients
 Recommends: xdg-user-dirs, consolekit | systemd
 Suggests: fam, perl-suid
 Conflicts: tdelibs4-trinity, tdelibs4c2-trinity (>> 4:1.0.0), tdelibs-bin-trinity (<< 4:3.3.3), tdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6)
@@ -75,6 +76,22 @@ Description: core libraries and binaries for all TDE applications
  This package is part of TDE, and a component of the TDE libraries module.
  See the 'tde-trinity' and 'tdelibs-trinity' packages for more information.
 
+Package: tdelibs14-imagetops-trinity
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: netpbm
+Conflicts: tdelibs14-trinity (<< 4:14.0.10~), netpbm (>= 2:10.0-15.1)
+Description: core libraries and binaries for all TDE applications
+ This package contains the imagetops binary needed for print filters.
+ .
+ This binary has been included as part of newer versions of the netpbm
+ package. Therefore, to avoid conflict, it was separated from the
+ tdelibs14-trinity package into a separate package.
+ .
+ This package is part of TDE, and a component of the TDE libraries module.
+ See the 'tde-trinity' and 'tdelibs-trinity' packages for more information.
+
 Package: tdelibs14-trinity-dev
 Section: libdevel
 Architecture: any
diff --git a/debian/_base/core/tdelibs/debian/rules b/debian/_base/core/tdelibs/debian/rules
index 9fadac2cc..d2439a1f7 100755
--- a/debian/_base/core/tdelibs/debian/rules
+++ b/debian/_base/core/tdelibs/debian/rules
@@ -53,6 +53,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DWITH_XRANDR="ON" \
  -DWITH_XCOMPOSITE="ON" \
  -DWITH_MITSHM="ON" \
+ -DWITH_IMAGETOPS_BINARY="ON" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
 DEB_MAKE_CHECK_TARGET = check
diff --git a/debian/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.install b/debian/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.install
new file mode 100644
index 000000000..ea140bfa4
--- /dev/null
+++ b/debian/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/bin/imagetops
diff --git a/debian/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.manpages b/debian/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.manpages
new file mode 100644
index 000000000..768f94b7b
--- /dev/null
+++ b/debian/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.manpages
@@ -0,0 +1 @@
+./debian/man/imagetops-trinity.1
diff --git a/debian/_base/core/tdelibs/debian/tdelibs14-trinity.install b/debian/_base/core/tdelibs/debian/tdelibs14-trinity.install
index b54ca2e2f..b5e80c4b4 100644
--- a/debian/_base/core/tdelibs/debian/tdelibs14-trinity.install
+++ b/debian/_base/core/tdelibs/debian/tdelibs14-trinity.install
@@ -12,7 +12,6 @@ debian/tmp/opt/trinity/bin/dcopserver_shutdown
 debian/tmp/opt/trinity/bin/dcopstart
 debian/tmp/opt/trinity/bin/filesharelist
 debian/tmp/opt/trinity/bin/fileshareset
-debian/tmp/opt/trinity/bin/imagetops
 debian/tmp/opt/trinity/bin/tdeab2tdeabc
 debian/tmp/opt/trinity/bin/kaddprinterwizard
 debian/tmp/opt/trinity/bin/tdebuildsycoca
diff --git a/debian/_base/core/tdelibs/debian/tdelibs14-trinity.manpages b/debian/_base/core/tdelibs/debian/tdelibs14-trinity.manpages
index 7c2d23170..d5cd0698b 100644
--- a/debian/_base/core/tdelibs/debian/tdelibs14-trinity.manpages
+++ b/debian/_base/core/tdelibs/debian/tdelibs14-trinity.manpages
@@ -28,7 +28,6 @@ debian/man/out/meinproc-trinity.1
 ./debian/man/dcopref-trinity.1
 ./debian/man/dcopserver_shutdown-trinity.1
 ./debian/man/fileshareset-trinity.1
-./debian/man/imagetops-trinity.1
 ./debian/man/tdeab2tdeabc-trinity.1
 ./debian/man/tdecmshell-trinity.1
 ./debian/man/tdeinit_shutdown-trinity.1
diff --git a/dilos/core/tdelibs/debian/control b/dilos/core/tdelibs/debian/control
index 791a66c8b..8f1ff6ed1 100644
--- a/dilos/core/tdelibs/debian/control
+++ b/dilos/core/tdelibs/debian/control
@@ -62,7 +62,8 @@ Architecture: any
 Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity
 Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity
 Depends: ${shlibs:Depends}, tdelibs-data-trinity,
- tdelibs-data-trinity, libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients
+ netpbm (>= 2:10.0-15.1) | tdelibs14-imagetops-trinity,
+ libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients
 Recommends: xdg-user-dirs, consolekit | systemd
 Suggests: fam, perl-suid
 Conflicts: tdelibs4-trinity, tdelibs4c2-trinity (>> 4:1.0.0), tdelibs-bin-trinity (<< 4:3.3.3), tdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6)
@@ -77,6 +78,22 @@ Description: core libraries and binaries for all TDE applications
  This package is part of TDE, and a component of the TDE libraries module.
  See the 'tde-trinity' and 'tdelibs-trinity' packages for more information.
 
+Package: tdelibs14-imagetops-trinity
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: netpbm
+Conflicts: tdelibs14-trinity (<< 4:14.0.10~), netpbm (>= 2:10.0-15.1)
+Description: core libraries and binaries for all TDE applications
+ This package contains the imagetops binary needed for print filters.
+ .
+ This binary has been included as part of newer versions of the netpbm
+ package.  Therefore, to avoid conflict, it was separated from the
+ tdelibs14-trinity package into a separate package.
+ .
+ This package is part of TDE, and a component of the TDE libraries module.
+ See the 'tde-trinity' and 'tdelibs-trinity' packages for more information.
+
 Package: tdelibs14-trinity-dev
 Section: libdevel
 Architecture: any
diff --git a/dilos/core/tdelibs/debian/rules b/dilos/core/tdelibs/debian/rules
index aa4094661..c85e8031a 100755
--- a/dilos/core/tdelibs/debian/rules
+++ b/dilos/core/tdelibs/debian/rules
@@ -56,9 +56,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DWITH_XRANDR="ON" \
  -DWITH_XCOMPOSITE="ON" \
  -DWITH_MITSHM="ON" \
- -DWITH_PCSC="ON" \
- -DWITH_PKCS="ON" \
- -DWITH_CRYPTSETUP="OFF" \
+ -DWITH_IMAGETOPS_BINARY="ON" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_C_COMPILER=gcc \
  -DWITH_ALSA="OFF"
diff --git a/dilos/core/tdelibs/debian/tdelibs14-imagetops-trinity.install b/dilos/core/tdelibs/debian/tdelibs14-imagetops-trinity.install
new file mode 100644
index 000000000..5d9d2fbba
--- /dev/null
+++ b/dilos/core/tdelibs/debian/tdelibs14-imagetops-trinity.install
@@ -0,0 +1 @@
+debian/tmp/usr/bin/imagetops
diff --git a/dilos/core/tdelibs/debian/tdelibs14-imagetops-trinity.manpages b/dilos/core/tdelibs/debian/tdelibs14-imagetops-trinity.manpages
new file mode 100644
index 000000000..768f94b7b
--- /dev/null
+++ b/dilos/core/tdelibs/debian/tdelibs14-imagetops-trinity.manpages
@@ -0,0 +1 @@
+./debian/man/imagetops-trinity.1
diff --git a/dilos/core/tdelibs/debian/tdelibs14-trinity.install b/dilos/core/tdelibs/debian/tdelibs14-trinity.install
index f9b8fcb67..607958946 100644
--- a/dilos/core/tdelibs/debian/tdelibs14-trinity.install
+++ b/dilos/core/tdelibs/debian/tdelibs14-trinity.install
@@ -12,7 +12,6 @@ debian/tmp/usr/bin/dcopserver_shutdown
 debian/tmp/usr/bin/dcopstart
 debian/tmp/usr/bin/filesharelist
 debian/tmp/usr/bin/fileshareset
-#[!solaris-any] debian/tmp/usr/bin/imagetops
 debian/tmp/usr/bin/tdeab2tdeabc
 debian/tmp/usr/bin/kaddprinterwizard
 debian/tmp/usr/bin/tdebuildsycoca
diff --git a/dilos/core/tdelibs/debian/tdelibs14-trinity.manpages b/dilos/core/tdelibs/debian/tdelibs14-trinity.manpages
index 7c2d23170..d5cd0698b 100644
--- a/dilos/core/tdelibs/debian/tdelibs14-trinity.manpages
+++ b/dilos/core/tdelibs/debian/tdelibs14-trinity.manpages
@@ -28,7 +28,6 @@ debian/man/out/meinproc-trinity.1
 ./debian/man/dcopref-trinity.1
 ./debian/man/dcopserver_shutdown-trinity.1
 ./debian/man/fileshareset-trinity.1
-./debian/man/imagetops-trinity.1
 ./debian/man/tdeab2tdeabc-trinity.1
 ./debian/man/tdecmshell-trinity.1
 ./debian/man/tdeinit_shutdown-trinity.1
diff --git a/ubuntu/_base/core/tdelibs/debian/control b/ubuntu/_base/core/tdelibs/debian/control
index d24a92991..e2952ab5b 100644
--- a/ubuntu/_base/core/tdelibs/debian/control
+++ b/ubuntu/_base/core/tdelibs/debian/control
@@ -61,7 +61,8 @@ Architecture: any
 Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity
 Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity
 Depends: ${shlibs:Depends}, tdelibs-data-trinity,
- tdelibs-data-trinity, libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients
+ netpbm (>= 2:10.0-15.1) | tdelibs14-imagetops-trinity,
+ libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients
 Recommends: xdg-user-dirs, consolekit | systemd
 Suggests: fam, perl-suid
 Description: core libraries and binaries for all TDE applications
@@ -75,6 +76,22 @@ Description: core libraries and binaries for all TDE applications
  This package is part of TDE, and a component of the TDE libraries module.
  See the 'tde-trinity' and 'tdelibs-trinity' packages for more information.
 
+Package: tdelibs14-imagetops-trinity
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: netpbm
+Conflicts: tdelibs14-trinity (<< 4:14.0.10~), netpbm (>= 2:10.0-15.1)
+Description: core libraries and binaries for all TDE applications
+ This package contains the imagetops binary needed for print filters.
+ .
+ This binary has been included as part of newer versions of the netpbm
+ package. Therefore, to avoid conflict, it was separated from the
+ tdelibs14-trinity package into a separate package.
+ .
+ This package is part of TDE, and a component of the TDE libraries module.
+ See the 'tde-trinity' and 'tdelibs-trinity' packages for more information.
+
 Package: tdelibs14-trinity-dev
 Section: libdevel
 Architecture: any
diff --git a/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules
index 8a3d1715e..2223bde84 100755
--- a/ubuntu/_base/core/tdelibs/debian/rules
+++ b/ubuntu/_base/core/tdelibs/debian/rules
@@ -52,6 +52,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DWITH_XRANDR="ON" \
  -DWITH_XCOMPOSITE="ON" \
  -DWITH_MITSHM="ON" \
+ -DWITH_IMAGETOPS_BINARY="ON" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
 DEB_MAKE_CHECK_TARGET = check
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.install b/ubuntu/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.install
new file mode 100644
index 000000000..ea140bfa4
--- /dev/null
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/bin/imagetops
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.manpages b/ubuntu/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.manpages
new file mode 100644
index 000000000..768f94b7b
--- /dev/null
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-imagetops-trinity.manpages
@@ -0,0 +1 @@
+./debian/man/imagetops-trinity.1
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install
index b54ca2e2f..b5e80c4b4 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install
@@ -12,7 +12,6 @@ debian/tmp/opt/trinity/bin/dcopserver_shutdown
 debian/tmp/opt/trinity/bin/dcopstart
 debian/tmp/opt/trinity/bin/filesharelist
 debian/tmp/opt/trinity/bin/fileshareset
-debian/tmp/opt/trinity/bin/imagetops
 debian/tmp/opt/trinity/bin/tdeab2tdeabc
 debian/tmp/opt/trinity/bin/kaddprinterwizard
 debian/tmp/opt/trinity/bin/tdebuildsycoca
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.manpages b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.manpages
index 7c2d23170..d5cd0698b 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.manpages
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.manpages
@@ -28,7 +28,6 @@ debian/man/out/meinproc-trinity.1
 ./debian/man/dcopref-trinity.1
 ./debian/man/dcopserver_shutdown-trinity.1
 ./debian/man/fileshareset-trinity.1
-./debian/man/imagetops-trinity.1
 ./debian/man/tdeab2tdeabc-trinity.1
 ./debian/man/tdecmshell-trinity.1
 ./debian/man/tdeinit_shutdown-trinity.1