From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/orbit2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/orbit2') diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile index d7718fed9..f5dd70105 100644 --- a/package/orbit2/Makefile +++ b/package/orbit2/Makefile @@ -8,8 +8,8 @@ PKG_VERSION:= 2.14.19 PKG_EXTRAVER:= 2.14 PKG_RELEASE:= 5 PKG_MD5SUM:= 87c69c56c6d0bdafa4de5e18ae115cc9 -PKG_DESCR:= a CORBA 2.4-compliant Object Request Broker -PKG_SECTION:= libs +PKG_DESCR:= corba 2.4-compliant object request broker +PKG_SECTION:= libs/misc PKG_BUILDDEP:= gettext-tiny glib-host libIDL-host glib libIDL PKG_URL:= http://projects.gnome.org/ORBit2/ PKG_SITES:= ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/ -- cgit v1.2.3