diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/openssl/ipkg | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/openssl/ipkg')
| -rw-r--r-- | package/openssl/ipkg/ca-certificates.conffiles | 1 | ||||
| -rw-r--r-- | package/openssl/ipkg/ca-certificates.control | 4 | ||||
| -rw-r--r-- | package/openssl/ipkg/libopenssl.control | 5 | ||||
| -rw-r--r-- | package/openssl/ipkg/openssl-util.conffiles | 1 | ||||
| -rw-r--r-- | package/openssl/ipkg/openssl-util.control | 5 |
5 files changed, 0 insertions, 16 deletions
diff --git a/package/openssl/ipkg/ca-certificates.conffiles b/package/openssl/ipkg/ca-certificates.conffiles deleted file mode 100644 index 8121eba55..000000000 --- a/package/openssl/ipkg/ca-certificates.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/ssl/cert.pem diff --git a/package/openssl/ipkg/ca-certificates.control b/package/openssl/ipkg/ca-certificates.control deleted file mode 100644 index 41a077de4..000000000 --- a/package/openssl/ipkg/ca-certificates.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: ca-certificates -Priority: optional -Section: base -Description: X.509v3 Root CA Certificates diff --git a/package/openssl/ipkg/libopenssl.control b/package/openssl/ipkg/libopenssl.control deleted file mode 100644 index 6e5cd6749..000000000 --- a/package/openssl/ipkg/libopenssl.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libopenssl -Priority: optional -Section: libs -Description: OpenSSL (Secure Socket Layer) libraries -Depends: zlib diff --git a/package/openssl/ipkg/openssl-util.conffiles b/package/openssl/ipkg/openssl-util.conffiles deleted file mode 100644 index 6d068e66c..000000000 --- a/package/openssl/ipkg/openssl-util.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/ssl/openssl.cnf diff --git a/package/openssl/ipkg/openssl-util.control b/package/openssl/ipkg/openssl-util.control deleted file mode 100644 index 4c14ab1aa..000000000 --- a/package/openssl/ipkg/openssl-util.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: openssl-util -Priority: optionnal -Section: admin -Description: OpenSSL (Secure Socket Layer) command line tool -Depends: libopenssl |