r11587 - in /desktop/experimental/vte/debian: changelog control control.in rules

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Jun 19 07:31:14 2007
New Revision: 11587

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11587
Log:
* Pass proper configure flags to the udeb.
* Generate proper shlibs for the udeb.
* Build against the diretcfb Gtk flavor.

Modified:
    desktop/experimental/vte/debian/changelog
    desktop/experimental/vte/debian/control
    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=11587&op=diff
==============================================================================
--- desktop/experimental/vte/debian/changelog (original)
+++ desktop/experimental/vte/debian/changelog Tue Jun 19 07:31:14 2007
@@ -1,3 +1,11 @@
+vte (1:0.16.5-3) UNRELEASED; urgency=low
+
+  * Pass proper configure flags to the udeb.
+  * Generate proper shlibs for the udeb.
+  * Build against the diretcfb Gtk flavor.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 19 Jun 2007 09:08:19 +0200
+
 vte (1:0.16.5-2) experimental; urgency=low
 
   * Add a new libvte9-udeb package.

Modified: desktop/experimental/vte/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/control?rev=11587&op=diff
==============================================================================
--- desktop/experimental/vte/debian/control (original)
+++ desktop/experimental/vte/debian/control Tue Jun 19 07:31:14 2007
@@ -2,13 +2,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>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
 Standards-Version: 3.7.2
 XS-Python-Version: >= 2.3
 Build-Depends: cdbs (>= 0.4.43),
                debhelper (>= 5.0.37.2),
                libglib2.0-dev (> 2.9.0),
                libgtk2.0-dev (>= 2.6.0),
+               libgtk-directfb-2.0-dev (>= 2.6.0),
                gettext,
                python-gtk2-dev,
                python-all-dev (>= 2.3.5-11),

Modified: desktop/experimental/vte/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte/debian/control.in?rev=11587&op=diff
==============================================================================
--- desktop/experimental/vte/debian/control.in (original)
+++ desktop/experimental/vte/debian/control.in Tue Jun 19 07:31:14 2007
@@ -9,6 +9,7 @@
                debhelper (>= 5.0.37.2),
                libglib2.0-dev (> 2.9.0),
                libgtk2.0-dev (>= 2.6.0),
+               libgtk-directfb-2.0-dev (>= 2.6.0),
                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=11587&op=diff
==============================================================================
--- desktop/experimental/vte/debian/rules (original)
+++ desktop/experimental/vte/debian/rules Tue Jun 19 07:31:14 2007
@@ -18,7 +18,15 @@
 
 DEB_CONFIGURE_LIBEXECDIR := \$${prefix}/lib/$(libvteN)
 DEB_FIXPERMS_EXCLUDE := gnome-pty-helper
-DEB_DH_MAKESHLIBS_ARGS_ALL = -V '$(libvteN) (>= 1:0.16.0)'
+DEB_DH_MAKESHLIBS_ARGS_ALL = -V '$(libvteN) (>= 1:0.16.0)' --add-udeb=$(udeb)
+
+udeb_configure_flags := --disable-python \
+			--disable-gnome-pty-helper \
+			--disable-gtk-doc \
+			--without-x \
+			--without-xft2 \
+			--with-pangox \
+			--without-glX
 
 DEB_DESTDIR := $(CURDIR)/debian/tmp/main
 DEB_DESTDIR_$(udeb) := $(CURDIR)/debian/tmp/udeb
@@ -29,7 +37,15 @@
 # udeb rules
 configure/$(udeb):: $(DEB_BUILDDIR_$(udeb))/config.status
 $(DEB_BUILDDIR_$(udeb))/config.status:
+	# 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
 	cd $(DEB_BUILDDIR_$(udeb)) && \
+		PKG_CONFIG_PATH=pkg-config \
 		$(DEB_CONFIGURE_SCRIPT_ENV) \
 			$(DEB_CONFIGURE_SCRIPT) \
 				$(DEB_CONFIGURE_NORMAL_ARGS) \