r23331 - in /desktop/unstable/vte/debian: changelog rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Mar 18 13:33:08 2010
New Revision: 23331

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23331
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/unstable/vte/debian/changelog
    desktop/unstable/vte/debian/rules

Modified: desktop/unstable/vte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/changelog?rev=23331&op=diff
==============================================================================
--- desktop/unstable/vte/debian/changelog [utf-8] (original)
+++ desktop/unstable/vte/debian/changelog [utf-8] Thu Mar 18 13:33:08 2010
@@ -1,12 +1,19 @@
 vte (1:0.22.5-3) UNRELEASED; urgency=low
 
+  [ Cyril Brulebois ]
   * Switch udeb from DirectFB to Xlib to prepare the move to an X11-based
     graphical installer. Closes: #573882.
      - 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>  Thu, 18 Mar 2010 14:30:44 +0100
 
 vte (1:0.22.5-2) unstable; urgency=low
 

Modified: desktop/unstable/vte/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/rules?rev=23331&op=diff
==============================================================================
--- desktop/unstable/vte/debian/rules [utf-8] (original)
+++ desktop/unstable/vte/debian/rules [utf-8] Thu Mar 18 13:33:08 2010
@@ -40,21 +40,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) \