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

[jak at users.alioth.debian.org]

Author: jak
Date: Fri Feb 12 11:55:32 2010
New Revision: 23044

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23044
Log:
nm-glib-0.8.diff: Only check for NM if we have iwlib (Closes: #569537).

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

Modified: packages/unstable/gnome-main-menu/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/changelog?rev=23044&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/changelog [utf-8] Fri Feb 12 11:55:32 2010
@@ -1,3 +1,9 @@
+gnome-main-menu (0.9.13-5) UNRELEASED; urgency=low
+
+  * nm-glib-0.8.diff: Only check for NM if we have iwlib (Closes: #569537).
+
+ -- Julian Andres Klode <jak at debian.org>  Thu, 11 Feb 2010 19:06:12 +0100
+
 gnome-main-menu (0.9.13-4) unstable; urgency=low
 
   * debian/rules: Use dh_autoreconf instead of manual autoreconf stuff.

Modified: 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=23044&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/nm-glib-0.8.diff [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/patches/nm-glib-0.8.diff [utf-8] Fri Feb 12 11:55:32 2010
@@ -9,23 +9,16 @@
 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
+@@ -66,7 +66,12 @@ 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])
++	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
 +	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)