gnome-shell: needs some gir pkgs, so move them into the main pkg.

--HG--
branch : gnome3

srcpkgs/avahi/avahi-glib-libs.template

@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains the glib shared libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libssp
 Add_dependency run dbus-libs
@@ -17,4 +19,5 @@ do_install()
 
 	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-glib.so* ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-gobject.so* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/girepository* ${DESTDIR}/usr/lib
 }

srcpkgs/avahi/gir-avahi.template

@@ -1,12 +0,0 @@
-# Template file for 'gir-avahi'.
-#
-short_desc="Introspection data for Avahi"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for Avahi."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}

srcpkgs/avahi/template

@@ -31,7 +31,7 @@ subpackages="$subpackages $pkgname-glib-libs-devel $pkgname-ui-libs"
 subpackages="$subpackages $pkgname-ui-libs-gtk3"
 subpackages="$subpackages $pkgname-ui-libs-devel $pkgname-utils"
 subpackages="$subpackages $pkgname-ui-utils $pkgname-python-utils"
-subpackages="$subpackages $pkgname-python gir-$pkgname"
+subpackages="$subpackages $pkgname-python"
 
 Add_dependency run glibc
 Add_dependency run dbus