r21858 - /desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Thu Oct 8 16:37:39 UTC 2009
Author: slomo
Date: Thu Oct 8 16:37:39 2009
New Revision: 21858
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21858
Log:
Fix patch
Modified:
desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch
Modified: desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch?rev=21858&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch [utf-8] Thu Oct 8 16:37:39 2009
@@ -1,14 +1,10 @@
cp /usr/share/gtk-doc/data/gtk-doc.make .
-libtoolize --force --copy
-aclocal
-automake -acf -Wno-portability
-autoheader
-autoconf
+autoreconf -fiv
rm -rf autom4te.cache config.h.in~
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/aclocal.m4 gnome-vfs-2.24.2/aclocal.m4
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/aclocal.m4 gnome-vfs-2.24.2/aclocal.m4
--- gnome-vfs-2.24.2.old/aclocal.m4 2009-10-08 16:14:39.000000000 +0200
-+++ gnome-vfs-2.24.2/aclocal.m4 2009-10-08 18:11:34.000000000 +0200
++++ gnome-vfs-2.24.2/aclocal.m4 2009-10-08 18:36:58.000000000 +0200
@@ -13,1128 +13,2030 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -7321,9 +7317,9 @@
+]) # _AM_PROG_TAR
m4_include([acinclude.m4])
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/config.h.in gnome-vfs-2.24.2/config.h.in
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/config.h.in gnome-vfs-2.24.2/config.h.in
--- gnome-vfs-2.24.2.old/config.h.in 2009-10-08 16:19:05.000000000 +0200
-+++ gnome-vfs-2.24.2/config.h.in 2009-10-08 18:11:39.000000000 +0200
++++ gnome-vfs-2.24.2/config.h.in 2009-10-08 18:37:02.000000000 +0200
@@ -400,22 +400,22 @@
/* Define to 1 if struct linger is available */
#undef HAVE_STRUCT_LINGER
@@ -7363,9 +7359,9 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/configure gnome-vfs-2.24.2/configure
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/configure gnome-vfs-2.24.2/configure
--- gnome-vfs-2.24.2.old/configure 2009-10-08 16:18:09.000000000 +0200
-+++ gnome-vfs-2.24.2/configure 2009-10-08 18:11:39.000000000 +0200
++++ gnome-vfs-2.24.2/configure 2009-10-08 18:37:00.000000000 +0200
@@ -1,18 +1,20 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -43232,9 +43228,9 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/daemon/Makefile.in gnome-vfs-2.24.2/daemon/Makefile.in
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/daemon/Makefile.in gnome-vfs-2.24.2/daemon/Makefile.in
--- gnome-vfs-2.24.2.old/daemon/Makefile.in 2009-10-08 16:19:05.000000000 +0200
-+++ gnome-vfs-2.24.2/daemon/Makefile.in 2009-10-08 18:11:37.000000000 +0200
++++ gnome-vfs-2.24.2/daemon/Makefile.in 2009-10-08 18:37:03.000000000 +0200
@@ -149,8 +149,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43260,9 +43256,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/devel-docs/gnome-vfs-tutorial/Makefile.in gnome-vfs-2.24.2/devel-docs/gnome-vfs-tutorial/Makefile.in
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/devel-docs/gnome-vfs-tutorial/Makefile.in gnome-vfs-2.24.2/devel-docs/gnome-vfs-tutorial/Makefile.in
--- gnome-vfs-2.24.2.old/devel-docs/gnome-vfs-tutorial/Makefile.in 2009-10-08 16:19:05.000000000 +0200
-+++ gnome-vfs-2.24.2/devel-docs/gnome-vfs-tutorial/Makefile.in 2009-10-08 18:11:37.000000000 +0200
++++ gnome-vfs-2.24.2/devel-docs/gnome-vfs-tutorial/Makefile.in 2009-10-08 18:37:03.000000000 +0200
@@ -99,8 +99,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43288,9 +43284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/devel-docs/Makefile.in gnome-vfs-2.24.2/devel-docs/Makefile.in
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/devel-docs/Makefile.in gnome-vfs-2.24.2/devel-docs/Makefile.in
--- gnome-vfs-2.24.2.old/devel-docs/Makefile.in 2009-10-08 16:19:05.000000000 +0200
-+++ gnome-vfs-2.24.2/devel-docs/Makefile.in 2009-10-08 18:11:37.000000000 +0200
++++ gnome-vfs-2.24.2/devel-docs/Makefile.in 2009-10-08 18:37:03.000000000 +0200
@@ -139,8 +139,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43316,9 +43312,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/doc/Makefile.in gnome-vfs-2.24.2/doc/Makefile.in
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/doc/Makefile.in gnome-vfs-2.24.2/doc/Makefile.in
--- gnome-vfs-2.24.2.old/doc/Makefile.in 2009-10-08 16:19:05.000000000 +0200
-+++ gnome-vfs-2.24.2/doc/Makefile.in 2009-10-08 18:11:37.000000000 +0200
++++ gnome-vfs-2.24.2/doc/Makefile.in 2009-10-08 18:37:03.000000000 +0200
@@ -106,8 +106,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43477,9 +43473,9 @@
.PHONY : dist-hook-local docs
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/gtk-doc.make gnome-vfs-2.24.2/gtk-doc.make
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/gtk-doc.make gnome-vfs-2.24.2/gtk-doc.make
--- gnome-vfs-2.24.2.old/gtk-doc.make 2009-10-08 16:19:02.000000000 +0200
-+++ gnome-vfs-2.24.2/gtk-doc.make 2009-10-08 18:11:29.000000000 +0200
++++ gnome-vfs-2.24.2/gtk-doc.make 2009-10-08 18:36:38.000000000 +0200
@@ -5,13 +5,13 @@
####################################
@@ -43616,9 +43612,9 @@
+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/imported/fnmatch/Makefile.in gnome-vfs-2.24.2/imported/fnmatch/Makefile.in
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/imported/fnmatch/Makefile.in gnome-vfs-2.24.2/imported/fnmatch/Makefile.in
--- gnome-vfs-2.24.2.old/imported/fnmatch/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/imported/fnmatch/Makefile.in 2009-10-08 18:11:37.000000000 +0200
++++ gnome-vfs-2.24.2/imported/fnmatch/Makefile.in 2009-10-08 18:37:04.000000000 +0200
@@ -123,8 +123,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43644,9 +43640,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/imported/Makefile.in gnome-vfs-2.24.2/imported/Makefile.in
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/imported/Makefile.in gnome-vfs-2.24.2/imported/Makefile.in
--- gnome-vfs-2.24.2.old/imported/Makefile.in 2009-10-08 16:19:05.000000000 +0200
-+++ gnome-vfs-2.24.2/imported/Makefile.in 2009-10-08 18:11:37.000000000 +0200
++++ gnome-vfs-2.24.2/imported/Makefile.in 2009-10-08 18:37:04.000000000 +0200
@@ -139,8 +139,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43672,9 +43668,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/imported/neon/Makefile.in gnome-vfs-2.24.2/imported/neon/Makefile.in
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/imported/neon/Makefile.in gnome-vfs-2.24.2/imported/neon/Makefile.in
--- gnome-vfs-2.24.2.old/imported/neon/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/imported/neon/Makefile.in 2009-10-08 18:11:37.000000000 +0200
++++ gnome-vfs-2.24.2/imported/neon/Makefile.in 2009-10-08 18:37:04.000000000 +0200
@@ -134,8 +134,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43700,9 +43696,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/libgnomevfs/Makefile.in gnome-vfs-2.24.2/libgnomevfs/Makefile.in
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/libgnomevfs/Makefile.in gnome-vfs-2.24.2/libgnomevfs/Makefile.in
--- gnome-vfs-2.24.2.old/libgnomevfs/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/libgnomevfs/Makefile.in 2009-10-08 18:11:37.000000000 +0200
++++ gnome-vfs-2.24.2/libgnomevfs/Makefile.in 2009-10-08 18:37:04.000000000 +0200
@@ -235,8 +235,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43728,9 +43724,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/ltmain.sh gnome-vfs-2.24.2/ltmain.sh
---- gnome-vfs-2.24.2.old/ltmain.sh 2009-10-08 18:11:00.000000000 +0200
-+++ gnome-vfs-2.24.2/ltmain.sh 2009-10-08 18:11:29.000000000 +0200
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/ltmain.sh gnome-vfs-2.24.2/ltmain.sh
+--- gnome-vfs-2.24.2.old/ltmain.sh 2009-10-08 16:19:02.000000000 +0200
++++ gnome-vfs-2.24.2/ltmain.sh 2009-10-08 18:36:51.000000000 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -43749,19 +43745,7 @@
TIMESTAMP=""
package_revision=1.3012
-@@ -4716,11 +4716,6 @@
- arg=$func_stripname_result
- ;;
-
-- -Wl,--as-needed)
-- deplibs="$deplibs $arg"
-- continue
-- ;;
--
- -Wl,*)
- func_stripname '-Wl,' '' "$arg"
- args=$func_stripname_result
-@@ -5038,7 +5033,10 @@
+@@ -5033,7 +5033,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -43773,23 +43757,7 @@
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5072,15 +5070,6 @@
- lib=
- found=no
- case $deplib in
-- -Wl,--as-needed)
-- if test "$linkmode,$pass" = "prog,link"; then
-- compile_deplibs="$deplib $compile_deplibs"
-- finalize_deplibs="$deplib $finalize_deplibs"
-- else
-- deplibs="$deplib $deplibs"
-- fi
-- continue
-- ;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
-@@ -5358,19 +5347,19 @@
+@@ -5344,19 +5347,19 @@
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
@@ -43819,7 +43787,7 @@
continue
fi # $pass = conv
-@@ -5907,6 +5896,7 @@
+@@ -5893,6 +5896,7 @@
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
@@ -43827,7 +43795,7 @@
case $deplib in
-L*) path="$deplib" ;;
*.la)
-@@ -6220,6 +6210,9 @@
+@@ -6206,6 +6210,9 @@
revision="$number_minor"
lt_irix_increment=no
;;
@@ -43837,9 +43805,9 @@
esac
;;
no)
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/Makefile.in gnome-vfs-2.24.2/Makefile.in
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/Makefile.in gnome-vfs-2.24.2/Makefile.in
--- gnome-vfs-2.24.2.old/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/Makefile.in 2009-10-08 18:11:38.000000000 +0200
++++ gnome-vfs-2.24.2/Makefile.in 2009-10-08 18:37:05.000000000 +0200
@@ -183,8 +183,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43865,9 +43833,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/modules/Makefile.in gnome-vfs-2.24.2/modules/Makefile.in
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/modules/Makefile.in gnome-vfs-2.24.2/modules/Makefile.in
--- gnome-vfs-2.24.2.old/modules/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/modules/Makefile.in 2009-10-08 18:11:37.000000000 +0200
++++ gnome-vfs-2.24.2/modules/Makefile.in 2009-10-08 18:37:04.000000000 +0200
@@ -271,8 +271,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43893,9 +43861,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/programs/Makefile.in gnome-vfs-2.24.2/programs/Makefile.in
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/programs/Makefile.in gnome-vfs-2.24.2/programs/Makefile.in
--- gnome-vfs-2.24.2.old/programs/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/programs/Makefile.in 2009-10-08 18:11:38.000000000 +0200
++++ gnome-vfs-2.24.2/programs/Makefile.in 2009-10-08 18:37:05.000000000 +0200
@@ -161,8 +161,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43921,9 +43889,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/schemas/Makefile.in gnome-vfs-2.24.2/schemas/Makefile.in
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/schemas/Makefile.in gnome-vfs-2.24.2/schemas/Makefile.in
--- gnome-vfs-2.24.2.old/schemas/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/schemas/Makefile.in 2009-10-08 18:11:38.000000000 +0200
++++ gnome-vfs-2.24.2/schemas/Makefile.in 2009-10-08 18:37:05.000000000 +0200
@@ -123,8 +123,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43949,9 +43917,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -Naur -x'*INSTALL' gnome-vfs-2.24.2.old/test/Makefile.in gnome-vfs-2.24.2/test/Makefile.in
+diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/test/Makefile.in gnome-vfs-2.24.2/test/Makefile.in
--- gnome-vfs-2.24.2.old/test/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/test/Makefile.in 2009-10-08 18:11:38.000000000 +0200
++++ gnome-vfs-2.24.2/test/Makefile.in 2009-10-08 18:37:05.000000000 +0200
@@ -286,8 +286,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
More information about the pkg-gnome-commits
mailing list