r22958 - in /packages/unstable/gnome-main-menu/debian: changelog patches/fix-binutils-gold-build.diff patches/series

[jak at users.alioth.debian.org]

Author: jak
Date: Wed Feb  3 17:23:21 2010
New Revision: 22958

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22958
Log:
fix-binutils-gold-build.diff: Fix build with gold (Closes: #554655).

Added:
    packages/unstable/gnome-main-menu/debian/patches/fix-binutils-gold-build.diff
Modified:
    packages/unstable/gnome-main-menu/debian/changelog
    packages/unstable/gnome-main-menu/debian/patches/series

Modified: packages/unstable/gnome-main-menu/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/changelog?rev=22958&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/changelog [utf-8] Wed Feb  3 17:23:21 2010
@@ -2,6 +2,7 @@
 
   * debian/rules: Use dh_autoreconf instead of manual autoreconf stuff.
   * debian/rules: Pass --with quilt to dh on clean.
+  * fix-binutils-gold-build.diff: Fix build with gold (Closes: #554655).
 
  -- Julian Andres Klode <jak at debian.org>  Wed, 03 Feb 2010 16:31:22 +0100
 

Added: packages/unstable/gnome-main-menu/debian/patches/fix-binutils-gold-build.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/patches/fix-binutils-gold-build.diff?rev=22958&op=file
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/fix-binutils-gold-build.diff (added)
+++ packages/unstable/gnome-main-menu/debian/patches/fix-binutils-gold-build.diff [utf-8] Wed Feb  3 17:23:21 2010
@@ -1,0 +1,21 @@
+Author: Julian Andres Klode <jak at debian.org>
+Bug-Debian: http://bugs.debian.org/554655
+Description: Fix build failure with binutils-gold
+
+Add the missing libnm-util and x11 dependencies to
+main-menu so that it can build with the new 'gold'
+linker.
+--- a/configure.in
++++ b/configure.in
+@@ -64,9 +64,9 @@ AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB
+ if test "x$have_iwlib" != "xyes" ; then
+ 	AC_WARN(cannot find iwlib, proceeding without network manager, wireless)
+ 	AC_DEFINE(NO_NETMAN, 1, [do not use network manager, wireless])
+-	PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ])
++	PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11])
+ else
+-	PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo NetworkManager libnm_glib >= 0.7.0])
++	PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo NetworkManager libnm_glib >= 0.7.0 libnm-util >= 0.7.0 x11])
+ 	MAIN_MENU_LIBS="$MAIN_MENU_LIBS -liw"
+ 	AC_SUBST(MAIN_MENU_LIBS)
+ fi

Modified: packages/unstable/gnome-main-menu/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/patches/series?rev=22958&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/series [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/patches/series [utf-8] Wed Feb  3 17:23:21 2010
@@ -5,3 +5,4 @@
 non-linux.diff
 respect-nautilus-spacial-setting.diff
 applet-category.diff
+fix-binutils-gold-build.diff