1
# Description: Drop unnecessary dependencies
3
# Bug-Debian: http://bugs.debian.org/525543
4
# Bug-Ubuntu: https://bugs.launchpad.net/bugs/347971
6
# Author: Robert Ancell <robert.ancell@canonical.com>
7
# Reviewed-By: Chow Loong Jin <hyperair@ubuntu.com>
8
# Reviewed-By: Michael Terry <michael.terry@canonical.com>
11
configure | 20 ++++++++++----------
13
src/nautilus-share.c | 2 --
14
3 files changed, 11 insertions(+), 13 deletions(-)
17
Index: nautilus-share/configure
18
===================================================================
19
--- nautilus-share.orig/configure 2010-11-06 05:46:49.427027749 +0800
20
+++ nautilus-share/configure 2010-11-06 05:48:03.957146056 +0800
21
@@ -20683,12 +20683,12 @@
22
pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS"
24
if test -n "$PKG_CONFIG" && \
25
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED eel-2.0 >= \$EEL_REQUIRED\"") >&5
26
- ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED") 2>&5
27
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED\"") >&5
28
+ ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED") 2>&5
30
echo "$as_me:$LINENO: \$? = $ac_status" >&5
31
(exit $ac_status); }; then
32
- pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED" 2>/dev/null`
33
+ pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= $NAUTILUS_REQUIRED" 2>/dev/null`
37
@@ -20701,12 +20701,12 @@
38
pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS"
40
if test -n "$PKG_CONFIG" && \
41
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED eel-2.0 >= \$EEL_REQUIRED\"") >&5
42
- ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED") 2>&5
43
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED\"") >&5
44
+ ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED") 2>&5
46
echo "$as_me:$LINENO: \$? = $ac_status" >&5
47
(exit $ac_status); }; then
48
- pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED" 2>/dev/null`
49
+ pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= $NAUTILUS_REQUIRED" 2>/dev/null`
53
@@ -20725,14 +20725,14 @@
54
_pkg_short_errors_supported=no
56
if test $_pkg_short_errors_supported = yes; then
57
- NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED"`
58
+ NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED"`
60
- NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED"`
61
+ NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED"`
63
# Put the nasty error message in config.log where it belongs
64
echo "$NAUTILUS_PKG_ERRORS" >&5
66
- { { echo "$as_me:$LINENO: error: Package requirements (libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED) were not met:
67
+ { { echo "$as_me:$LINENO: error: Package requirements (libnautilus-extension >= $NAUTILUS_REQUIRED) were not met:
71
@@ -20743,7 +20743,7 @@
72
and NAUTILUS_LIBS to avoid the need to call pkg-config.
73
See the pkg-config man page for more details.
75
-echo "$as_me: error: Package requirements (libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED) were not met:
76
+echo "$as_me: error: Package requirements (libnautilus-extension >= $NAUTILUS_REQUIRED) were not met:
80
Index: nautilus-share/configure.in
81
===================================================================
82
--- nautilus-share.orig/configure.in 2010-11-06 05:46:49.447027781 +0800
83
+++ nautilus-share/configure.in 2010-11-06 05:48:03.957146056 +0800
85
AC_MSG_ERROR(you need to have pkgconfig installed !)
88
-PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED)
89
+PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED)
90
PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
91
PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= $LIBGLADE_REQUIRED)
93
Index: nautilus-share/src/nautilus-share.c
94
===================================================================
95
--- nautilus-share.orig/src/nautilus-share.c 2010-11-06 05:48:03.927146009 +0800
96
+++ nautilus-share/src/nautilus-share.c 2010-11-06 05:48:03.957146056 +0800
98
#include <libgnomevfs/gnome-vfs-utils.h>
99
#include "nautilus-share.h"
101
-#include <eel/eel-vfs-extensions.h>
103
#include <glib/gi18n-lib.h>
105
#include <gtk/gtktable.h>