3 files changed, 9 insertions, 11 deletions
diff --git a/package/gsm/Makefile b/package/gsm/Makefile
index c0ceafeb0..1f8687388 100644
--- a/package/gsm/Makefile
+++ b/package/gsm/Makefile
@@ -9,13 +9,19 @@ PKG_NAME:=		gsm
 PKG_VERSION:=		1.0.10
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		4b148480f82e96d274248e13880ec873
-MASTER_SITES:=		http://www-rn.informatik.uni-bremen.de/software/gsm/
+PKG_DESCR:=		A GSM 06.10 full-rate speech transcoding implementation (library)
+PKG_SECTION:=		libs
+PKG_URL:=		http://www-rn.informatik.uni-bremen.de/software/gsm/
+PKG_SITES:=		http://www-rn.informatik.uni-bremen.de/software/gsm/
+
+PKG_DESCR_1:=		A GSM 06.10 full-rate speech transcoding implementation (utilities)
+
 WRKDIST=		${WRKDIR}/${PKG_NAME}-1.0-pl10
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 
 XAKE_FLAGS+=		COPTS="${TARGET_CFLAGS}" \
 			INSTALL_ROOT="${WRKINST}"
diff --git a/package/gsm/ipkg/gsm-utils.control b/package/gsm/ipkg/gsm-utils.control
deleted file mode 100644
index b022f7154..000000000
--- a/package/gsm/ipkg/gsm-utils.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: gsm-utils
-Priority: optional
-Section: admin
-Description: A GSM 06.10 full-rate speech transcoding implementation (utilities)
diff --git a/package/gsm/ipkg/libgsm.control b/package/gsm/ipkg/libgsm.control
deleted file mode 100644
index 922f69656..000000000
--- a/package/gsm/ipkg/libgsm.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: libgsm
-Priority: optional
-Section: libs
-Description: A GSM 06.10 full-rate speech transcoding implementation (library)