diff -u gir-repository-0.6.5/debian/gir-repository-dev.install gir-repository-0.6.5/debian/gir-repository-dev.install --- gir-repository-0.6.5/debian/gir-repository-dev.install +++ gir-repository-0.6.5/debian/gir-repository-dev.install @@ -4,10 +4,6 @@ debian/tmp/usr/share/gir-1.0/GConf-2.0.gir debian/tmp/usr/share/gir-1.0/GnomeKeyring-2.0.gir debian/tmp/usr/share/gir-1.0/GooCanvas-0.10.gir -debian/tmp/usr/share/gir-1.0/Atk-1.0.gir -debian/tmp/usr/share/gir-1.0/Gdk*-2.0.gir -debian/tmp/usr/share/gir-1.0/Gtk-2.0.gir -debian/tmp/usr/share/gir-1.0/Pango*.gir debian/tmp/usr/share/gir-1.0/GtkSource-2.2.gir debian/tmp/usr/share/gir-1.0/GSSDP-1.0.gir debian/tmp/usr/share/gir-1.0/GUPnP-1.0.gir reverted: --- gir-repository-0.6.5/debian/gir1.0-gtk-2.0.install +++ gir-repository-0.6.5.orig/debian/gir1.0-gtk-2.0.install @@ -1,6 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/Atk-1.0.typelib -debian/tmp/usr/lib/girepository-1.0/Gdk*-2.0.typelib -debian/tmp/usr/lib/girepository-1.0/Gtk-2.0.typelib -debian/tmp/usr/lib/girepository-1.0/Pango*.typelib -debian/tmp/usr/lib/libgirepo-Gdk-custom.so.* -debian/tmp/usr/lib/libgirepo-Gtk-custom.so.* diff -u gir-repository-0.6.5/debian/control gir-repository-0.6.5/debian/control --- gir-repository-0.6.5/debian/control +++ gir-repository-0.6.5/debian/control @@ -17,10 +17,8 @@ gobject-introspection (>= 0.6.5-3), gir1.0-glib-2.0 (>= 0.6.5), gir1.0-freedesktop, + gir1.0-gtk-2.0, libtool, - libpango1.0-dev (>= 1.16.0), - libatk1.0-dev (>= 1.12.0), - libgtk2.0-dev (>= 2.12.0), libglade2-dev (>= 2.5.0), python-cairo (>= 1.0.2), python-gobject (>= 2.14.0), @@ -133,29 +131,6 @@ It can be used by packages using the GIRepository format to generate dynamic bindings. -Package: gir1.0-gtk-2.0 -Section: libs -Architecture: any -Depends: ${gir:Depends}, - ${shlibs:Depends}, - ${misc:Depends} -Provides: gir1.0-atk-1.0, - gir1.0-pango-1.0 -Conflicts: gobject-introspection-repository -Description: GObject introspection data for the GTK+ library - This package contains introspection data for the GTK+ graphical - toolkit, and a few related libraries. It contains the following - modules: - . - * Pango - * Atk - * Gdk - * GdkPixbuf - * Gtk - . - It can be used by packages using the GIRepository format to generate - dynamic bindings. - Package: gir1.0-gtksource-2.2 Section: libs Architecture: any @@ -290,25 +265,20 @@ This package contains the XML sources for introspection data of the following libraries: . - * Atk * Avahi * Babl * Cairo * FontConfig * FreeType2 * GConf - * Gdk - * GdkPixbuf * OpenGL * GnomeKeyring * GooCanvas * GSSDP - * Gtk * GUPnp * libxml2 * libnotify * libsoup - * Pango * Poppler * Vte * Xft diff -u gir-repository-0.6.5/debian/changelog gir-repository-0.6.5/debian/changelog --- gir-repository-0.6.5/debian/changelog +++ gir-repository-0.6.5/debian/changelog @@ -1,3 +1,9 @@ +gir-repository (0.6.5-5ubuntu2) lucid; urgency=low + + * Don't build the gtk gir since it's build from the gtk source now + + -- Sebastien Bacher Mon, 19 Apr 2010 10:46:58 +0200 + gir-repository (0.6.5-5ubuntu1) lucid; urgency=low * Don't build gir1.0-gmenu-2.0 since gnome-menus does that now diff -u gir-repository-0.6.5/debian/control.in gir-repository-0.6.5/debian/control.in --- gir-repository-0.6.5/debian/control.in +++ gir-repository-0.6.5/debian/control.in @@ -12,10 +12,8 @@ gobject-introspection (>= 0.6.5-3), gir1.0-glib-2.0 (>= 0.6.5), gir1.0-freedesktop, + gir1.0-gtk-2.0, libtool, - libpango1.0-dev (>= 1.16.0), - libatk1.0-dev (>= 1.12.0), - libgtk2.0-dev (>= 2.12.0), libglade2-dev (>= 2.5.0), python-cairo (>= 1.0.2), python-gobject (>= 2.14.0), @@ -128,29 +126,6 @@ It can be used by packages using the GIRepository format to generate dynamic bindings. -Package: gir1.0-gtk-2.0 -Section: libs -Architecture: any -Depends: ${gir:Depends}, - ${shlibs:Depends}, - ${misc:Depends} -Provides: gir1.0-atk-1.0, - gir1.0-pango-1.0 -Conflicts: gobject-introspection-repository -Description: GObject introspection data for the GTK+ library - This package contains introspection data for the GTK+ graphical - toolkit, and a few related libraries. It contains the following - modules: - . - * Pango - * Atk - * Gdk - * GdkPixbuf - * Gtk - . - It can be used by packages using the GIRepository format to generate - dynamic bindings. - Package: gir1.0-gtksource-2.2 Section: libs Architecture: any @@ -285,25 +260,20 @@ This package contains the XML sources for introspection data of the following libraries: . - * Atk * Avahi * Babl * Cairo * FontConfig * FreeType2 * GConf - * Gdk - * GdkPixbuf * OpenGL * GnomeKeyring * GooCanvas * GSSDP - * Gtk * GUPnp * libxml2 * libnotify * libsoup - * Pango * Poppler * Vte * Xft