r23298 - in /desktop/experimental/vte/debian: changelog control.in rules
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Tue Mar 16 10:04:21 UTC 2010
Author: pochu
Date: Tue Mar 16 10:04:16 2010
New Revision: 23298
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23298
Log:
* Switch udeb from DirectFB to Xlib to prepare the move to an X11-based
graphical installer
- Drop the B-D on libgtk-directfb-2.0-dev.
- Bump the B-D on libgtk2.0-dev to make sure the udeb gets its
dependency on the (recently-added) udeb rather than on the library.
Modified:
desktop/experimental/vte/debian/changelog
desktop/experimental/vte/debian/control.in
desktop/experimental/vte/debian/rules
Modified: desktop/experimental/vte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/changelog?rev=23298&op=diff
==============================================================================
--- desktop/experimental/vte/debian/changelog [utf-8] (original)
+++ desktop/experimental/vte/debian/changelog [utf-8] Tue Mar 16 10:04:16 2010
@@ -1,3 +1,13 @@
+vte (1:0.23.5-4) UNRELEASED; urgency=low
+
+ * Switch udeb from DirectFB to Xlib to prepare the move to an X11-based
+ graphical installer
+ - Drop the B-D on libgtk-directfb-2.0-dev.
+ - Bump the B-D on libgtk2.0-dev to make sure the udeb gets its
+ dependency on the (recently-added) udeb rather than on the library.
+
+ -- Cyril Brulebois <kibi at debian.org> Mon, 08 Feb 2010 00:16:27 +0000
+
vte (1:0.23.5-3) experimental; urgency=low
* debian/rules:
Modified: desktop/experimental/vte/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/control.in?rev=23298&op=diff
==============================================================================
--- desktop/experimental/vte/debian/control.in [utf-8] (original)
+++ desktop/experimental/vte/debian/control.in [utf-8] Tue Mar 16 10:04:16 2010
@@ -9,8 +9,7 @@
debhelper (>= 5.0.37.2),
quilt,
libglib2.0-dev (>= 2.22.0),
- libgtk2.0-dev (>= 2.14.0),
- libgtk-directfb-2.0-dev (>= 2.6.0),
+ libgtk2.0-dev (>= 2.19.7-2),
gettext,
python-gtk2-dev,
python-all-dev (>= 2.3.5-11),
Modified: desktop/experimental/vte/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/rules?rev=23298&op=diff
==============================================================================
--- desktop/experimental/vte/debian/rules [utf-8] (original)
+++ desktop/experimental/vte/debian/rules [utf-8] Tue Mar 16 10:04:16 2010
@@ -41,13 +41,19 @@
# udeb rules
configure/$(udeb):: $(DEB_BUILDDIR_$(udeb))/config.status
$(DEB_BUILDDIR_$(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 (even if
+ # it's now a 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_$(udeb))/pkg-config
cd $(DEB_BUILDDIR_$(udeb))/pkg-config && \
- ln -sf /usr/lib/pkgconfig/gtk+-directfb-2.0.pc gtk+-2.0.pc
+ ln -sf /usr/lib/pkgconfig/gtk+-x11-2.0.pc gtk+-2.0.pc
cd $(DEB_BUILDDIR_$(udeb)) && \
PKG_CONFIG_PATH=pkg-config \
$(DEB_CONFIGURE_SCRIPT_ENV) \
More information about the pkg-gnome-commits
mailing list