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/opensc | |
| 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/opensc')
| -rw-r--r-- | package/opensc/Makefile | 11 | ||||
| -rw-r--r-- | package/opensc/ipkg/opensc.control | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 66e1b66bd..2c742ca95 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -6,14 +6,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= opensc -PKG_VERSION:= 0.11.7 +PKG_VERSION:= 0.11.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 419e9be372c2f9bbb3ce9704c929d5ec -MASTER_SITES:= http://www.opensc-project.org/files/opensc/ +PKG_MD5SUM:= a269b478b18dddb648b9bd930206b5a8 +PKG_DESCR:= a set of libraries and utilities to access smart cards +PKG_SECTION:= crypto +PKG_URL:= http://www.opensc-project.org/opensc +PKG_SITES:= http://www.opensc-project.org/files/opensc/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OPENSC,opensc,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OPENSC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto diff --git a/package/opensc/ipkg/opensc.control b/package/opensc/ipkg/opensc.control deleted file mode 100644 index 1b981261f..000000000 --- a/package/opensc/ipkg/opensc.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: opensc -Priority: optional -Section: crypto -Description: opensc |