diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-07-19 21:01:08 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-07-19 21:01:08 +0200 |
| commit | c7debbe08c7830f26b7080b5f84381202983e5b6 (patch) | |
| tree | 6b03072ad0ad932305fc462e319395f35e2b8854 /ubuntu/raring | |
| parent | 81cfe3de65065da2e9693971b05ee35cca6bf483 (diff) | |
| parent | b6a7c10f390060cdd3a9204ad260cc3d3e572038 (diff) | |
| download | tde-packaging-c7debbe08c7830f26b7080b5f84381202983e5b6.tar.gz tde-packaging-c7debbe08c7830f26b7080b5f84381202983e5b6.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Conflicts:
redhat/tdebase/tdebase-14.0.0.spec
redhat/tdelibs/tdelibs-14.0.0.spec
Diffstat (limited to 'ubuntu/raring')
| -rw-r--r-- | ubuntu/raring/applications/kcmldap/debian/control | 2 | ||||
| -rw-r--r-- | ubuntu/raring/applications/kcmldapcontroller/debian/control | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ubuntu/raring/applications/kcmldap/debian/control b/ubuntu/raring/applications/kcmldap/debian/control index 182f19077..b1b5b76f6 100644 --- a/ubuntu/raring/applications/kcmldap/debian/control +++ b/ubuntu/raring/applications/kcmldap/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.8.4 Package: kcontrol-ldap-bonding-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, tde-ldap-cert-updater +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp, tde-ldap-cert-updater Description: Kerberos control module for the TDE control center This is a TDE control center module to manage TDE connections to Kerberos realms. diff --git a/ubuntu/raring/applications/kcmldapcontroller/debian/control b/ubuntu/raring/applications/kcmldapcontroller/debian/control index c9bde60d1..2302bd092 100644 --- a/ubuntu/raring/applications/kcmldapcontroller/debian/control +++ b/ubuntu/raring/applications/kcmldapcontroller/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.8.4 Package: kcontrol-ldap-controller-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd, ntp Conflicts: tde-ldap-cert-updater Description: Kerberos realm controller module for the TDE control center This is a TDE control center module to configure a Kerberos Realm Controller |