diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
| commit | 2c8917958da115704507aab835c41c1a4a63664d (patch) | |
| tree | e79c26b6347e2ae8444bcdbce1236cc48f63107e /package/gmediaserver | |
| parent | cf5ef7c683fa845a6e6412b319e0a1040aa0f445 (diff) | |
| parent | cd83ced050a5d68c922a0de054ac022cd4ff26ac (diff) | |
resolve conflict
Diffstat (limited to 'package/gmediaserver')
| -rw-r--r-- | package/gmediaserver/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index 6b4f63b66..b8eb3ebb5 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= c422de386331e2a1a859d45f6fa270a3 PKG_DESCR:= An UPnP music media server PKG_SECTION:= multimedia -PKG_DEPENDS:= id3lib libupnp libiconv -PKG_BUILDDEP:= id3lib libupnp libiconv +PKG_DEPENDS:= id3lib libupnp libmagic libiconv +PKG_BUILDDEP:= id3lib libupnp file libiconv PKG_URL:= http://www.gnu.org/software/gmediaserver PKG_SITES:= http://savannah.nongnu.org/download/gmediaserver/ |