summaryrefslogtreecommitdiffstats
path: root/debian/_base/core
diff options
context:
space:
mode:
Diffstat (limited to 'debian/_base/core')
-rw-r--r--debian/_base/core/kdelibs/debian/control19
-rw-r--r--debian/_base/core/kdelibs/debian/kdelibs4-imagetops-trinity.install1
-rw-r--r--debian/_base/core/kdelibs/debian/kdelibs4-imagetops-trinity.manpages1
-rw-r--r--debian/_base/core/kdelibs/debian/kdelibs4c2a-trinity.install1
-rw-r--r--debian/_base/core/kdelibs/debian/kdelibs4c2a-trinity.manpages1
-rwxr-xr-xdebian/_base/core/kdelibs/debian/rules1
6 files changed, 21 insertions, 3 deletions
diff --git a/debian/_base/core/kdelibs/debian/control b/debian/_base/core/kdelibs/debian/control
index e59b58515..6f244f760 100644
--- a/debian/_base/core/kdelibs/debian/control
+++ b/debian/_base/core/kdelibs/debian/control
@@ -58,7 +58,8 @@ Package: kdelibs4c2a-trinity
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, kdelibs-data-trinity,
- kdelibs-data-trinity, perl, xbase-clients
+ netpbm (>= 2:10.0-15.1) | kdelibs4-imagetops-trinity,
+ perl, xbase-clients
Recommends: xdg-user-dirs
Suggests: fam, perl-suid
Conflicts: kdelibs4-trinity, kdelibs4c2-trinity (>> 4:1.0.0), kdelibs-bin-trinity (<< 4:3.3.3), kdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6)
@@ -76,6 +77,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 'kde-trinity' and 'kdelibs-trinity' packages for more information.
+Package: kdelibs4-imagetops-trinity
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: netpbm
+Conflicts: kdelibs4c2a-trinity (<< 4:3.5.13.3~), 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: kdelibs4-trinity-dev
Section: libdevel
Architecture: any
diff --git a/debian/_base/core/kdelibs/debian/kdelibs4-imagetops-trinity.install b/debian/_base/core/kdelibs/debian/kdelibs4-imagetops-trinity.install
new file mode 100644
index 000000000..ea140bfa4
--- /dev/null
+++ b/debian/_base/core/kdelibs/debian/kdelibs4-imagetops-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/bin/imagetops
diff --git a/debian/_base/core/kdelibs/debian/kdelibs4-imagetops-trinity.manpages b/debian/_base/core/kdelibs/debian/kdelibs4-imagetops-trinity.manpages
new file mode 100644
index 000000000..768f94b7b
--- /dev/null
+++ b/debian/_base/core/kdelibs/debian/kdelibs4-imagetops-trinity.manpages
@@ -0,0 +1 @@
+./debian/man/imagetops-trinity.1
diff --git a/debian/_base/core/kdelibs/debian/kdelibs4c2a-trinity.install b/debian/_base/core/kdelibs/debian/kdelibs4c2a-trinity.install
index 4c8be8e62..8cc2f4e5f 100644
--- a/debian/_base/core/kdelibs/debian/kdelibs4c2a-trinity.install
+++ b/debian/_base/core/kdelibs/debian/kdelibs4c2a-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/kab2kabc
debian/tmp/opt/trinity/bin/kaddprinterwizard
debian/tmp/opt/trinity/bin/kbuildsycoca
diff --git a/debian/_base/core/kdelibs/debian/kdelibs4c2a-trinity.manpages b/debian/_base/core/kdelibs/debian/kdelibs4c2a-trinity.manpages
index eba677adb..ba2245885 100644
--- a/debian/_base/core/kdelibs/debian/kdelibs4c2a-trinity.manpages
+++ b/debian/_base/core/kdelibs/debian/kdelibs4c2a-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/kab2kabc-trinity.1
./debian/man/kcmshell-trinity.1
./debian/man/kdeinit_shutdown-trinity.1
diff --git a/debian/_base/core/kdelibs/debian/rules b/debian/_base/core/kdelibs/debian/rules
index 58dcf8eda..03fcb6da5 100755
--- a/debian/_base/core/kdelibs/debian/rules
+++ b/debian/_base/core/kdelibs/debian/rules
@@ -44,6 +44,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