diff --git a/debian/changelog b/debian/changelog index ad92f8745a..679bf6eace 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -gtk+3.0 (2.91.6-1) UNRELEASED; urgency=low +gtk+3.0 (2.91.5-2) experimental; urgency=low * debian/control.in, debian/rules: + Remove the chrpath hack, it's been fixed in libtool. + * Update to the new gir policy: + - Rename gir1.0-gtk-3.0 to gir1.2-gtk-3.0. + - Bump the gobject-introspection build dependency. + - Build depend on gir1.2 packages. - -- Emilio Pozuelo Monfort Wed, 08 Dec 2010 23:58:24 +0100 + -- Emilio Pozuelo Monfort Sun, 12 Dec 2010 16:03:02 +0100 gtk+3.0 (2.91.5-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 0fbe79c695..44f4483f3f 100644 --- a/debian/control +++ b/debian/control @@ -29,13 +29,13 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), x11proto-xext-dev, libcups2-dev (>= 1.2), - gobject-introspection (>= 0.9.3), + gobject-introspection (>= 0.9.12-4~), 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, + gir1.2-glib-2.0, + gir1.2-freedesktop, + gir1.2-atk-1.0, + gir1.2-pango-1.0, + gir1.2-gdkpixbuf-2.0, quilt, gawk, xsltproc, @@ -218,12 +218,13 @@ Description: Pixbuf-based theme for GTK+ 3.x . This package contains the pixbuf theme engine. -Package: gir1.0-gtk-3.0 +Package: gir1.2-gtk-3.0 Architecture: any Depends: libgtk3.0-common, ${misc:Depends}, ${shlibs:Depends}, ${gir:Depends} +Conflicts: gir1.0-gtk-3.0 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 diff --git a/debian/control.in b/debian/control.in index 0e9ee6d83b..00f9b81956 100644 --- a/debian/control.in +++ b/debian/control.in @@ -29,13 +29,13 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), x11proto-xext-dev, libcups2-dev (>= 1.2), - gobject-introspection (>= 0.9.3), + gobject-introspection (>= 0.9.12-4~), 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, + gir1.2-glib-2.0, + gir1.2-freedesktop, + gir1.2-atk-1.0, + gir1.2-pango-1.0, + gir1.2-gdkpixbuf-2.0, quilt, gawk, xsltproc, @@ -218,12 +218,13 @@ Description: Pixbuf-based theme for GTK+ 3.x . This package contains the pixbuf theme engine. -Package: gir1.0-gtk-3.0 +Package: gir1.2-gtk-3.0 Architecture: any Depends: @COMMON_PKG@, ${misc:Depends}, ${shlibs:Depends}, ${gir:Depends} +Conflicts: gir1.0-gtk-3.0 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 diff --git a/debian/gir1.0-gtk-3.0.install.in b/debian/gir1.2-gtk-3.0.install.in similarity index 100% rename from debian/gir1.0-gtk-3.0.install.in rename to debian/gir1.2-gtk-3.0.install.in diff --git a/debian/rules b/debian/rules index f1f7f4e754..7826d2d08b 100644 --- a/debian/rules +++ b/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) gir1.0-gtk-3.0 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.2-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 @@ -322,7 +322,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_girepository -pgir1.2-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