r23034 - in /packages/unstable/gnome-main-menu/debian: changelog patches/nm-glib-0.8.diff patches/series

[jak at users.alioth.debian.org]

Author: jak
Date: Thu Feb 11 16:28:41 2010
New Revision: 23034

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23034
Log:
nm-glib-0.8.diff: Support new libnm-glib name in NM 0.8 (Closes: #569320).

Added:
    packages/unstable/gnome-main-menu/debian/patches/nm-glib-0.8.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=23034&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/changelog [utf-8] Thu Feb 11 16:28:41 2010
@@ -5,6 +5,7 @@
   * fix-binutils-gold-build.diff: Fix build with gold (Closes: #554655).
   * use-xdg-user-directories.diff: Use XDG user directories instead of
     hardcoding $HOME/Desktop and $HOME/Documents (LP: #259051).
+  * nm-glib-0.8.diff: Support new libnm-glib name in NM 0.8 (Closes: #569320).
 
  -- Julian Andres Klode <jak at debian.org>  Wed, 03 Feb 2010 16:31:22 +0100
 

Added: packages/unstable/gnome-main-menu/debian/patches/nm-glib-0.8.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/patches/nm-glib-0.8.diff?rev=23034&op=file
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/nm-glib-0.8.diff (added)
+++ packages/unstable/gnome-main-menu/debian/patches/nm-glib-0.8.diff [utf-8] Thu Feb 11 16:28:41 2010
@@ -1,0 +1,32 @@
+From: Julian Andres Klode <jak at debian.org>
+Subject: [build] Support both libnm-glib and libnm_glib pkg-config names
+ Apparently, with NetworkManager 0.8, libnm_glib was renamed to
+ libnm-glib.
+ .
+ Patch and description have been adapted from commit
+ a993420178412b522387d4ef451b2525065967a9 in the upstream
+ repository; authored by Vincent Untz <vuntz at gnome.org>.
+Bug-Debian: http://bugs.debian.org/569320
+--- a/configure.in
++++ b/configure.in
+@@ -58,6 +58,11 @@ PKG_CHECK_MODULES(GLADE, libglade-2.0)
+ AC_SUBST(GLADE_CFLAGS)
+ AC_SUBST(GLADE_LIBS)
+ 
++NM_GLIB=
++PKG_CHECK_EXISTS(libnm-glib, [ NM_GLIB=libnm-glib ])
++if test "x$NM_GLIB" = "x"; then
++	PKG_CHECK_EXISTS(libnm_glib, [ NM_GLIB=libnm_glib ], [ AC_ERROR(cannot find NetworkManager Glib library) ])
++fi
+ 
+ AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, have_iwlib=yes, have_iwlib=no)], have_iwlib=no)
+ 
+@@ -66,7 +71,7 @@ if test "x$have_iwlib" != "xyes" ; then
+ 	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 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 libnm-util >= 0.7.0 x11])
++	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 $NM_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=23034&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/series [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/patches/series [utf-8] Thu Feb 11 16:28:41 2010
@@ -7,3 +7,4 @@
 applet-category.diff
 fix-binutils-gold-build.diff
 use-xdg-user-directories.diff
+nm-glib-0.8.diff