r23303 - in /desktop/experimental/vte/debian: changelog control rules
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Tue Mar 16 19:09:28 UTC 2010
Author: pochu
Date: Tue Mar 16 19:09:27 2010
New Revision: 23303
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23303
Log:
* debian/rules:
- Remove hack that was needed to build the udeb against the DirectFB
GTK+ library, since the default one was the X11. We build against
the X11 one now.
Modified:
desktop/experimental/vte/debian/changelog
desktop/experimental/vte/debian/control
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=23303&op=diff
==============================================================================
--- desktop/experimental/vte/debian/changelog [utf-8] (original)
+++ desktop/experimental/vte/debian/changelog [utf-8] Tue Mar 16 19:09:27 2010
@@ -1,12 +1,19 @@
vte (1:0.23.5-4) UNRELEASED; urgency=low
+ [ Cyril Brulebois ]
* 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
+ [ Emilio Pozuelo Monfort ]
+ * debian/rules:
+ - Remove hack that was needed to build the udeb against the DirectFB
+ GTK+ library, since the default one was the X11. We build against
+ the X11 one now.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Tue, 16 Mar 2010 12:26:59 +0100
vte (1:0.23.5-3) experimental; urgency=low
Modified: desktop/experimental/vte/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/control?rev=23303&op=diff
==============================================================================
--- desktop/experimental/vte/debian/control [utf-8] (original)
+++ desktop/experimental/vte/debian/control [utf-8] Tue Mar 16 19:09:27 2010
@@ -7,15 +7,14 @@
Section: libs
Priority: optional
Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Luca Falavigna <dktrkranz at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Luca Falavigna <dktrkranz at debian.org>, Sebastian Dröge <slomo at debian.org>
Standards-Version: 3.8.3
XS-Python-Version: >= 2.3
Build-Depends: cdbs (>= 0.4.43),
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=23303&op=diff
==============================================================================
--- desktop/experimental/vte/debian/rules [utf-8] (original)
+++ desktop/experimental/vte/debian/rules [utf-8] Tue Mar 16 19:09:27 2010
@@ -41,21 +41,7 @@
# 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+-x11-2.0.pc gtk+-2.0.pc
cd $(DEB_BUILDDIR_$(udeb)) && \
- PKG_CONFIG_PATH=pkg-config \
$(DEB_CONFIGURE_SCRIPT_ENV) \
CFLAGS="$(CFLAGS_$(udeb))" \
$(DEB_CONFIGURE_SCRIPT) \
More information about the pkg-gnome-commits
mailing list