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/ipvsadm | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/ipvsadm')
-rw-r--r-- | package/ipvsadm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/ipvsadm/Makefile b/package/ipvsadm/Makefile index 918a3a493..6c04ab54b 100644 --- a/package/ipvsadm/Makefile +++ b/package/ipvsadm/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= ipvsadm PKG_VERSION:= 1.26 PKG_RELEASE:= 2 PKG_MD5SUM:= eac3ba3f62cd4dea2da353aeddd353a8 -PKG_DESCR:= IPVS admin utility -PKG_SECTION:= net +PKG_DESCR:= ip virtual server admin utility +PKG_SECTION:= net/misc PKG_DEPENDS:= libpopt PKG_BUILDDEP:= popt PKG_URL:= http://www.linuxvirtualserver.org/ |