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/gpg | |
| 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/gpg')
| -rw-r--r-- | package/gpg/Makefile | 8 | ||||
| -rw-r--r-- | package/gpg/ipkg/gpg.control | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/package/gpg/Makefile b/package/gpg/Makefile index 2f32d09b5..3dcd24f3b 100644 --- a/package/gpg/Makefile +++ b/package/gpg/Makefile @@ -9,12 +9,16 @@ PKG_NAME:= gnupg PKG_VERSION:= 1.4.9 PKG_RELEASE:= 1 PKG_MD5SUM:= 3537dedea45cc09e8d88d1ef4f774246 -MASTER_SITES:= ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/ \ +PKG_DESCR:= Gnu Privacy Guard +PKG_SECTION:= text +PKG_DEPENDS:= libreadline +PKG_URL:= http://www.gnu.org +PKG_SITES:= ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/ \ ftp://ftp.gnupg.org/gcrypt/gnupg/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GPG,gpg,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,GPG,gpg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_c_bigendian=no \ diff --git a/package/gpg/ipkg/gpg.control b/package/gpg/ipkg/gpg.control deleted file mode 100644 index 8dd20f144..000000000 --- a/package/gpg/ipkg/gpg.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: gpg -Priority: optional -Section: text -Description: Gnu Privacy Guard -Depends: libreadline |