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/lame/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'package/lame')
diff --git a/package/lame/Makefile b/package/lame/Makefile
index 87e84ab80..7a0149bd7 100644
--- a/package/lame/Makefile
+++ b/package/lame/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= lame
PKG_VERSION:= 3.99
PKG_RELEASE:= 1
PKG_MD5SUM:= 7abacd1d0a65a63733335786015626db
-PKG_DESCR:= MP3 encoder
-PKG_SECTION:= multimedia
+PKG_DESCR:= mp3 encoder
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_URL:= http://lame.sourceforge.net/
@@ -19,8 +19,8 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= LAME LIBMP3LAME
-PKGSD_LIBMP3LAME:= MP3 encoding library
-PKGSC_LIBMP3LAME:= libs
+PKGSD_LIBMP3LAME:= mp3 encoding library
+PKGSC_LIBMP3LAME:= libs/audio
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
--
cgit v1.2.3