diff options
| author | woglinde <heinold@inf.fu-berlin.de> | 2008-10-15 22:19:00 +0200 |
|---|---|---|
| committer | woglinde <heinold@inf.fu-berlin.de> | 2008-10-15 22:19:00 +0200 |
| commit | 8f676f4eb8bc13b2a97b35da1d7a62e91d96680b (patch) | |
| tree | 87bcffdcb7c3dac8ce9f14b65c72418640ad2dfd | |
| parent | 4717426a86a8477cea4d3076211e83d6a5fdd0c0 (diff) | |
libiconv: fix the wrong merge
| -rw-r--r-- | packages/libiconv/libiconv_1.12.bb | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/packages/libiconv/libiconv_1.12.bb b/packages/libiconv/libiconv_1.12.bb index 824224e448..129eb13237 100644 --- a/packages/libiconv/libiconv_1.12.bb +++ b/packages/libiconv/libiconv_1.12.bb @@ -1,20 +1,4 @@ -<<<<<<< HEAD:packages/libiconv/libiconv_1.12.bb -DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \ -multiple character encodings, but that support lacks from your system." -HOMEPAGE = "http://www.gnu.org/software/libiconv" -SECTION = "libs" -PRIORITY = "optional" -NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8" -PROVIDES = "virtual/libiconv" -FILE_PR = "r0" -LICENSE = "LGPL" - -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz \ - file://autotools.patch;patch=1 \ - file://preload.patch;patch=1" -======= require libiconv.inc ->>>>>>> libinconv: split up into .inc and version file:packages/libiconv/libiconv_1.12.bb PROVIDES = "virtual/libiconv" PR = "r1" |