diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/obexftp | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/obexftp')
| -rw-r--r-- | package/obexftp/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile index 0aaff10ff..ed1af086e 100644 --- a/package/obexftp/Makefile +++ b/package/obexftp/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= obexftp PKG_VERSION:= 0.23 PKG_RELEASE:= 4 PKG_MD5SUM:= f20762061b68bc921e80be4aebc349eb -PKG_DESCR:= OBEX ftp application -PKG_SECTION:= misc +PKG_DESCR:= bluetooth ftp application +PKG_SECTION:= sys/misc PKG_DEPENDS:= openobex libobexftp PKG_BUILDDEP:= openobex libiconv-tiny PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp @@ -17,7 +17,7 @@ PKG_LIBNAME:= libobexftp PKG_OPTS:= dev PKG_SUBPKGS:= OBEXFTP LIBOBEXFTP -PKGSC_LIBOBEXFTP:= libs +PKGSC_LIBOBEXFTP:= libs/net PKGSD_LIBOBEXFTP:= obex ftp library DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 |