Source: gtk2-engines
Version: 1:2.18.5-1
Severity: wishlist
Tags: patch d-i
Hi,
please find attached the patch I used. As explained in pango, gtk, and
vte patches, the vBD bump on cairo isn't actually needed, since the
shlibs file wasn't updated; the move should be coordinated anyway, so
hopefully everything's going to be fine.
Thanks for considering.
Mraw,
KiBi.
diff -u gtk2-engines-2.18.5/debian/changelog gtk2-engines-2.18.5/debian/changelog
--- gtk2-engines-2.18.5/debian/changelog
+++ gtk2-engines-2.18.5/debian/changelog
@@ -1,3 +1,16 @@
+gtk2-engines (1:2.18.5-2) UNRELEASED; urgency=low
+
+ * Switch udeb from DirectFB to Xlib to prepare the move to an X11-based
+ graphical installer:
+ - Get rid of libgtk-directfb-2.0-dev in Build-Depends.
+ - Bump the Build-Depends on libgtk2.0-dev to ensure the new udeb gets
+ a dependency on libgtk-x11-udeb.
+ - Add explicit and versioned Build-Depends on libcairo2-dev to ensure
+ the new udeb gets a dependency on libcairo2-udeb.
+ - Tweak comments and paths in debian/rules.
+
+ -- Cyril Brulebois <k...@debian.org> Sun, 07 Feb 2010 15:52:50 +0000
+
gtk2-engines (1:2.18.5-1) unstable; urgency=low
* New upstream bugfix release.
diff -u gtk2-engines-2.18.5/debian/control.in gtk2-engines-2.18.5/debian/control.in
--- gtk2-engines-2.18.5/debian/control.in
+++ gtk2-engines-2.18.5/debian/control.in
@@ -5,8 +5,8 @@
Uploaders: @GNOME_TEAM@
Standards-Version: 3.8.3
Build-Depends: debhelper (>= 5),
- libgtk2.0-dev (>= 2.12.0),
- libgtk-directfb-2.0-dev (>= 2.12.11-4),
+ libgtk2.0-dev (>= 2.18.7-2),
+ libcairo2-dev (>= 1.8.10-3),
gnome-pkg-tools (>= 0.10),
cdbs (>= 0.4.41),
chrpath,
@@ -78 +78 @@
- to use GTK+ 2.x theme engines under DirectFB.
+ to use GTK+ 2.x theme engines under X11.
diff -u gtk2-engines-2.18.5/debian/control gtk2-engines-2.18.5/debian/control
--- gtk2-engines-2.18.5/debian/control
+++ gtk2-engines-2.18.5/debian/control
@@ -1,8 +1,3 @@
-# This file is autogenerated. DO NOT EDIT!
-#
-# Modifications should be made to debian/control.in instead.
-# This file is regenerated automatically in the clean target.
-
Source: gtk2-engines
Section: gnome
Priority: optional
@@ -10,8 +5,8 @@
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org>, Josselin Mouette <j...@debian.org>, Sebastian Dröge <sl...@debian.org>
Standards-Version: 3.8.3
Build-Depends: debhelper (>= 5),
- libgtk2.0-dev (>= 2.12.0),
- libgtk-directfb-2.0-dev (>= 2.12.11-4),
+ libgtk2.0-dev (>= 2.18.7-2),
+ libcairo2-dev (>= 1.8.10-3),
gnome-pkg-tools (>= 0.10),
cdbs (>= 0.4.41),
chrpath,
@@ -83 +78 @@
- to use GTK+ 2.x theme engines under DirectFB.
+ to use GTK+ 2.x theme engines under X11.
diff -u gtk2-engines-2.18.5/debian/rules gtk2-engines-2.18.5/debian/rules
--- gtk2-engines-2.18.5/debian/rules
+++ gtk2-engines-2.18.5/debian/rules
@@ -2,7 +2,7 @@
buildbasedir := $(CURDIR)/debian/build
DEB_BUILDDIR := $(buildbasedir)/x11
-DEB_BUILDDIR_gtk2-engines-udeb := $(buildbasedir)/directfb
+DEB_BUILDDIR_gtk2-engines-udeb := $(buildbasedir)/x11-udeb
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
@@ -14,7 +14,7 @@
GNOME_MODULE := gtk-engines
DEB_DESTDIR := $(CURDIR)/debian/tmp/x11
-DEB_DESTDIR_gtk2-engines-udeb := $(CURDIR)/debian/tmp/directfb
+DEB_DESTDIR_gtk2-engines-udeb := $(CURDIR)/debian/tmp/x11-udeb
DEB_DH_INSTALL_ARGS = --sourcedir=$(if $(findstring gtk2-engines-udeb,$(cdbs_curpkg)),$(DEB_DESTDIR_gtk2-engines-udeb),$(DEB_DESTDIR))
@@ -28,13 +28,19 @@
configure/gtk2-engines-udeb:: $(DEB_BUILDDIR_gtk2-engines-udeb)/config.status
$(DEB_BUILDDIR_gtk2-engines-udeb)/config.status:
+ # The following comment applied to the DirectFB-based udeb. That dirty
+ # hack probably could go away with the new X11-based udeb, provided
+ # libgtk-x11-udeb is still built from the 'shared' flavour, and not
+ # from a new stripped-down flavour. Keep this hack for now, and for
+ # reference.
+
# paint me ugly: Gtk 2.8 mixes the pkg-config files from both builds
# (x11/shared and directfb), so the gtk+2.0.pc from the directfb can't
# be used; we cheat and create a fake one higher in the PKG_CONFIG_PATH
# which is a symlink to the gtk+-directfb-2.0.pc
mkdir -p $(DEB_BUILDDIR_gtk2-engines-udeb)/pkg-config
cd $(DEB_BUILDDIR_gtk2-engines-udeb)/pkg-config && \
- ln -s /usr/lib/pkgconfig/gtk+-directfb-2.0.pc gtk+-2.0.pc
+ ln -s /usr/lib/pkgconfig/gtk+-x11-2.0.pc gtk+-2.0.pc
cd $(DEB_BUILDDIR_gtk2-engines-udeb) && \
PKG_CONFIG_PATH=pkg-config \
$(DEB_CONFIGURE_SCRIPT_ENV) \
