From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/libxml2/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/libxml2') diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 957a3a355..f10b3e2b3 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libxml2 PKG_VERSION:= 2.9.1 PKG_RELEASE:= 6 PKG_MD5SUM:= 9c0cfef285d5c4a5c80d00904ddab380 -PKG_DESCR:= XML C parser and toolkit -PKG_SECTION:= libs +PKG_DESCR:= xml parser and toolkit +PKG_SECTION:= libs/data PKG_DEPENDS:= zlib PKG_BUILDDEP:= libxml2-host zlib HOST_BUILDDEP:= python2-host @@ -20,7 +20,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_SUBPKGS:= LIBXML2 LIBXML2_PYTHON PKGSD_LIBXML2_PYTHON:= XML python bindings -PKGSC_LIBXML2_PYTHON:= libs +PKGSC_LIBXML2_PYTHON:= libs/misc PKGSB_LIBXML2_PYTHON:= python2 PKGSS_LIBXML2_PYTHON:= python2 -- cgit v1.2.3