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/openct | |
| 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/openct')
| -rw-r--r-- | package/openct/Makefile | 18 | ||||
| -rw-r--r-- | package/openct/ipkg/openct.control | 5 |
2 files changed, 10 insertions, 13 deletions
diff --git a/package/openct/Makefile b/package/openct/Makefile index 3e371af57..c561727b3 100644 --- a/package/openct/Makefile +++ b/package/openct/Makefile @@ -6,24 +6,26 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openct -PKG_VERSION:= 0.6.15 +PKG_VERSION:= 0.6.16 PKG_RELEASE:= 1 -PKG_MD5SUM:= 70205beac03974e266fc259b6c9feaa8 -MASTER_SITES:= http://www.opensc-project.org/files/openct/ +PKG_MD5SUM:= d8d8c63269985303a303a218c4b953d7 +PKG_DESCR:= drivers for several smart card readers +PKG_SECTION:= libs +PKG_DEPENDS:= libltdl libusb +PKG_URL:= http://www.opensc-project.org/openct +PKG_SITES:= http://www.opensc-project.org/files/openct/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OPENCT,openct,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OPENCT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_OPENCT}/etc - ${INSTALL_DIR} ${IDIR_OPENCT}/usr/bin - ${INSTALL_DIR} ${IDIR_OPENCT}/usr/sbin - ${INSTALL_DIR} ${IDIR_OPENCT}/usr/lib + ${INSTALL_DIR} ${IDIR_OPENCT}/etc ${IDIR_OPENCT}/usr/bin + ${INSTALL_DIR} ${IDIR_OPENCT}/usr/sbin ${IDIR_OPENCT}/usr/lib ${CP} ${WRKINST}/usr/lib/libopenct.so.* \ ${IDIR_OPENCT}/usr/lib ${INSTALL_BIN} ${WRKINST}/usr/sbin/openct-control \ diff --git a/package/openct/ipkg/openct.control b/package/openct/ipkg/openct.control deleted file mode 100644 index eb8307711..000000000 --- a/package/openct/ipkg/openct.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: openct -Priority: optional -Section: crypto -Depends: libltdl, libusb -Description: openct |