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/gettext | |
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/gettext')
-rw-r--r-- | package/gettext/Makefile | 9 | ||||
-rw-r--r-- | package/gettext/ipkg/gettext.control | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 7a85f5af8..2bdf3eadb 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -9,12 +9,17 @@ PKG_NAME= gettext PKG_VERSION= 0.16.1 PKG_RELEASE= 1 PKG_MD5SUM= 3d9ad24301c6d6b17ec30704a13fe127 -MASTER_SITES= ${MASTER_SITE_GNU:=gettext/} +PKG_DESCR:= internationalisation library +PKG_SECTION:= libs +PKG_DEPENDS:= libiconv libpthread +PKG_URL:= http://www.gnu.org/software/gettext/ +PKG_SITES= ${MASTER_SITE_GNU:=gettext/} + WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}/gettext-runtime include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GETTEXT,gettext,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,GETTEXT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-java \ diff --git a/package/gettext/ipkg/gettext.control b/package/gettext/ipkg/gettext.control deleted file mode 100644 index f963cda74..000000000 --- a/package/gettext/ipkg/gettext.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: gettext -Priority: optional -Section: libs -Depends: libiconv, libpthread -Description: internationalisation library |