* Add gir1.0-gtk-3.0, based on the gir1.0-gtk-2.0 Ubuntu patch.

* debian/patches/004_gtk_gir_build.patch:
  + Fix the introspection build.
* debian/patches/070_mandatory-relibtoolize.patch:
  + Updated.

debian/changelog

@@ -1,7 +1,15 @@
 gtk+3.0 (2.91.4-2) UNRELEASED; urgency=low
 
+  [ Laurent Bigonville ]
   * debian/watch: Bump version to 3
 
+  [ Emilio Pozuelo Monfort ]
+  * Add gir1.0-gtk-3.0, based on the gir1.0-gtk-2.0 Ubuntu patch.
+  * debian/patches/004_gtk_gir_build.patch:
+    + Fix the introspection build.
+  * debian/patches/070_mandatory-relibtoolize.patch:
+    + Updated.
+
  -- Laurent Bigonville <bigon@debian.org>  Sun, 21 Nov 2010 22:14:03 +0100
 
 gtk+3.0 (2.91.4-1) experimental; urgency=low

debian/control.in

@@ -30,6 +30,13 @@ Build-Depends: debhelper (>= 7.0.50~),
                dpkg-dev (>= 1.13.19),
                x11proto-xext-dev,
                libcups2-dev (>= 1.2),
+               gobject-introspection (>= 0.9.3),
+               libgirepository1.0-dev (>= 0.9.3),
+               gir1.0-glib-2.0,
+               gir1.0-freedesktop,
+               gir1.0-atk-1.0,
+               gir1.0-pango-1.0,
+               gir1.0-gdkpixbuf-2.0,
                quilt,
                gawk,
                xsltproc,
@@ -212,6 +219,21 @@ Description: Pixbuf-based theme for GTK+ 3.x
  .
  This package contains the pixbuf theme engine.
 
+Package: gir1.0-gtk-3.0
+Architecture: any
+Depends: @COMMON_PKG@,
+         ${misc:Depends},
+         ${shlibs:Depends},
+         ${gir:Depends}
+Description: The GTK+ graphical user interface library -- gir bindings
+ The GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, the GTK+ is suitable
+ for projects ranging from small one-off tools to complete application
+ suites.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings.
+
 Package: libgail3.0-0
 Architecture: any
 Depends: ${misc:Depends},

debian/gir1.0-gtk-3.0.install.in

@@ -0,0 +1 @@
+debian/install/shared/usr/lib/girepository-1.0/ usr/lib/

debian/libgtk3.0-dev.install.in

@@ -6,5 +6,6 @@ debian/install/shared/@LIBDIR@/libg?k*.so @LIBDIR@
 debian/install/shared/@LIBDIR@/pkgconfig/g?k* @LIBDIR@/pkgconfig
 debian/install/shared/@LIBDIR@/gtk-@APIVER@/include @LIBDIR@/gtk-@APIVER@
 debian/install/shared/usr/share/aclocal usr/share
+debian/install/shared/usr/share/gir-1.0 usr/share
 # from the static flavor
 debian/install/static/@LIBDIR@/libg?k*.a @LIBDIR@

debian/patches/004_gtk_gir_build.patch

@@ -0,0 +1,11 @@
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -916,7 +916,7 @@
+ 		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
+ Gtk_3_0_gir_LIBS = $(gtktargetlib)
+ if USE_X11
+-Gtk_3_0_gir_LIBS += $(top_builddir)/gdk/x11/libgdk-x11.la
++Gtk_3_0_gir_LIBS += $(top_builddir)/gdk/libgdk-x11-3.0.la
+ endif
+ Gtk_3_0_gir_FILES = $(introspection_files)
+ INTROSPECTION_GIRS += Gtk-3.0.gir

debian/patches/series

@@ -1,6 +1,7 @@
 001_static-linking-dont-query-immodules.patch
 002_static-linking-dont-build-perf.patch
 003_gdk.pc_privates.patch
+004_gtk_gir_build.patch
 005_support_disabling_x11_extensions.patch
 015_default-fallback-icon-theme.patch
 022_disable-viqr-im-for-vi-locale.patch

debian/rules

@@ -77,7 +77,7 @@ PIXBUF_PKG := gtk3-engines-pixbuf
 
 # package groups, used in rule dependencies and in cleanup
 BINARY_INDEP_PKGS := $(COMMON_PKG) $(BIN_PKG) $(DOC_PKG) libgail3.0-doc
-BINARY_ARCH_PKGS := $(SHARED_PKG) $(UDEB_PKG) $(DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG) libgail3.0-0 libgail3.0-0-dbg libgail3.0-dev libgail3.0-common
+BINARY_ARCH_PKGS := $(SHARED_PKG) $(UDEB_PKG) $(DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG) gir1.0-gtk-3.0 libgail3.0-0 libgail3.0-0-dbg libgail3.0-dev libgail3.0-common
 ALL_PKGS := $(BINARY_INDEP_PKGS) $(BINARY_ARCH_PKGS)
 
 # list of flavors we build; each gets a builddir, a configure pass (configure
@@ -127,7 +127,7 @@ endif
 
 shared_configure_flags := $(configure_flags) \
 			--enable-shared \
-			--enable-introspection=no \
+			--enable-introspection=yes \
 			--disable-static
 shared_udeb_configure_flags := $(shared_configure_flags) \
 			--disable-xcomposite \
@@ -324,6 +324,7 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK
 		-X$(MODULES_BASE_PATH) \
 		-V"libgail3.0-0 (>= $(SHVER)), libgail3.0-common (>= $(SHVER))" \
 		-- -c4
+	dh_girepository -pgir1.0-gtk-3.0
 	dh_installdeb -s
 	# override shlibs for libraries from this source before computing
 	# dependencies of packages generated from this source; we already have