diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/gsm | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/gsm')
| -rw-r--r-- | package/gsm/Makefile | 12 | ||||
| -rw-r--r-- | package/gsm/ipkg/gsm-utils.control | 4 | ||||
| -rw-r--r-- | package/gsm/ipkg/libgsm.control | 4 |
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) |