From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/bzip2/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/bzip2/Makefile')

diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index 0dca61217..61e58e18c 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.6
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		00b516f4704d4a7cb50a1d97e6e8e15b
 PKG_DESCR:=		compression utility
-PKG_SECTION:=		archive
+PKG_SECTION:=		app/archive
 PKG_BUILDDEP:=		bzip2-host
 PKG_DEPENDS:=		libbz2
 PKG_URL:=		http://www.bzip.org/
@@ -21,7 +21,7 @@ DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		BZIP2 LIBBZ2
 PKGSD_LIBBZ2:=		bzip2 compression library
-PKGSC_LIBBZ2:=		libs
+PKGSC_LIBBZ2:=		libs/misc
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libmix
-- 
cgit v1.2.3