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/libiconv | |
| 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/libiconv')
| -rw-r--r-- | package/libiconv/Makefile | 8 | ||||
| -rw-r--r-- | package/libiconv/ipkg/libiconv.control | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile index a84566949..75f314167 100644 --- a/package/libiconv/Makefile +++ b/package/libiconv/Makefile @@ -9,12 +9,14 @@ PKG_NAME:= libiconv PKG_VERSION:= 1.13 PKG_RELEASE:= 1 PKG_MD5SUM:= 048032a3032ebd182150bdee30a5d533 - -MASTER_SITES:= ${MASTER_SITE_GNU:=libiconv/} +PKG_DESCR:= character set conversion library +PKG_SECTION:= libs +PKG_URL:= http://www.gnu.org/software/libiconv +PKG_SITES:= ${MASTER_SITE_GNU:=libiconv/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBICONV,libiconv,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBICONV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/libiconv/ipkg/libiconv.control b/package/libiconv/ipkg/libiconv.control deleted file mode 100644 index 21306f1d7..000000000 --- a/package/libiconv/ipkg/libiconv.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libiconv -Priority: optional -Section: libs -Description: character set conversion library |