r24258 - in /packages/unstable/gnome-main-menu/debian: changelog patches/default-applications.diff patches/non-linux.diff patches/series
jak at users.alioth.debian.org
jak at users.alioth.debian.org
Wed May 5 14:00:55 UTC 2010
Author: jak
Date: Wed May 5 14:00:53 2010
New Revision: 24258
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24258
Log:
* Refresh patches:
- default-applications.diff: Drop the nautilus change merged upstream
- non-linux.diff: Switch to an (upstream rejected, needs work) git patch
Modified:
packages/unstable/gnome-main-menu/debian/changelog
packages/unstable/gnome-main-menu/debian/patches/default-applications.diff
packages/unstable/gnome-main-menu/debian/patches/non-linux.diff
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=24258&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/changelog [utf-8] Wed May 5 14:00:53 2010
@@ -16,6 +16,9 @@
* Drop disabled patches:
- gnome-session-kill.diff
- ltmain-as-needed.diff
+ * Refresh patches:
+ - default-applications.diff: Drop the nautilus change merged upstream
+ - non-linux.diff: Switch to an (upstream rejected, needs work) git patch
* Build-depend on dh-autoreconf and drop our own dh_autoreconf* scripts.
-- Julian Andres Klode <jak at debian.org> Fri, 30 Apr 2010 12:11:40 +0200
Modified: packages/unstable/gnome-main-menu/debian/patches/default-applications.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/patches/default-applications.diff?rev=24258&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/default-applications.diff [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/patches/default-applications.diff [utf-8] Wed May 5 14:00:53 2010
@@ -59,10 +59,11 @@
<info>
<metadata owner="http://freedesktop.org">
<mime:mime-type type="application/x-desktop"/>
-@@ -68,6 +81,19 @@
+@@ -67,6 +80,19 @@
+ </bookmark:applications>
</metadata>
</info>
- </bookmark>
++ </bookmark>
+ <bookmark href="eog.desktop" added="2007-01-16T05:51:22Z" modified="2007-01-16T05:51:22Z" visited="2007-01-16T05:51:22Z">
+ <info>
+ <metadata owner="http://freedesktop.org">
@@ -75,16 +76,6 @@
+ </bookmark:applications>
+ </metadata>
+ </info>
-+ </bookmark>
+ </bookmark>
<bookmark href="nautilus.desktop" added="2007-01-16T05:51:22Z" modified="2007-01-16T05:51:22Z" visited="2007-01-16T05:51:22Z">
<info>
- <metadata owner="http://freedesktop.org">
-@@ -76,7 +102,7 @@
- <bookmark:group>rank-5</bookmark:group>
- </bookmark:groups>
- <bookmark:applications>
-- <bookmark:application name="Nautilus" exec="nautilus --no-desktop --browser %U" timestamp="1168926682" count="1"/>
-+ <bookmark:application name="Nautilus" exec="nautilus --no-desktop %U" timestamp="1168926682" count="1"/>
- </bookmark:applications>
- </metadata>
- </info>
Modified: packages/unstable/gnome-main-menu/debian/patches/non-linux.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/patches/non-linux.diff?rev=24258&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/non-linux.diff [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/patches/non-linux.diff [utf-8] Wed May 5 14:00:53 2010
@@ -1,107 +1,120 @@
-Author: Petr Salinger <Petr.Salinger at seznam.cz>
-Description: FTBFS on GNU/kFreeBSD (network-manager is not available)
-
-the current version fails to build on GNU/kFreeBSD.
-
-It needs to conditionalize support of network-manager
-only for linux architectures.
-Please apply attached patch and run "autoreconf -vfi"
-to renenerate configure and Makefile.in files.
---- gnome-main-menu-0.9.12.orig/configure.in
-+++ gnome-main-menu-0.9.12/configure.in
-@@ -61,17 +61,21 @@
- AC_SUBST(LIBSLAB_CFLAGS)
- AC_SUBST(LIBSLAB_LIBS)
-
--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 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ])
-
- AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, have_iwlib=yes, have_iwlib=no)], have_iwlib=no)
-
- if test "x$have_iwlib" != "xyes" ; then
-- AC_ERROR(cannot find iwlib)
-+ 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 ])
- 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])
- MAIN_MENU_LIBS="$MAIN_MENU_LIBS -liw"
- AC_SUBST(MAIN_MENU_LIBS)
- fi
-
-+AM_CONDITIONAL(USE_NETMAN, test x$have_iwlib = xyes)
-+
- AC_SUBST(MAIN_MENU_CFLAGS)
- AC_SUBST(MAIN_MENU_LIBS)
-
-only in patch2:
-unchanged:
---- gnome-main-menu-0.9.12.orig/main-menu/src/main-menu-ui.c
-+++ gnome-main-menu-0.9.12/main-menu/src/main-menu-ui.c
-@@ -41,7 +41,10 @@
- #include "directory-tile.h"
- #include "system-tile.h"
- #include "hard-drive-status-tile.h"
-+
-+#ifndef NO_NETMAN
- #include "network-status-tile.h"
-+#endif
-
- #include "tile-table.h"
-
-@@ -721,6 +724,7 @@
- gtk_container_add (ctnr, tile);
- gtk_widget_show_all (GTK_WIDGET (ctnr));
-
-+#ifndef NO_NETMAN
- ctnr = GTK_CONTAINER (glade_xml_get_widget (
- priv->main_menu_xml, "network-status-container"));
- priv->network_status = network_status_tile_new ();
-@@ -733,6 +737,7 @@
-
- gtk_container_add (ctnr, priv->network_status);
- gtk_widget_show_all (GTK_WIDGET (ctnr));
-+#endif
-
- priv->status_section = glade_xml_get_widget (
- priv->main_menu_xml, "slab-status-section");
-@@ -1839,7 +1844,9 @@
- {
- MainMenuUIPrivate *priv = PRIVATE (this);
-
-+#ifndef NO_NETMAN
- network_tile_update_status (priv->network_status);
-+#endif
-
- update_recently_used_sections (this);
-
-only in patch2:
-unchanged:
---- gnome-main-menu-0.9.12.orig/main-menu/src/Makefile.am
-+++ gnome-main-menu-0.9.12/main-menu/src/Makefile.am
-@@ -15,6 +15,8 @@
- -DDATADIR=\""$(datadir)"\" \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-
-+
-+if USE_NETMAN
- main_menu_SOURCES = \
- main-menu.c \
- main-menu-ui.c main-menu-ui.h \
-@@ -26,6 +28,17 @@
- network-status-info.c network-status-info.h \
- tomboykeybinder.c tomboykeybinder.h \
- eggaccelerators.c eggaccelerators.h
-+else
-+main_menu_SOURCES = \
-+ main-menu.c \
-+ main-menu-ui.c main-menu-ui.h \
-+ main-menu-migration.c main-menu-migration.h \
-+ tile-table.c tile-table.h \
-+ hard-drive-status-tile.c hard-drive-status-tile.h \
-+ tomboykeybinder.c tomboykeybinder.h \
-+ eggaccelerators.c eggaccelerators.h
-+endif
-+
-
- main_menu_LDADD = \
- $(MAIN_MENU_LIBS) \
+From 56fbff4f569b7cafe4a574ed92bdf1ac9fd7aca8 Mon Sep 17 00:00:00 2001
+From: Petr Salinger <Petr.Salinger at seznam.cz>
+Date: Sun, 7 Feb 2010 15:36:12 +0100
+Subject: [PATCH] Add support for non-Linux architectures.
+
+Because NetworkManager is only supported on Linux, only use it
+when building for Linux.
+
+Bug-Debian: http://bugs.debian.org/542628
+---
+ configure.in | 20 +++++++++++---------
+ main-menu/src/Makefile.am | 13 +++++++++++++
+ main-menu/src/main-menu-ui.c | 7 +++++++
+ 3 files changed, 31 insertions(+), 9 deletions(-)
+
+--- a/configure.in
++++ b/configure.in
+@@ -47,23 +47,25 @@ 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
+-
+-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 NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0 x11 hal-storage cairo ])
+-
+ AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, have_iwlib=yes, have_iwlib=no, -lm)], have_iwlib=no)
+
+ if test "x$have_iwlib" != "xyes" ; then
+- AC_ERROR(cannot find iwlib)
++ 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 x11 hal-storage cairo ])
+ else
++ 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 NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0 x11 hal-storage cairo ])
+ MAIN_MENU_LIBS="$MAIN_MENU_LIBS -liw -lm"
+ AC_SUBST(MAIN_MENU_LIBS)
+ fi
+
++AM_CONDITIONAL(USE_NETMAN, test x$have_iwlib = xyes)
++
+ AC_SUBST(MAIN_MENU_CFLAGS)
+ AC_SUBST(MAIN_MENU_LIBS)
+
+--- a/main-menu/src/Makefile.am
++++ b/main-menu/src/Makefile.am
+@@ -14,6 +14,8 @@ AM_CPPFLAGS = \
+ -DDATADIR=\""$(datadir)"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+
++
++if USE_NETMAN
+ main_menu_SOURCES = \
+ main-menu.c \
+ main-menu-ui.c main-menu-ui.h \
+@@ -25,6 +27,17 @@ main_menu_SOURCES = \
+ network-status-info.c network-status-info.h \
+ tomboykeybinder.c tomboykeybinder.h \
+ eggaccelerators.c eggaccelerators.h
++else
++main_menu_SOURCES = \
++ main-menu.c \
++ main-menu-ui.c main-menu-ui.h \
++ main-menu-migration.c main-menu-migration.h \
++ tile-table.c tile-table.h \
++ hard-drive-status-tile.c hard-drive-status-tile.h \
++ tomboykeybinder.c tomboykeybinder.h \
++ eggaccelerators.c eggaccelerators.h
++endif
++
+
+ main_menu_LDADD = \
+ $(MAIN_MENU_LIBS) \
+--- a/main-menu/src/main-menu-ui.c
++++ b/main-menu/src/main-menu-ui.c
+@@ -38,7 +38,10 @@
+ #include <libslab/slab.h>
+
+ #include "hard-drive-status-tile.h"
++
++#ifndef NO_NETMAN
+ #include "network-status-tile.h"
++#endif
+
+ #include "tile-table.h"
+
+@@ -729,6 +732,7 @@ create_status_section (MainMenuUI *this)
+ gtk_container_add (ctnr, tile);
+ gtk_widget_show_all (GTK_WIDGET (ctnr));
+
++#ifndef NO_NETMAN
+ ctnr = GTK_CONTAINER (glade_xml_get_widget (
+ priv->main_menu_xml, "network-status-container"));
+ priv->network_status = network_status_tile_new ();
+@@ -741,6 +745,7 @@ create_status_section (MainMenuUI *this)
+
+ gtk_container_add (ctnr, priv->network_status);
+ gtk_widget_show_all (GTK_WIDGET (ctnr));
++#endif
+
+ priv->status_section = glade_xml_get_widget (
+ priv->main_menu_xml, "slab-status-section");
+@@ -1847,7 +1852,9 @@ present_slab_window (MainMenuUI *this)
+ {
+ MainMenuUIPrivate *priv = PRIVATE (this);
+
++#ifndef NO_NETMAN
+ network_tile_update_status (priv->network_status);
++#endif
+
+ update_recently_used_sections (this);
+
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=24258&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/series [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/patches/series [utf-8] Wed May 5 14:00:53 2010
@@ -1,2 +1,2 @@
default-applications.diff
-non-linux.diffs
+non-linux.diff
More information about the pkg-gnome-commits
mailing list