1 files changed, 18 insertions, 1 deletions
diff --git a/debian/_base/core/tdelibs/debian/control b/debian/_base/core/tdelibs/debian/control
index bf178fcaa..9ed576d22 100644
--- a/debian/_base/core/tdelibs/debian/control
+++ b/debian/_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
 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)
@@ -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 '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