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/libgcrypt | |
| 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/libgcrypt')
| -rw-r--r-- | package/libgcrypt/Makefile | 8 | ||||
| -rw-r--r-- | package/libgcrypt/ipkg/libgcrypt.control | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index fd7c283d6..a414dca74 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= libgcrypt PKG_VERSION:= 1.4.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 555488ddfc81a6e0df1fb5112e7eee13 -MASTER_SITES:= ftp://ftp.gnupg.org/gcrypt/libgcrypt/ +PKG_DESCR:= GNU crypto library +PKG_SECTION:= libs +PKG_DEPENDS:= libgpg-error +PKG_URL:= http://directory.fsf.org/project/libgcrypt +PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgcrypt/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-asm \ diff --git a/package/libgcrypt/ipkg/libgcrypt.control b/package/libgcrypt/ipkg/libgcrypt.control deleted file mode 100644 index 8cf2b303f..000000000 --- a/package/libgcrypt/ipkg/libgcrypt.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: libgcrypt -Priority: optional -Section: libs -Description: GNU crypto library -Depends: libgpg-error - |