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/libjasper/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/libjasper')

diff --git a/package/libjasper/Makefile b/package/libjasper/Makefile
index e4b45a1fd..8bb52a3d8 100644
--- a/package/libjasper/Makefile
+++ b/package/libjasper/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		libjasper
 PKG_VERSION:=		1.900
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		a342b2b4495b3e1394e161eb5d85d754
-PKG_DESCR:=		implementation of the codec specified in the JPEG-2000 Part-1 standard
-PKG_SECTION:=		libs
+PKG_DESCR:=		implementation of the codec specified in the jpeg-2000 standard
+PKG_SECTION:=		libs/image
 PKG_URL:=		http://www.ece.uvic.ca/~frodo/jasper/
 PKG_SITES:=		http://www.ece.uvic.ca/~frodo/jasper/software/
 PKG_OPTS:=		dev
-- 
cgit v1.2.3