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/xcb-proto/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/xcb-proto') diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index ce7f81a32..2c48765ef 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xcb-proto PKG_VERSION:= 1.10 PKG_RELEASE:= 1 -PKG_DESCR:= XML-XCB protocol descriptions -PKG_SECTION:= devel +PKG_DESCR:= xml-xcb protocol descriptions +PKG_SECTION:= dev/header PKG_MD5SUM:= 2b9dc6442156aba2bfb4133cb9d7cf46 PKG_BUILDDEP:= autotool bzip2-host python2-host xcb-proto-host PKG_SITES:= http://xcb.freedesktop.org/dist/ -- cgit v1.2.3