From bf4ea69ac8df5dfb86e5eee5b6ff671d20f010c1 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 23 Oct 2010 22:35:48 +0200
Subject: [PATCH] glib: move some bins from -devel to main pkg, bumprev.

---
 srcpkgs/glib/glib-devel.template | 18 +++++++++++++++---
 srcpkgs/glib/template            |  1 +
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glib/glib-devel.template b/srcpkgs/glib/glib-devel.template
index 078f1df971..6be69ff591 100644
--- a/srcpkgs/glib/glib-devel.template
+++ b/srcpkgs/glib/glib-devel.template
@@ -5,22 +5,34 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 Add_dependency run zlib-devel
 Add_dependency run pcre-devel
 Add_dependency run glib
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/{lib,bin,share}
-
+	install -d ${DESTDIR}/usr/{lib,bin,share} ${DESTDIR}/usr/share/man/man1
+	
 	for f in $(find ${SRCPKGDESTDIR}/usr/bin -type f); do
 		[ "$(basename ${f})" = "gio-querymodules" ] && continue
+		[ "$(basename ${f})" = "gdbus" ] && continue
+		[ "$(basename ${f})" = "gsettings" ] && continue
+		[ "$(basename ${f})" = "glib-compile-schemas" ] && continue
 		mv ${f} ${DESTDIR}/usr/bin
 	done
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/glib-2.0 ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	for f in man gtk-doc aclocal glib-2.0 gdb; do
+	for f in gtk-doc aclocal glib-2.0 gdb; do
 		mv ${SRCPKGDESTDIR}/usr/share/${f} ${DESTDIR}/usr/share
 	done
+	for f in $(find ${SRCPKGDESTDIR}/usr/share/man/man1 -type f); do
+		[ "$(basename ${f})" = "gio-querymodules.1" ] && continue
+		[ "$(basename ${f})" = "gdbus.1" ] && continue
+		[ "$(basename ${f})" = "gsettings.1" ] && continue
+		[ "$(basename ${f})" = "glib-compile-schemas.1" ] && continue
+		mv ${f} ${DESTDIR}/usr/share/man/man1
+	done
 }
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0ed01d0e23..f07fe5f8eb 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,7 @@
 # Template build file for 'glib'
 pkgname=glib
 version=2.26.0
+revision=1
 distfiles="${GNOME_SITE}/glib/2.26/glib-$version.tar.bz2"
 configure_args="--disable-fam --with-pcre=system"
 build_style=gnu_configure