diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-04-02 20:07:09 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-04-02 20:07:09 +0200 |
| commit | 871701198bf1b542e7e7c2d6c4d4955ce2c60629 (patch) | |
| tree | d90499a7cd8a692adf936e6fedf5f21ccbaf9234 | |
| parent | d8bddddb257a1c6c068882efc7677768501f5f59 (diff) | |
| parent | 005f7ea8d7af38428b1dd6c4da99e2e5e1e803a2 (diff) | |
| download | tde-packaging-871701198bf1b542e7e7c2d6c4d4955ce2c60629.tar.gz tde-packaging-871701198bf1b542e7e7c2d6c4d4955ce2c60629.zip | |
RPM packaging: merge
3 files changed, 6 insertions, 6 deletions
diff --git a/debian/lenny/applications/smartcardauth/debian/control b/debian/lenny/applications/smartcardauth/debian/control index fe0807b35..11b25c7c5 100644 --- a/debian/lenny/applications/smartcardauth/debian/control +++ b/debian/lenny/applications/smartcardauth/debian/control @@ -3,12 +3,12 @@ Section: tde Priority: extra Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>=5.0), cdbs, pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, libpar-packer-perl, libdb-dev (>= 4.7), libpam0g-dev, libssl-dev, libkrb5-dev, libtqtinterface-dev +Build-Depends: debhelper (>=5.0), cdbs, libpcsclite1, libpcsc-perl, libpar-packer-perl, libdb-dev (>= 4.7), libpam0g-dev, libssl-dev, libkrb5-dev, libtqtinterface-dev Standards-Version: 3.8.4 Package: smartcardauth Architecture: any -Depends: pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, zenity, gksu +Depends: ${shlibs:Depends}, pcsc-tools, pcscd-nodbus | pcscd (>= 1.7~), initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, zenity, gksu Replaces: smartcardauth (<< 4:14.0.0~) Breaks: smartcardauth (<< 4:14.0.0~) Conflicts: openct diff --git a/debian/squeeze/applications/smartcardauth/debian/control b/debian/squeeze/applications/smartcardauth/debian/control index fe0807b35..11b25c7c5 100644 --- a/debian/squeeze/applications/smartcardauth/debian/control +++ b/debian/squeeze/applications/smartcardauth/debian/control @@ -3,12 +3,12 @@ Section: tde Priority: extra Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>=5.0), cdbs, pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, libpar-packer-perl, libdb-dev (>= 4.7), libpam0g-dev, libssl-dev, libkrb5-dev, libtqtinterface-dev +Build-Depends: debhelper (>=5.0), cdbs, libpcsclite1, libpcsc-perl, libpar-packer-perl, libdb-dev (>= 4.7), libpam0g-dev, libssl-dev, libkrb5-dev, libtqtinterface-dev Standards-Version: 3.8.4 Package: smartcardauth Architecture: any -Depends: pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, zenity, gksu +Depends: ${shlibs:Depends}, pcsc-tools, pcscd-nodbus | pcscd (>= 1.7~), initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, zenity, gksu Replaces: smartcardauth (<< 4:14.0.0~) Breaks: smartcardauth (<< 4:14.0.0~) Conflicts: openct diff --git a/ubuntu/maverick/applications/smartcardauth/debian/control b/ubuntu/maverick/applications/smartcardauth/debian/control index fe0807b35..11b25c7c5 100644 --- a/ubuntu/maverick/applications/smartcardauth/debian/control +++ b/ubuntu/maverick/applications/smartcardauth/debian/control @@ -3,12 +3,12 @@ Section: tde Priority: extra Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>=5.0), cdbs, pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, libpar-packer-perl, libdb-dev (>= 4.7), libpam0g-dev, libssl-dev, libkrb5-dev, libtqtinterface-dev +Build-Depends: debhelper (>=5.0), cdbs, libpcsclite1, libpcsc-perl, libpar-packer-perl, libdb-dev (>= 4.7), libpam0g-dev, libssl-dev, libkrb5-dev, libtqtinterface-dev Standards-Version: 3.8.4 Package: smartcardauth Architecture: any -Depends: pcsc-tools, pcscd-nodbus, initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, zenity, gksu +Depends: ${shlibs:Depends}, pcsc-tools, pcscd-nodbus | pcscd (>= 1.7~), initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, zenity, gksu Replaces: smartcardauth (<< 4:14.0.0~) Breaks: smartcardauth (<< 4:14.0.0~) Conflicts: openct |