r23304 - in /desktop/experimental/gtk2-engines/debian: changelog control control.in rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Mar 16 19:25:38 2010
New Revision: 23304

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23304
Log:
* 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.
   - Tweak comments and paths in debian/rules.

Modified:
    desktop/experimental/gtk2-engines/debian/changelog
    desktop/experimental/gtk2-engines/debian/control
    desktop/experimental/gtk2-engines/debian/control.in
    desktop/experimental/gtk2-engines/debian/rules

Modified: desktop/experimental/gtk2-engines/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk2-engines/debian/changelog?rev=23304&op=diff
==============================================================================
--- desktop/experimental/gtk2-engines/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk2-engines/debian/changelog [utf-8] Tue Mar 16 19:25:38 2010
@@ -1,3 +1,14 @@
+gtk2-engines (1:2.19.0-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.
+     - Tweak comments and paths in debian/rules.
+
+ -- Cyril Brulebois <kibi at debian.org>  Sun, 07 Feb 2010 15:52:50 +0000
+
 gtk2-engines (1:2.19.0-1) experimental; urgency=low
 
   * New upstream development release.

Modified: desktop/experimental/gtk2-engines/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk2-engines/debian/control?rev=23304&op=diff
==============================================================================
--- desktop/experimental/gtk2-engines/debian/control [utf-8] (original)
+++ desktop/experimental/gtk2-engines/debian/control [utf-8] Tue Mar 16 19:25:38 2010
@@ -11,8 +11,7 @@
 Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 5),
                liblua5.1-dev,
-               libgtk2.0-dev (>= 2.12.0),
-               libgtk-directfb-2.0-dev (>= 2.12.11-4),
+               libgtk2.0-dev (>= 2.19.7-2),
                gnome-pkg-tools (>= 0.10),
                cdbs (>= 0.4.41),
                chrpath,

Modified: desktop/experimental/gtk2-engines/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk2-engines/debian/control.in?rev=23304&op=diff
==============================================================================
--- desktop/experimental/gtk2-engines/debian/control.in [utf-8] (original)
+++ desktop/experimental/gtk2-engines/debian/control.in [utf-8] Tue Mar 16 19:25:38 2010
@@ -6,8 +6,7 @@
 Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 5),
                liblua5.1-dev,
-               libgtk2.0-dev (>= 2.12.0),
-               libgtk-directfb-2.0-dev (>= 2.12.11-4),
+               libgtk2.0-dev (>= 2.19.7-2),
                gnome-pkg-tools (>= 0.10),
                cdbs (>= 0.4.41),
                chrpath,

Modified: desktop/experimental/gtk2-engines/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk2-engines/debian/rules?rev=23304&op=diff
==============================================================================
--- desktop/experimental/gtk2-engines/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk2-engines/debian/rules [utf-8] Tue Mar 16 19:25:38 2010
@@ -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
@@ -15,7 +15,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))
 
@@ -33,13 +33,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) \