Package: icewm-gnome-support Version: 1.2.36-1 Tags: patch pkg-config --cflags gnome-desktop-2.0 doesn't implicitly include libgnomeui-2.0 anymore (GNOME >=2.25), so it must be added in explicitly
Patch from Ubuntu package diff -u icewm-1.2.36/debian/changelog icewm-1.2.36/debian/changelog --- icewm-1.2.36/debian/changelog +++ icewm-1.2.36/debian/changelog @@ -1,3 +1,15 @@ +icewm (1.2.36-1ubuntu2) jaunty; urgency=low + + * Rebuild for libgnome-desktop-2-7 -> libgnome-desktop-2-11 + transition. (LP: #309529) + * Fix FTBFS due to libgnome-desktop transition. + - Add build depend on libgnomeui-dev + - Add fedora-icewm-configure.dpatch derived from Fedora + + pkg-config --cflags gnome-desktop-2.0 doesn't implicitly include + libgnomeui-2.0 anymore, so add it in explicitly + + -- Andrew Starr-Bochicchio <a.star...@gmail.com> Tue, 13 Jan 2009 14:38:16 -0500 + icewm (1.2.36-1ubuntu1) jaunty; urgency=low * Merge from debian unstable (LP: #306041), remaining changes: diff -u icewm-1.2.36/debian/control icewm-1.2.36/debian/control --- icewm-1.2.36/debian/control +++ icewm-1.2.36/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu MOTU Developers <ubuntu-m...@lists.ubuntu.com> XSBC-Original-Maintainer: Eduard Bloch <bl...@debian.org> -Build-Depends: debhelper (>> 4.0.0), libxrender-dev, imlib11-dev, libgnome2-dev, libgnome-desktop-dev, gettext, xfonts-utils, libxft-dev (>> 2.1.1) | libxft2-dev, dpatch, libesd0-dev, libpng12-dev, libsm-dev, libx11-dev, libxext-dev, libxft-dev, libxinerama-dev, libxpm-dev (>= 1:3.5.4.2-3), libxrandr-dev, x11proto-core-dev | x-dev, linuxdoc-tools, libxt-dev, autotools-dev +Build-Depends: debhelper (>> 4.0.0), libxrender-dev, imlib11-dev, libgnome2-dev, libgnome-desktop-dev, gettext, xfonts-utils, libxft-dev (>> 2.1.1) | libxft2-dev, dpatch, libesd0-dev, libpng12-dev, libsm-dev, libx11-dev, libxext-dev, libxft-dev, libxinerama-dev, libxpm-dev (>= 1:3.5.4.2-3), libxrandr-dev, x11proto-core-dev | x-dev, linuxdoc-tools, libxt-dev, autotools-dev, libgnomeui-dev Build-Conflicts: libttf-dev Standards-Version: 3.8.0 diff -u icewm-1.2.36/debian/patches/00list icewm-1.2.36/debian/patches/00list --- icewm-1.2.36/debian/patches/00list +++ icewm-1.2.36/debian/patches/00list @@ -7,0 +8 @@ +fedora-icewm-configure only in patch2: unchanged: --- icewm-1.2.36.orig/debian/patches/fedora-icewm-configure.dpatch +++ icewm-1.2.36/debian/patches/fedora-icewm-configure.dpatch @@ -0,0 +1,44 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fedora-icewm-configure.dpatch by Andrew Starr-Bochicchio <a.star...@gmail.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: +## DP: See LP Bug: https://bugs.edge.launchpad.net/ubuntu/+source/icewm/+bug/309529 +## DP: icewm-gnome-support fails to build after +## DP: libgnome-desktop-2-7 -> libgnome-desktop-2-11 transition +## DP: +## DP: +## DP: Patch derived from Fedora: +## DP: http://cvs.fedoraproject.org/viewvc/devel/icewm/icewm-configure.patch?revision=1.2&view=markup +## DP: pkg-config --cflags gnome-desktop-2.0 doesn't implicitly include +## DP: libgnomeui-2.0 anymore, so add it in explicitly + + +...@dpatch@ + +--- icewm-1.2.36/configure.in.old 2007-01-16 16:12:51.000000000 +0200 ++++ icewm-1.2.36/configure.in 2007-01-16 16:13:31.000000000 +0200 +@@ -820,8 +820,8 @@ + + if test "${PKG_CONFIG}" != ""; then + GNOME_VER=2 +- GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0` +- GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0` ++ GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0` ++ GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0` + + AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly]) + +--- icewm-1.2.36/configure.old 2007-01-16 17:44:10.000000000 +0200 ++++ icewm-1.2.36/configure 2007-01-16 17:44:31.000000000 +0200 +@@ -12563,8 +12563,8 @@ + + if test "${PKG_CONFIG}" != ""; then + GNOME_VER=2 +- GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0` +- GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0` ++ GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0` ++ GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0` + + + cat >>confdefs.h <<\_ACEOF -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
