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/gsm/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/gsm') diff --git a/package/gsm/Makefile b/package/gsm/Makefile index 4377788e7..3b854e3ec 100644 --- a/package/gsm/Makefile +++ b/package/gsm/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= gsm PKG_VERSION:= 1.0.10 PKG_RELEASE:= 2 PKG_MD5SUM:= 4b148480f82e96d274248e13880ec873 -PKG_DESCR:= GSM 06.10 full-rate speech transcoding library -PKG_SECTION:= libs +PKG_DESCR:= gsm full-rate speech transcoding library +PKG_SECTION:= libs/misc PKG_URL:= http://www-rn.informatik.uni-bremen.de/software/gsm/ PKG_SITES:= http://www-rn.informatik.uni-bremen.de/software/gsm/ PKG_NOPARALLEL:= 1 @@ -18,9 +18,9 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_SUBPKGS:= LIBGSM GSM_UTILS -PKGSD_GSM_UTILS:= GSM 06.10 full-rate speech transcoding utilities +PKGSD_GSM_UTILS:= gsm full-rate speech transcoding utilities PKGSS_GSM_UTILS:= libgsm -PKGSC_GSM_UTILS:= misc +PKGSC_GSM_UTILS:= sys/misc WRKDIST= ${WRKDIR}/${PKG_NAME}-1.0-pl10 -- cgit v1.2.3