Branch: master

42aa1eb3 2014-11-22 11:02:33 Timothy Pearson
Remove tdeprint conflict on foomatic compressed PPDs and add missing dependency on foomatic (un)compressed PPDs in Debian and Ubuntu
This relates to Bug 2191
M debian/lenny/tdebase/debian/control
M debian/squeeze/tdebase/debian/control
M ubuntu/maverick/tdebase/debian/control
diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control
index 062bd0c..b93504f 100644
--- a/debian/lenny/tdebase/debian/control
+++ b/debian/lenny/tdebase/debian/control
@@ -219,9 +219,8 @@
 Architecture: any
 Replaces: kdeprint-trinity (<< 4:14.0.0~)
 Breaks: kdeprint-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, enscript, poster, psutils
+Depends: ${shlibs:Depends}, enscript, poster, psutils, foomatic-db | foomatic-db-compressed-ppds
 Recommends: kghostview-trinity | postscript-viewer
-Conflicts: foomatic-db-compressed-ppds
 Suggests: khelpcenter-trinity, efax | hylafax-client | mgetty-fax, smbclient
 Description: print system for TDE
  This package contains the TDE printing subsystem. It can use CUPS,
diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control
index de9b16e..cb7c4ab 100644
--- a/debian/squeeze/tdebase/debian/control
+++ b/debian/squeeze/tdebase/debian/control
@@ -219,9 +219,8 @@
 Architecture: any
 Replaces: kdeprint-trinity (<< 4:14.0.0~)
 Breaks: kdeprint-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, enscript, poster, psutils
+Depends: ${shlibs:Depends}, enscript, poster, psutils, foomatic-db | foomatic-db-compressed-ppds
 Recommends: kghostview-trinity | postscript-viewer
-Conflicts: foomatic-db-compressed-ppds
 Suggests: khelpcenter-trinity, efax | hylafax-client | mgetty-fax, smbclient
 Description: print system for TDE
  This package contains the TDE printing subsystem. It can use CUPS,
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index 0e6ab2d..9397884 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -219,9 +219,8 @@
 Architecture: any
 Replaces: kdeprint-kde3 (<< 4:14.0.0~), kdeprint-trinity (<< 4:14.0.0~)
 Breaks: kdeprint-kde3 (<< 4:14.0.0~), kdeprint-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, enscript, poster, psutils
+Depends: ${shlibs:Depends}, enscript, poster, psutils, foomatic-db | foomatic-db-compressed-ppds
 Recommends: kghostview-trinity | postscript-viewer
-Conflicts: foomatic-db-compressed-ppds
 Suggests: khelpcenter-trinity, efax | hylafax-client | mgetty-fax, smbclient
 Description: print system for TDE
  This package contains the TDE printing subsystem. It can use CUPS,