summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-11-22 11:02:33 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-11-22 11:02:33 -0600
commit42aa1eb3360c60f6f1266b2945b4eb4f3df8e3cf (patch)
treea33b373cdb6c21163084907a52be133f4c3232d4
parentdae6eb20372fce2c2add0a3c2fc2295d31cc385f (diff)
downloadtde-packaging-42aa1eb3360c60f6f1266b2945b4eb4f3df8e3cf.tar.gz
tde-packaging-42aa1eb3360c60f6f1266b2945b4eb4f3df8e3cf.zip
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
-rw-r--r--debian/lenny/tdebase/debian/control3
-rw-r--r--debian/squeeze/tdebase/debian/control3
-rw-r--r--ubuntu/maverick/tdebase/debian/control3
3 files changed, 3 insertions, 6 deletions
diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control
index 062bd0c79..b93504fba 100644
--- a/debian/lenny/tdebase/debian/control
+++ b/debian/lenny/tdebase/debian/control
@@ -219,9 +219,8 @@ Section: utils
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 de9b16e66..cb7c4abb1 100644
--- a/debian/squeeze/tdebase/debian/control
+++ b/debian/squeeze/tdebase/debian/control
@@ -219,9 +219,8 @@ Section: utils
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 0e6ab2dd3..9397884f0 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -219,9 +219,8 @@ Section: utils
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,