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/linux-atm | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/linux-atm')
-rw-r--r-- | package/linux-atm/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index eaa2db1eb..34d6c6972 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= linux-atm PKG_VERSION:= 2.5.1 PKG_RELEASE:= 3 PKG_MD5SUM:= 9560b0e1f410a05b849dfdab465dd758 -PKG_DESCR:= ATM library for Linux -PKG_SECTION:= libs +PKG_DESCR:= atm library +PKG_SECTION:= libs/net PKG_BUILDDEP:= flex-host PKG_URL:= http://linux-atm.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-atm/} @@ -21,7 +21,7 @@ PKG_HOST_DEPENDS:= !freebsd PKG_SUBPKGS:= LIBATM BR2684CTL PKGSD_BR2684CTL:= br2684ctl ATM utility PKGSS_BR2684CTL:= libatm -PKGSC_BR2684CTL:= route +PKGSC_BR2684CTL:= net/route DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz |