r20839 - in /desktop/unstable/gnome-vfs/debian/patches: 03_gnutls27.patch 90_relibtoolize.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Aug 8 15:14:33 UTC 2009
Author: joss
Date: Sat Aug 8 15:14:33 2009
New Revision: 20839
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20839
Log:
Fix a bug in the gnutls patch that lead to have_ssl not being set.
Modified:
desktop/unstable/gnome-vfs/debian/patches/03_gnutls27.patch
desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch
Modified: desktop/unstable/gnome-vfs/debian/patches/03_gnutls27.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/03_gnutls27.patch?rev=20839&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/03_gnutls27.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/03_gnutls27.patch [utf-8] Sat Aug 8 15:14:33 2009
@@ -1,21 +1,23 @@
Debian #529827
GNOME #574589
Gentoo #253729
-Patch by Gilles Dartiguelongue
+Patch by Gilles Dartiguelongue, fixed for correctly setting have_ssl
Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
Use pkg-config in place of gnutls own macro since it's not present anymore.
---- a/configure.in 2009-03-07 19:59:53.805507753 +0100
-+++ b/configure.in 2009-03-07 18:34:36.928169018 +0100
-@@ -686,14 +686,14 @@
+Index: gnome-vfs-2.24.1/configure.in
+===================================================================
+--- gnome-vfs-2.24.1.orig/configure.in 2009-08-08 17:12:12.591942620 +0200
++++ gnome-vfs-2.24.1/configure.in 2009-08-08 17:13:10.220966076 +0200
+@@ -668,14 +668,14 @@ if test "x$enable_gnutls" = "xyes"; then
AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
else
AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
- AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
- have_ssl=true])
+ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-+ have_ssl = true])
++ have_ssl=true])
if test "x${LIBGNUTLS_LIBS}" = "x"; then
- AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
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=20839&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] Sat Aug 8 15:14:33 2009
@@ -8,8 +8,8 @@
Index: gnome-vfs-2.24.1/INSTALL
===================================================================
---- gnome-vfs-2.24.1.orig/INSTALL 2009-08-08 16:56:43.092440590 +0200
-+++ gnome-vfs-2.24.1/INSTALL 2009-08-08 16:57:14.316441273 +0200
+--- gnome-vfs-2.24.1.orig/INSTALL 2009-08-08 17:12:10.276442336 +0200
++++ gnome-vfs-2.24.1/INSTALL 2009-08-08 17:14:06.172440914 +0200
@@ -1,5 +1,8 @@
-Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
@@ -242,8 +242,8 @@
Index: gnome-vfs-2.24.1/Makefile.in
===================================================================
---- gnome-vfs-2.24.1.orig/Makefile.in 2009-08-08 16:56:43.080444232 +0200
-+++ gnome-vfs-2.24.1/Makefile.in 2009-08-08 16:57:14.400440700 +0200
+--- gnome-vfs-2.24.1.orig/Makefile.in 2009-08-08 17:12:10.264441579 +0200
++++ gnome-vfs-2.24.1/Makefile.in 2009-08-08 17:14:06.252439774 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -389,8 +389,8 @@
tags: TAGS
Index: gnome-vfs-2.24.1/aclocal.m4
===================================================================
---- gnome-vfs-2.24.1.orig/aclocal.m4 2009-08-08 16:56:43.048441561 +0200
-+++ gnome-vfs-2.24.1/aclocal.m4 2009-08-08 16:56:44.808441794 +0200
+--- gnome-vfs-2.24.1.orig/aclocal.m4 2009-08-08 17:12:10.240441531 +0200
++++ gnome-vfs-2.24.1/aclocal.m4 2009-08-08 17:13:44.147940870 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
@@ -16971,8 +16971,8 @@
m4_include([acinclude.m4])
Index: gnome-vfs-2.24.1/config.guess
===================================================================
---- gnome-vfs-2.24.1.orig/config.guess 2009-08-08 16:56:43.040442359 +0200
-+++ gnome-vfs-2.24.1/config.guess 2009-08-08 16:57:12.203939893 +0200
+--- gnome-vfs-2.24.1.orig/config.guess 2009-08-08 17:12:10.220442549 +0200
++++ gnome-vfs-2.24.1/config.guess 2009-08-08 17:14:04.115942737 +0200
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
@@ -17108,8 +17108,8 @@
send the following data and any information you think might be
Index: gnome-vfs-2.24.1/config.h.in
===================================================================
---- gnome-vfs-2.24.1.orig/config.h.in 2009-08-08 16:56:43.020441911 +0200
-+++ gnome-vfs-2.24.1/config.h.in 2009-08-08 16:56:44.812448728 +0200
+--- gnome-vfs-2.24.1.orig/config.h.in 2009-08-08 17:12:10.204444146 +0200
++++ gnome-vfs-2.24.1/config.h.in 2009-08-08 17:13:44.147940870 +0200
@@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.in by autoheader. */
@@ -17153,8 +17153,8 @@
/* Enable GNU Extensions */
Index: gnome-vfs-2.24.1/config.sub
===================================================================
---- gnome-vfs-2.24.1.orig/config.sub 2009-08-08 16:56:43.004444975 +0200
-+++ gnome-vfs-2.24.1/config.sub 2009-08-08 16:57:12.292444929 +0200
+--- gnome-vfs-2.24.1.orig/config.sub 2009-08-08 17:12:10.188442810 +0200
++++ gnome-vfs-2.24.1/config.sub 2009-08-08 17:14:04.123944872 +0200
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
@@ -17346,8 +17346,8 @@
*)
Index: gnome-vfs-2.24.1/configure
===================================================================
---- gnome-vfs-2.24.1.orig/configure 2009-08-08 16:56:42.988440705 +0200
-+++ gnome-vfs-2.24.1/configure 2009-08-08 16:57:16.320439617 +0200
+--- gnome-vfs-2.24.1.orig/configure 2009-08-08 17:12:10.172440984 +0200
++++ gnome-vfs-2.24.1/configure 2009-08-08 17:14:08.188440016 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -39084,7 +39084,7 @@
-#include <stdlib.h>
-#include <string.h>
-#include <gnutls/gnutls.h>
-+ have_ssl = true
++ have_ssl=true
+fi
-int
@@ -41250,8 +41250,8 @@
Index: gnome-vfs-2.24.1/daemon/Makefile.in
===================================================================
---- gnome-vfs-2.24.1.orig/daemon/Makefile.in 2009-08-08 16:56:42.976444837 +0200
-+++ gnome-vfs-2.24.1/daemon/Makefile.in 2009-08-08 16:57:12.592440868 +0200
+--- gnome-vfs-2.24.1.orig/daemon/Makefile.in 2009-08-08 17:12:10.136445064 +0200
++++ gnome-vfs-2.24.1/daemon/Makefile.in 2009-08-08 17:14:04.400440909 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -41399,8 +41399,8 @@
tags: TAGS
Index: gnome-vfs-2.24.1/devel-docs/Makefile.in
===================================================================
---- gnome-vfs-2.24.1.orig/devel-docs/Makefile.in 2009-08-08 16:56:42.960443993 +0200
-+++ gnome-vfs-2.24.1/devel-docs/Makefile.in 2009-08-08 16:57:12.712441114 +0200
+--- gnome-vfs-2.24.1.orig/devel-docs/Makefile.in 2009-08-08 17:12:10.120440795 +0200
++++ gnome-vfs-2.24.1/devel-docs/Makefile.in 2009-08-08 17:14:04.516439096 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -41548,8 +41548,8 @@
tags: TAGS
Index: gnome-vfs-2.24.1/devel-docs/gnome-vfs-tutorial/Makefile.in
===================================================================
---- gnome-vfs-2.24.1.orig/devel-docs/gnome-vfs-tutorial/Makefile.in 2009-08-08 16:56:42.936444924 +0200
-+++ gnome-vfs-2.24.1/devel-docs/gnome-vfs-tutorial/Makefile.in 2009-08-08 16:57:12.832440863 +0200
+--- gnome-vfs-2.24.1.orig/devel-docs/gnome-vfs-tutorial/Makefile.in 2009-08-08 17:12:10.108442483 +0200
++++ gnome-vfs-2.24.1/devel-docs/gnome-vfs-tutorial/Makefile.in 2009-08-08 17:14:04.608440178 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -41688,8 +41688,8 @@
done; \
Index: gnome-vfs-2.24.1/doc/Makefile.in
===================================================================
---- gnome-vfs-2.24.1.orig/doc/Makefile.in 2009-08-08 16:56:42.908443323 +0200
-+++ gnome-vfs-2.24.1/doc/Makefile.in 2009-08-08 16:57:12.948439534 +0200
+--- gnome-vfs-2.24.1.orig/doc/Makefile.in 2009-08-08 17:12:10.092442125 +0200
++++ gnome-vfs-2.24.1/doc/Makefile.in 2009-08-08 17:14:04.736443047 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -41953,8 +41953,8 @@
Index: gnome-vfs-2.24.1/imported/Makefile.in
===================================================================
---- gnome-vfs-2.24.1.orig/imported/Makefile.in 2009-08-08 16:56:42.880449056 +0200
-+++ gnome-vfs-2.24.1/imported/Makefile.in 2009-08-08 16:57:13.044439234 +0200
+--- gnome-vfs-2.24.1.orig/imported/Makefile.in 2009-08-08 17:12:10.052446118 +0200
++++ gnome-vfs-2.24.1/imported/Makefile.in 2009-08-08 17:14:04.840439993 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -42102,8 +42102,8 @@
tags: TAGS
Index: gnome-vfs-2.24.1/imported/fnmatch/Makefile.in
===================================================================
---- gnome-vfs-2.24.1.orig/imported/fnmatch/Makefile.in 2009-08-08 16:56:42.852445989 +0200
-+++ gnome-vfs-2.24.1/imported/fnmatch/Makefile.in 2009-08-08 16:57:13.176440724 +0200
+--- gnome-vfs-2.24.1.orig/imported/fnmatch/Makefile.in 2009-08-08 17:12:10.040442916 +0200
++++ gnome-vfs-2.24.1/imported/fnmatch/Makefile.in 2009-08-08 17:14:04.964438843 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -42251,8 +42251,8 @@
tags: TAGS
Index: gnome-vfs-2.24.1/imported/neon/Makefile.in
===================================================================
---- gnome-vfs-2.24.1.orig/imported/neon/Makefile.in 2009-08-08 16:56:42.824440476 +0200
-+++ gnome-vfs-2.24.1/imported/neon/Makefile.in 2009-08-08 16:57:13.304439679 +0200
+--- gnome-vfs-2.24.1.orig/imported/neon/Makefile.in 2009-08-08 17:12:10.016444334 +0200
++++ gnome-vfs-2.24.1/imported/neon/Makefile.in 2009-08-08 17:14:05.108439130 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -42400,8 +42400,8 @@
tags: TAGS
Index: gnome-vfs-2.24.1/libgnomevfs/Makefile.in
===================================================================
---- gnome-vfs-2.24.1.orig/libgnomevfs/Makefile.in 2009-08-08 16:56:42.792445139 +0200
-+++ gnome-vfs-2.24.1/libgnomevfs/Makefile.in 2009-08-08 16:57:13.496439556 +0200
+--- gnome-vfs-2.24.1.orig/libgnomevfs/Makefile.in 2009-08-08 17:12:09.996444375 +0200
++++ gnome-vfs-2.24.1/libgnomevfs/Makefile.in 2009-08-08 17:14:05.300439520 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -42549,8 +42549,8 @@
tags: TAGS
Index: gnome-vfs-2.24.1/ltmain.sh
===================================================================
---- gnome-vfs-2.24.1.orig/ltmain.sh 2009-08-08 16:56:42.708452060 +0200
-+++ gnome-vfs-2.24.1/ltmain.sh 2009-08-08 16:56:54.172446222 +0200
+--- gnome-vfs-2.24.1.orig/ltmain.sh 2009-08-08 17:12:09.976443439 +0200
++++ gnome-vfs-2.24.1/ltmain.sh 2009-08-08 17:13:50.979942000 +0200
@@ -1,52 +1,83 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -56757,8 +56757,8 @@
+
Index: gnome-vfs-2.24.1/modules/Makefile.in
===================================================================
---- gnome-vfs-2.24.1.orig/modules/Makefile.in 2009-08-08 16:56:42.684445166 +0200
-+++ gnome-vfs-2.24.1/modules/Makefile.in 2009-08-08 16:57:13.708442839 +0200
+--- gnome-vfs-2.24.1.orig/modules/Makefile.in 2009-08-08 17:12:09.936441570 +0200
++++ gnome-vfs-2.24.1/modules/Makefile.in 2009-08-08 17:14:05.512439845 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -56906,8 +56906,8 @@
tags: TAGS
Index: gnome-vfs-2.24.1/programs/Makefile.in
===================================================================
---- gnome-vfs-2.24.1.orig/programs/Makefile.in 2009-08-08 16:56:42.656442582 +0200
-+++ gnome-vfs-2.24.1/programs/Makefile.in 2009-08-08 16:57:13.872440636 +0200
+--- gnome-vfs-2.24.1.orig/programs/Makefile.in 2009-08-08 17:12:09.924440326 +0200
++++ gnome-vfs-2.24.1/programs/Makefile.in 2009-08-08 17:14:05.740439575 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -57055,8 +57055,8 @@
tags: TAGS
Index: gnome-vfs-2.24.1/schemas/Makefile.in
===================================================================
---- gnome-vfs-2.24.1.orig/schemas/Makefile.in 2009-08-08 16:56:42.604457551 +0200
-+++ gnome-vfs-2.24.1/schemas/Makefile.in 2009-08-08 16:57:13.976439528 +0200
+--- gnome-vfs-2.24.1.orig/schemas/Makefile.in 2009-08-08 17:12:09.896443614 +0200
++++ gnome-vfs-2.24.1/schemas/Makefile.in 2009-08-08 17:14:05.840439365 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -57195,8 +57195,8 @@
done; \
Index: gnome-vfs-2.24.1/test/Makefile.in
===================================================================
---- gnome-vfs-2.24.1.orig/test/Makefile.in 2009-08-08 16:56:42.576449591 +0200
-+++ gnome-vfs-2.24.1/test/Makefile.in 2009-08-08 16:57:14.256440422 +0200
+--- gnome-vfs-2.24.1.orig/test/Makefile.in 2009-08-08 17:12:09.884444325 +0200
++++ gnome-vfs-2.24.1/test/Makefile.in 2009-08-08 17:14:06.120441703 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -57413,8 +57413,8 @@
fi; \
Index: gnome-vfs-2.24.1/gtk-doc.make
===================================================================
---- gnome-vfs-2.24.1.orig/gtk-doc.make 2009-08-08 16:56:42.532453984 +0200
-+++ gnome-vfs-2.24.1/gtk-doc.make 2009-08-08 16:56:44.972440556 +0200
+--- gnome-vfs-2.24.1.orig/gtk-doc.make 2009-08-08 17:12:09.868444947 +0200
++++ gnome-vfs-2.24.1/gtk-doc.make 2009-08-08 17:13:50.527943631 +0200
@@ -5,13 +5,13 @@
####################################
More information about the pkg-gnome-commits
mailing list