[Pkg-galago-commit] r280 - packages/unstable/slab/debian/patches
Riccardo Setti
giskard-guest at costa.debian.org
Fri Aug 25 18:56:43 UTC 2006
Author: giskard-guest
Date: 2006-08-25 18:56:42 +0000 (Fri, 25 Aug 2006)
New Revision: 280
Added:
packages/unstable/slab/debian/patches/04_link_statically.patch
packages/unstable/slab/debian/patches/05_binary_locations
packages/unstable/slab/debian/patches/series
Log:
add 04_link_statically.patch and 05_binary_locations
Added: packages/unstable/slab/debian/patches/04_link_statically.patch
===================================================================
--- packages/unstable/slab/debian/patches/04_link_statically.patch 2006-08-25 18:55:43 UTC (rev 279)
+++ packages/unstable/slab/debian/patches/04_link_statically.patch 2006-08-25 18:56:42 UTC (rev 280)
@@ -0,0 +1,347 @@
+Index: slab-0.0.cvs.20060705/application-browser/src/Makefile.am
+===================================================================
+--- slab-0.0.cvs.20060705.orig/application-browser/src/Makefile.am 2006-08-23 14:00:54.000000000 +0200
++++ slab-0.0.cvs.20060705/application-browser/src/Makefile.am 2006-08-25 19:38:28.000000000 +0200
+@@ -16,9 +16,9 @@
+
+ application_browser_LDADD = \
+ $(APPLICATION_BROWSER_LIBS) \
+- $(top_builddir)/libtile/libtile.la \
+- $(top_builddir)/libslab/libslab.la \
+- $(top_builddir)/utils/libutils.la
++ $(top_builddir)/utils/.libs/libutils.a \
++ $(top_builddir)/libslab/.libs/libslab.a \
++ $(top_builddir)/libtile/.libs/libtile.a
+
+ AM_CPPFLAGS = \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+Index: slab-0.0.cvs.20060705/control-center/src/Makefile.am
+===================================================================
+--- slab-0.0.cvs.20060705.orig/control-center/src/Makefile.am 2006-08-23 14:00:54.000000000 +0200
++++ slab-0.0.cvs.20060705/control-center/src/Makefile.am 2006-08-25 19:40:03.000000000 +0200
+@@ -12,9 +12,9 @@
+
+ control_center_LDADD = \
+ $(CONTROL_CENTER_LIBS) \
+- $(top_builddir)/libtile/libtile.la \
+- $(top_builddir)/libslab/libslab.la \
+- $(top_builddir)/utils/libutils.la
++ $(top_builddir)/utils/.libs/libutils.a \
++ $(top_builddir)/libslab/.libs/libslab.a \
++ $(top_builddir)/libtile/.libs/libtile.a
+
+ AM_CPPFLAGS = \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+Index: slab-0.0.cvs.20060705/main-menu/src/Makefile.am
+===================================================================
+--- slab-0.0.cvs.20060705.orig/main-menu/src/Makefile.am 2006-08-23 14:00:54.000000000 +0200
++++ slab-0.0.cvs.20060705/main-menu/src/Makefile.am 2006-08-25 19:40:17.000000000 +0200
+@@ -33,6 +33,6 @@
+ main_menu_LDADD = \
+ $(MAIN_MENU_LIBS) \
+ $(GLADE_LIBS) \
+- $(top_builddir)/utils/libutils.la \
+- $(top_builddir)/libtile/libtile.la \
+- $(top_builddir)/libslab/libslab.la
++ $(top_builddir)/utils/.libs/libutils.a \
++ $(top_builddir)/libslab/.libs/libslab.a \
++ $(top_builddir)/libtile/.libs/libtile.a
+Index: slab-0.0.cvs.20060705/application-browser/src/Makefile.in
+===================================================================
+--- slab-0.0.cvs.20060705.orig/application-browser/src/Makefile.in 2006-08-23 14:00:54.000000000 +0200
++++ slab-0.0.cvs.20060705/application-browser/src/Makefile.in 2006-08-25 19:40:21.000000000 +0200
+@@ -54,9 +54,9 @@
+ application_browser_OBJECTS = $(am_application_browser_OBJECTS)
+ am__DEPENDENCIES_1 =
+ application_browser_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(top_builddir)/libtile/libtile.la \
+- $(top_builddir)/libslab/libslab.la \
+- $(top_builddir)/utils/libutils.la
++ $(top_builddir)/utils/.libs/libutils.a \
++ $(top_builddir)/libslab/.libs/libslab.a \
++ $(top_builddir)/libtile/.libs/libtile.a
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -268,9 +268,9 @@
+
+ application_browser_LDADD = \
+ $(APPLICATION_BROWSER_LIBS) \
+- $(top_builddir)/libtile/libtile.la \
+- $(top_builddir)/libslab/libslab.la \
+- $(top_builddir)/utils/libutils.la
++ $(top_builddir)/utils/.libs/libutils.a \
++ $(top_builddir)/libslab/.libs/libslab.a \
++ $(top_builddir)/libtile/.libs/libtile.a
+
+ AM_CPPFLAGS = \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+Index: slab-0.0.cvs.20060705/control-center/src/Makefile.in
+===================================================================
+--- slab-0.0.cvs.20060705.orig/control-center/src/Makefile.in 2006-08-23 14:00:54.000000000 +0200
++++ slab-0.0.cvs.20060705/control-center/src/Makefile.in 2006-08-25 19:40:21.000000000 +0200
+@@ -53,9 +53,9 @@
+ control_center_OBJECTS = $(am_control_center_OBJECTS)
+ am__DEPENDENCIES_1 =
+ control_center_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(top_builddir)/libtile/libtile.la \
+- $(top_builddir)/libslab/libslab.la \
+- $(top_builddir)/utils/libutils.la
++ $(top_builddir)/utils/.libs/libutils.a \
++ $(top_builddir)/libslab/.libs/libslab.a \
++ $(top_builddir)/libtile/.libs/libtile.a
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -263,9 +263,9 @@
+
+ control_center_LDADD = \
+ $(CONTROL_CENTER_LIBS) \
+- $(top_builddir)/libtile/libtile.la \
+- $(top_builddir)/libslab/libslab.la \
+- $(top_builddir)/utils/libutils.la
++ $(top_builddir)/utils/.libs/libutils.a \
++ $(top_builddir)/libslab/.libs/libslab.a \
++ $(top_builddir)/libtile/.libs/libtile.a
+
+ AM_CPPFLAGS = \
+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+Index: slab-0.0.cvs.20060705/main-menu/src/Makefile.in
+===================================================================
+--- slab-0.0.cvs.20060705.orig/main-menu/src/Makefile.in 2006-08-23 14:00:54.000000000 +0200
++++ slab-0.0.cvs.20060705/main-menu/src/Makefile.in 2006-08-25 19:40:22.000000000 +0200
+@@ -60,9 +60,9 @@
+ main_menu_OBJECTS = $(am_main_menu_OBJECTS)
+ am__DEPENDENCIES_1 =
+ main_menu_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(top_builddir)/utils/libutils.la \
+- $(top_builddir)/libtile/libtile.la \
+- $(top_builddir)/libslab/libslab.la
++ $(top_builddir)/utils/.libs/libutils.a \
++ $(top_builddir)/libslab/.libs/libslab.a \
++ $(top_builddir)/libtile/.libs/libtile.a
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -291,9 +291,9 @@
+ main_menu_LDADD = \
+ $(MAIN_MENU_LIBS) \
+ $(GLADE_LIBS) \
+- $(top_builddir)/utils/libutils.la \
+- $(top_builddir)/libtile/libtile.la \
+- $(top_builddir)/libslab/libslab.la
++ $(top_builddir)/utils/.libs/libutils.a \
++ $(top_builddir)/libslab/.libs/libslab.a \
++ $(top_builddir)/libtile/.libs/libtile.a
+
+ all: all-am
+
+Index: slab-0.0.cvs.20060705/configure.in
+===================================================================
+--- slab-0.0.cvs.20060705.orig/configure.in 2006-08-23 14:00:54.000000000 +0200
++++ slab-0.0.cvs.20060705/configure.in 2006-08-25 19:38:28.000000000 +0200
+@@ -52,7 +52,7 @@
+ 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 hal-storage ])
++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 hal-storage librsvg-2.0 ])
+
+ AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, have_iwlib=yes, have_iwlib=no)], have_iwlib=no)
+
+@@ -66,12 +66,12 @@
+ AC_SUBST(MAIN_MENU_CFLAGS)
+ AC_SUBST(MAIN_MENU_LIBS)
+
+-PKG_CHECK_MODULES(APPLICATION_BROWSER, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ])
++PKG_CHECK_MODULES(APPLICATION_BROWSER, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0])
+
+ AC_SUBST(APPLICATION_BROWSER_CFLAGS)
+ AC_SUBST(APPLICATION_BROWSER_LIBS)
+
+-PKG_CHECK_MODULES(CONTROL_CENTER, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ])
++PKG_CHECK_MODULES(CONTROL_CENTER, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0])
+
+ AC_SUBST(CONTROL_CENTER_CFLAGS)
+ AC_SUBST(CONTROL_CENTER_LIBS)
+Index: slab-0.0.cvs.20060705/configure
+===================================================================
+--- slab-0.0.cvs.20060705.orig/configure 2006-08-25 19:38:38.000000000 +0200
++++ slab-0.0.cvs.20060705/configure 2006-08-25 19:38:41.000000000 +0200
+@@ -23993,12 +23993,12 @@
+ pkg_cv_MAIN_MENU_CFLAGS="$MAIN_MENU_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$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 hal-storage \"") >&5
+- ($PKG_CONFIG --exists --print-errors " $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 hal-storage ") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$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 hal-storage librsvg-2.0 \"") >&5
++ ($PKG_CONFIG --exists --print-errors " $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 hal-storage librsvg-2.0 ") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_MAIN_MENU_CFLAGS=`$PKG_CONFIG --cflags " $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 hal-storage " 2>/dev/null`
++ pkg_cv_MAIN_MENU_CFLAGS=`$PKG_CONFIG --cflags " $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 hal-storage librsvg-2.0 " 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -24011,12 +24011,12 @@
+ pkg_cv_MAIN_MENU_LIBS="$MAIN_MENU_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$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 hal-storage \"") >&5
+- ($PKG_CONFIG --exists --print-errors " $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 hal-storage ") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$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 hal-storage librsvg-2.0 \"") >&5
++ ($PKG_CONFIG --exists --print-errors " $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 hal-storage librsvg-2.0 ") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_MAIN_MENU_LIBS=`$PKG_CONFIG --libs " $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 hal-storage " 2>/dev/null`
++ pkg_cv_MAIN_MENU_LIBS=`$PKG_CONFIG --libs " $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 hal-storage librsvg-2.0 " 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -24035,14 +24035,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $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 hal-storage "`
++ MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $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 hal-storage librsvg-2.0 "`
+ else
+- MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $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 hal-storage "`
++ MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $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 hal-storage librsvg-2.0 "`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MAIN_MENU_PKG_ERRORS" >&5
+
+- { { echo "$as_me:$LINENO: error: Package requirements ( $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 hal-storage ) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements ( $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 hal-storage librsvg-2.0 ) were not met:
+
+ $MAIN_MENU_PKG_ERRORS
+
+@@ -24053,7 +24053,7 @@
+ and MAIN_MENU_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements ( $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 hal-storage ) were not met:
++echo "$as_me: error: Package requirements ( $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 hal-storage librsvg-2.0 ) were not met:
+
+ $MAIN_MENU_PKG_ERRORS
+
+@@ -24366,12 +24366,12 @@
+ pkg_cv_APPLICATION_BROWSER_CFLAGS="$APPLICATION_BROWSER_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu \"") >&5
+- ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_APPLICATION_BROWSER_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu " 2>/dev/null`
++ pkg_cv_APPLICATION_BROWSER_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -24384,12 +24384,12 @@
+ pkg_cv_APPLICATION_BROWSER_LIBS="$APPLICATION_BROWSER_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu \"") >&5
+- ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_APPLICATION_BROWSER_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu " 2>/dev/null`
++ pkg_cv_APPLICATION_BROWSER_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -24408,14 +24408,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- APPLICATION_BROWSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu "`
++ APPLICATION_BROWSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0"`
+ else
+- APPLICATION_BROWSER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu "`
++ APPLICATION_BROWSER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$APPLICATION_BROWSER_PKG_ERRORS" >&5
+
+- { { echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0) were not met:
+
+ $APPLICATION_BROWSER_PKG_ERRORS
+
+@@ -24426,7 +24426,7 @@
+ and APPLICATION_BROWSER_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ) were not met:
++echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0) were not met:
+
+ $APPLICATION_BROWSER_PKG_ERRORS
+
+@@ -24481,12 +24481,12 @@
+ pkg_cv_CONTROL_CENTER_CFLAGS="$CONTROL_CENTER_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu \"") >&5
+- ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_CONTROL_CENTER_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu " 2>/dev/null`
++ pkg_cv_CONTROL_CENTER_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -24499,12 +24499,12 @@
+ pkg_cv_CONTROL_CENTER_LIBS="$CONTROL_CENTER_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu \"") >&5
+- ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_CONTROL_CENTER_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu " 2>/dev/null`
++ pkg_cv_CONTROL_CENTER_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -24523,14 +24523,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- CONTROL_CENTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu "`
++ CONTROL_CENTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0"`
+ else
+- CONTROL_CENTER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu "`
++ CONTROL_CENTER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$CONTROL_CENTER_PKG_ERRORS" >&5
+
+- { { echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0) were not met:
+
+ $CONTROL_CENTER_PKG_ERRORS
+
+@@ -24541,7 +24541,7 @@
+ and CONTROL_CENTER_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ) were not met:
++echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0) were not met:
+
+ $CONTROL_CENTER_PKG_ERRORS
+
Added: packages/unstable/slab/debian/patches/05_binary_locations
===================================================================
--- packages/unstable/slab/debian/patches/05_binary_locations 2006-08-25 18:55:43 UTC (rev 279)
+++ packages/unstable/slab/debian/patches/05_binary_locations 2006-08-25 18:56:42 UTC (rev 280)
@@ -0,0 +1,22 @@
+Index: slab-0.0.cvs.20060705/main-menu/etc/slab.schemas.in.in
+===================================================================
+--- slab-0.0.cvs.20060705.orig/main-menu/etc/slab.schemas.in.in 2006-08-25 19:52:39.000000000 +0200
++++ slab-0.0.cvs.20060705/main-menu/etc/slab.schemas.in.in 2006-08-25 19:52:39.000000000 +0200
+@@ -81,7 +81,7 @@
+ <applyto>/desktop/gnome/applications/main-menu/system-area/control_center_item</applyto>
+ <owner>gnome-main-menu</owner>
+ <type>string</type>
+- <default>@DATADIR@/applications/control-center.desktop</default>
++ <default>/usr/share/gnome-main-menu/control-center.desktop</default>
+ <locale name="C">
+ <short>control center item .desktop file</short>
+ <long>control center item .desktop file</long>
+@@ -105,7 +105,7 @@
+ <applyto>/desktop/gnome/applications/main-menu/application_browser</applyto>
+ <owner>gnome-main-menu</owner>
+ <type>string</type>
+- <default>@DATADIR@/applications/application-browser.desktop</default>
++ <default>/usr/share/gnome-main-menu/application-browser.desktop</default>
+ <locale name="C">
+ <short>.desktop path for the application browser</short>
+ <long>.desktop path for the application browser</long>
Added: packages/unstable/slab/debian/patches/series
===================================================================
--- packages/unstable/slab/debian/patches/series 2006-08-25 18:55:43 UTC (rev 279)
+++ packages/unstable/slab/debian/patches/series 2006-08-25 18:56:42 UTC (rev 280)
@@ -0,0 +1,5 @@
+01_fix_menu_path.patch
+02_fix_recent_app_menu.patch
+03_fix_upgrade_packages.patch
+04_link_statically.patch
+05_binary_locations
More information about the Pkg-galago-commit
mailing list