summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-05-09 20:30:31 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-05-09 20:43:08 +0200
commitc26c4db3d59b4db349467d4e67eb80840c003b93 (patch)
treeca31fedf32d538d3c89fafbae76deaccfc61601b
parent146d246266446ef79a68a24cca9c052e2798c7ff (diff)
downloadtde-packaging-c26c4db3d59b4db349467d4e67eb80840c003b93.tar.gz
tde-packaging-c26c4db3d59b4db349467d4e67eb80840c003b93.zip
Move cryptsetup from depends to recommends in tdebase on Debian and Ubuntu
(cherry picked from commit bec9f8cfa2ca615f1aaa8315a7af8c2d752cb273)
-rw-r--r--debian/lenny/kdebase/debian/control4
-rw-r--r--debian/squeeze/kdebase/debian/control4
-rw-r--r--ubuntu/maverick/kdebase/debian/control4
3 files changed, 6 insertions, 6 deletions
diff --git a/debian/lenny/kdebase/debian/control b/debian/lenny/kdebase/debian/control
index c288d03c1..a9306501e 100644
--- a/debian/lenny/kdebase/debian/control
+++ b/debian/lenny/kdebase/debian/control
@@ -170,8 +170,8 @@ Description: KDE base documentation in HTML format
Package: kdebase-kio-plugins-trinity
Section: kde
Architecture: any
-Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
-Recommends: hal-trinity, pmount, kamera-trinity, kdemultimedia-kio-plugins-trinity
+Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, man-db (>= 2.5.1-1)
+Recommends: hal-trinity, pmount, cryptsetup, kamera-trinity, kdemultimedia-kio-plugins-trinity
Suggests: khelpcenter-trinity, mtools
Conflicts: kdebase-libs-trinity (<< 4:3.0.0), mediamanager
Replaces: kdebase-trinity (<< 4:3.0.0), kdebase-trinity-doc (<< 4:3.0.0), kdebase-libs-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0), kdebase-trinity-bin (<< 4:3.5.5a.dfsg.1-1ubuntu18), kdebase-data-trinity (<< 4:3.5.8-2ubuntu18)
diff --git a/debian/squeeze/kdebase/debian/control b/debian/squeeze/kdebase/debian/control
index 120ef67b7..efb15a04f 100644
--- a/debian/squeeze/kdebase/debian/control
+++ b/debian/squeeze/kdebase/debian/control
@@ -170,8 +170,8 @@ Description: KDE base documentation in HTML format
Package: kdebase-kio-plugins-trinity
Section: kde
Architecture: any
-Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
-Recommends: hal-trinity, pmount, kamera-trinity, kdemultimedia-kio-plugins-trinity
+Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, man-db (>= 2.5.1-1)
+Recommends: hal-trinity, pmount, cryptsetup, kamera-trinity, kdemultimedia-kio-plugins-trinity
Suggests: khelpcenter-trinity, mtools
Conflicts: kdebase-libs-trinity (<< 4:3.0.0), mediamanager
Replaces: kdebase-trinity (<< 4:3.0.0), kdebase-trinity-doc (<< 4:3.0.0), kdebase-libs-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0), kdebase-trinity-bin (<< 4:3.5.5a.dfsg.1-1ubuntu18), kdebase-data-trinity (<< 4:3.5.8-2ubuntu18)
diff --git a/ubuntu/maverick/kdebase/debian/control b/ubuntu/maverick/kdebase/debian/control
index 74b3a912a..a4f9aed9d 100644
--- a/ubuntu/maverick/kdebase/debian/control
+++ b/ubuntu/maverick/kdebase/debian/control
@@ -185,8 +185,8 @@ Section: kde
Architecture: any
Replaces: kdebase-kio-plugins-kde3 (<< 4:3.5.13)
Breaks: kdebase-kio-plugins-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, cryptsetup, man-db (>= 2.5.1-1)
-Recommends: hal-trinity, pmount, kamera-trinity, kdemultimedia-kio-plugins-trinity
+Depends: ${shlibs:Depends}, kdesktop-trinity, libsasl2-modules, psmisc, man-db (>= 2.5.1-1)
+Recommends: hal-trinity, pmount, cryptsetup, kamera-trinity, kdemultimedia-kio-plugins-trinity
Suggests: khelpcenter-trinity, mtools
Conflicts: kdebase-libs-trinity (<< 4:3.0.0), mediamanager
Description: core I/O slaves for KDE