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/gconf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/gconf/Makefile') diff --git a/package/gconf/Makefile b/package/gconf/Makefile index 38a14e6c0..92cc9a4ed 100644 --- a/package/gconf/Makefile +++ b/package/gconf/Makefile @@ -8,8 +8,8 @@ PKG_VERSION:= 2.32.1 PKG_EXTRAVER:= 2.32 PKG_RELEASE:= 1 PKG_MD5SUM:= de83e70453910ac62f9ee2a86444bdab -PKG_DESCR:= a system for storing application preferences -PKG_SECTION:= libs +PKG_DESCR:= system for storing application preferences +PKG_SECTION:= libs/misc PKG_BUILDDEP:= dbus dbus-glib orbit2 PKG_DEPENDS:= dbus dbus-glib orbit2 PKG_URL:= http://projects.gnome.org/gconf/ -- cgit v1.2.3