rpms/evolution-connector/devel .cvsignore, 1.25, 1.26 evolution-connector.spec, 1.47, 1.48 regenerate-patch.sh, 1.13, 1.14 sources, 1.25, 1.26 ximian-connector-2.1.4-generated-autotool.patch, 1.12, 1.13

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jan 31 03:40:28 UTC 2006


Author: dmalcolm

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18519

Modified Files:
	.cvsignore evolution-connector.spec regenerate-patch.sh 
	sources ximian-connector-2.1.4-generated-autotool.patch 
Log Message:
* Mon Jan 30 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.9.0-1
- 2.5.9.0
- regenerate patch 200
- enable parallel make




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	28 Jan 2006 00:37:28 -0000	1.25
+++ .cvsignore	31 Jan 2006 03:40:24 -0000	1.26
@@ -1 +1 @@
-evolution-exchange-2.5.5.1.tar.bz2
+evolution-exchange-2.5.9.0.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- evolution-connector.spec	28 Jan 2006 00:37:29 -0000	1.47
+++ evolution-connector.spec	31 Jan 2006 03:40:24 -0000	1.48
@@ -6,7 +6,7 @@
 %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null)
 
 Name: evolution-connector
-Version: 2.5.5.1
+Version: 2.5.9.0
 Release: 1
 License: GPL
 Group: Applications/Productivity
@@ -66,7 +66,7 @@
 fi
 export LIBS
 %configure --with-openldap=%{_libdir}/evolution-openldap --with-static-ldap
-make LDFLAGS="-R %{plibdir}"
+make %{?_smp_mflags} LDFLAGS="-R %{plibdir}"
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@@ -94,6 +94,11 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Mon Jan 30 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.9.0-1
+- 2.5.9.0
+- regenerate patch 200
+- enable parallel make
+
 * Wed Jan 25 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.5.1-1
 - 2.5.5.1
 - regenerate patch 200


Index: regenerate-patch.sh
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/regenerate-patch.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- regenerate-patch.sh	28 Jan 2006 00:37:29 -0000	1.13
+++ regenerate-patch.sh	31 Jan 2006 03:40:24 -0000	1.14
@@ -1,5 +1,5 @@
 #!/bin/sh
-BASE_NAME=evolution-exchange-2.5.5.1
+BASE_NAME=evolution-exchange-2.5.9.0
 TARBALL_NAME=$BASE_NAME.tar.bz2
 
 #INPUT_PATCHES="ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch ximian-connector-2.2.2-noinst-ltlibraries.patch ximian-connector-2.2.2-install-debug-utilities.patch"


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	28 Jan 2006 00:37:29 -0000	1.25
+++ sources	31 Jan 2006 03:40:24 -0000	1.26
@@ -1 +1 @@
-36a8dbcfc2b69c1899afe22480f0e760  evolution-exchange-2.5.5.1.tar.bz2
+f4a0893159dad3603b33f2c99616a121  evolution-exchange-2.5.9.0.tar.bz2

ximian-connector-2.1.4-generated-autotool.patch:
 evolution-exchange-2.5.9.0-patched/Makefile.in                                  |    1 
 evolution-exchange-2.5.9.0-patched/acinclude.m4                                 |   22 
 evolution-exchange-2.5.9.0-patched/aclocal.m4                                   |10285 +++++-----
 evolution-exchange-2.5.9.0-patched/addressbook/Makefile.in                      |    1 
 evolution-exchange-2.5.9.0-patched/autom4te.cache                               |only
 evolution-exchange-2.5.9.0-patched/calendar/Makefile.in                         |    1 
 evolution-exchange-2.5.9.0-patched/camel/Makefile.in                            |    1 
 evolution-exchange-2.5.9.0-patched/configure                                    | 5808 ++---
 evolution-exchange-2.5.9.0-patched/docs/Makefile.in                             |    1 
 evolution-exchange-2.5.9.0-patched/docs/ietf/Makefile.in                        |    1 
 evolution-exchange-2.5.9.0-patched/docs/reference/Makefile.in                   |    1 
 evolution-exchange-2.5.9.0-patched/intltool-extract.in                          |    4 
 evolution-exchange-2.5.9.0-patched/intltool-merge.in                            |    4 
 evolution-exchange-2.5.9.0-patched/intltool-update.in                           |   26 
 evolution-exchange-2.5.9.0-patched/mail/Makefile.in                             |    1 
 evolution-exchange-2.5.9.0-patched/po/Makefile.in.in                            |   83 
 evolution-exchange-2.5.9.0-patched/storage/Makefile.in                          |    1 
 evolution-exchange-2.5.9.0-pristine/Makefile.in.autotool-results                |only
 evolution-exchange-2.5.9.0-pristine/acinclude.m4.autotool-results               |only
 evolution-exchange-2.5.9.0-pristine/aclocal.m4.autotool-results                 |only
 evolution-exchange-2.5.9.0-pristine/aclocal.m4.rej                              |only
 evolution-exchange-2.5.9.0-pristine/addressbook/Makefile.in.autotool-results    |only
 evolution-exchange-2.5.9.0-pristine/calendar/Makefile.in.autotool-results       |only
 evolution-exchange-2.5.9.0-pristine/camel/Makefile.in.autotool-results          |only
 evolution-exchange-2.5.9.0-pristine/configure.autotool-results                  |only
 evolution-exchange-2.5.9.0-pristine/docs/Makefile.in.autotool-results           |only
 evolution-exchange-2.5.9.0-pristine/docs/ietf/Makefile.in.autotool-results      |only
 evolution-exchange-2.5.9.0-pristine/docs/reference/Makefile.in.autotool-results |only
 evolution-exchange-2.5.9.0-pristine/intltool-extract.in.autotool-results        |only
 evolution-exchange-2.5.9.0-pristine/intltool-merge.in.autotool-results          |only
 evolution-exchange-2.5.9.0-pristine/intltool-update.in.autotool-results         |only
 evolution-exchange-2.5.9.0-pristine/mail/Makefile.in.autotool-results           |only
 evolution-exchange-2.5.9.0-pristine/po/Makefile.in.in.autotool-results          |only
 evolution-exchange-2.5.9.0-pristine/storage/Makefile.in.autotool-results        |only
 34 files changed, 7827 insertions(+), 8414 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.12 -r 1.13 ximian-connector-2.1.4-generated-autotool.patch
Index: ximian-connector-2.1.4-generated-autotool.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/ximian-connector-2.1.4-generated-autotool.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ximian-connector-2.1.4-generated-autotool.patch	28 Jan 2006 00:37:29 -0000	1.12
+++ ximian-connector-2.1.4-generated-autotool.patch	31 Jan 2006 03:40:24 -0000	1.13
@@ -1,6 +1,6 @@
-diff --recursive -up evolution-exchange-2.5.5.1-pristine/acinclude.m4 evolution-exchange-2.5.5.1-patched/acinclude.m4
---- evolution-exchange-2.5.5.1-pristine/acinclude.m4	2004-08-13 14:16:45.000000000 -0400
-+++ evolution-exchange-2.5.5.1-patched/acinclude.m4	2006-01-25 14:56:17.000000000 -0500
+diff --recursive -up evolution-exchange-2.5.9.0-pristine/acinclude.m4 evolution-exchange-2.5.9.0-patched/acinclude.m4
+--- evolution-exchange-2.5.9.0-pristine/acinclude.m4	2004-08-13 14:16:45.000000000 -0400
++++ evolution-exchange-2.5.9.0-patched/acinclude.m4	2006-01-30 22:32:45.000000000 -0500
 @@ -34,6 +34,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [
  	AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])
  	AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])
@@ -54,11 +54,11 @@
  					else
  						LDAP_LIBS="-lldap $LDAP_LIBS"
  					fi],
-Only in evolution-exchange-2.5.5.1-pristine: acinclude.m4.autotool-results
-diff --recursive -up evolution-exchange-2.5.5.1-pristine/aclocal.m4 evolution-exchange-2.5.5.1-patched/aclocal.m4
---- evolution-exchange-2.5.5.1-pristine/aclocal.m4	2006-01-18 08:22:44.000000000 -0500
-+++ evolution-exchange-2.5.5.1-patched/aclocal.m4	2006-01-25 14:56:21.000000000 -0500
-@@ -11,3818 +11,3020 @@
+Only in evolution-exchange-2.5.9.0-pristine: acinclude.m4.autotool-results
+diff --recursive -up evolution-exchange-2.5.9.0-pristine/aclocal.m4 evolution-exchange-2.5.9.0-patched/aclocal.m4
+--- evolution-exchange-2.5.9.0-pristine/aclocal.m4	2006-01-30 08:48:27.000000000 -0500
++++ evolution-exchange-2.5.9.0-patched/aclocal.m4	2006-01-30 22:32:50.000000000 -0500
+@@ -11,3955 +11,3149 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
@@ -3199,8 +3199,25 @@
 -AC_DEFUN([IT_PROG_INTLTOOL],
 -[AC_PREREQ([2.50])dnl
 -
+-case "$am__api_version" in
+-    1.[01234])
+-	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+-    ;;
+-    *)
+-    ;;
+-esac
+-
 -if test -n "$1"; then
 -    AC_MSG_CHECKING(for intltool >= $1)
+-
+-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 100 + $ 2; }'`
+-    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+-    [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 100 + VERSION[2];}' ${ac_aux_dir}/intltool-update.in`
+-    ]
+-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+-	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
+-fi
 +# _LT_COMPILER_BOILERPLATE
 +# ------------------------
 +# Check for compiler boilerplate output or warnings with
@@ -3213,15 +3230,6 @@
 +$rm conftest*
 +])# _LT_COMPILER_BOILERPLATE
  
--    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 100 + $ 2; }'`
--    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
--    [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 100 + VERSION[2];}' ${ac_aux_dir}/intltool-update.in`
--    ]
--    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
--    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
--	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
--fi
- 
 -  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
 -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
 -     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
@@ -3240,17 +3248,6 @@
 -  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
 -    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
 -    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+# _LT_LINKER_BOILERPLATE
-+# ----------------------
-+# Check for linker boilerplate output or warnings with
-+# the simple link test code.
-+AC_DEFUN([_LT_LINKER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+])# _LT_LINKER_BOILERPLATE
  
 -AC_SUBST(INTLTOOL_DESKTOP_RULE)
 -AC_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -3270,11 +3267,38 @@
 -AC_SUBST(INTLTOOL_SCHEMAS_RULE)
 -AC_SUBST(INTLTOOL_THEME_RULE)
 -AC_SUBST(INTLTOOL_SERVICE_RULE)
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_LINKER_BOILERPLATE
  
 -# Use the tools built into the package, not the ones that are installed.
 -AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
 -AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
 -AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
+ 
+-AC_PATH_PROG(INTLTOOL_PERL, perl)
+-if test -z "$INTLTOOL_PERL"; then
+-   AC_MSG_ERROR([perl not found; required for intltool])
+-fi
+-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+-   AC_MSG_ERROR([perl 5.x required for intltool])
+-fi
+-if test "x$2" != "xno-xml"; then
+-   AC_MSG_CHECKING([for XML::Parser])
+-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+-       AC_MSG_RESULT([ok])
+-   else
+-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+-   fi
+-fi
 +# _LT_AC_SYS_LIBPATH_AIX
 +# ----------------------
 +# Links a minimal program and checks the executable
@@ -3293,26 +3317,12 @@
 +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 +])# _LT_AC_SYS_LIBPATH_AIX
  
--AC_PATH_PROG(INTLTOOL_PERL, perl)
--if test -z "$INTLTOOL_PERL"; then
--   AC_MSG_ERROR([perl not found; required for intltool])
--fi
--if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
--   AC_MSG_ERROR([perl 5.x required for intltool])
--fi
--if test "x$2" != "xno-xml"; then
--   AC_MSG_CHECKING([for XML::Parser])
--   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
--       AC_MSG_RESULT([ok])
--   else
--       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
--   fi
--fi
- 
 -AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
 -AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
 -AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
 -AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
+ 
+-IT_PO_SUBDIR([po])
 +# _LT_AC_SHELL_INIT(ARG)
 +# ----------------------
 +AC_DEFUN([_LT_AC_SHELL_INIT],
@@ -3323,8 +3333,6 @@
 +AC_DIVERT_POP
 +])# _LT_AC_SHELL_INIT
  
--IT_PO_SUBDIR([po])
- 
 -dnl The following is very similar to
 -dnl
 -dnl	AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
@@ -3339,6 +3347,8 @@
 -dnl
 -dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
 -dnl a reason for it.
+ 
+-AC_CONFIG_COMMANDS([intltool], [
 +# _LT_AC_PROG_ECHO_BACKSLASH
 +# --------------------------
 +# Add some code to the start of the generated configure script which
@@ -3348,14 +3358,6 @@
 +# Check that we are running under the correct shell.
 +SHELL=${CONFIG_SHELL-/bin/sh}
  
--AC_CONFIG_COMMANDS([intltool], [
-+case X$ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-+  ;;
-+esac
- 
 -for file in intltool-extract intltool-merge intltool-update; do
 -  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
 -      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
@@ -3373,6 +3375,19 @@
 -  chmod ugo+x ${file}
 -  chmod u+w ${file}
 -done
[...4019 lines suppressed...]
  						LDAP_LIBS="-lldap $LDAP_LIBS"
  					fi
-@@ -25743,8 +24915,9 @@ Usually this means the macro was only in
+@@ -25753,8 +24915,9 @@ Usually this means the macro was only in
     { (exit 1); exit 1; }; }
  fi
  
@@ -19275,7 +19529,7 @@
  
  if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-@@ -26215,11 +25388,10 @@ cat >>$CONFIG_STATUS <<_ACEOF
+@@ -26225,11 +25388,10 @@ cat >>$CONFIG_STATUS <<_ACEOF
  #
  
  AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
@@ -19291,7 +19545,7 @@
  
  
  _ACEOF
-@@ -26245,7 +25417,6 @@ do
+@@ -26255,7 +25417,6 @@ do
    "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
    "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
@@ -19299,7 +19553,7 @@
    "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-@@ -26421,7 +25592,6 @@ s, at INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_
+@@ -26431,7 +25592,6 @@ s, at INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_
  s, at INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t
  s, at INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t
  s, at INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t
@@ -19307,7 +19561,7 @@
  s, at INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t
  s, at INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t
  s, at INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t
-@@ -27184,51 +26354,47 @@ done
+@@ -27194,51 +26354,47 @@ done
   ;;
      intltool )
  
@@ -19395,11 +19649,10 @@
    esac
  done
  _ACEOF
-Only in evolution-exchange-2.5.5.1-pristine: configure.autotool-results
-Only in evolution-exchange-2.5.5.1-pristine: configure.rej
-diff --recursive -up evolution-exchange-2.5.5.1-pristine/docs/ietf/Makefile.in evolution-exchange-2.5.5.1-patched/docs/ietf/Makefile.in
---- evolution-exchange-2.5.5.1-pristine/docs/ietf/Makefile.in	2006-01-18 08:36:47.000000000 -0500
-+++ evolution-exchange-2.5.5.1-patched/docs/ietf/Makefile.in	2006-01-25 14:56:29.000000000 -0500
+Only in evolution-exchange-2.5.9.0-pristine: configure.autotool-results
+diff --recursive -up evolution-exchange-2.5.9.0-pristine/docs/ietf/Makefile.in evolution-exchange-2.5.9.0-patched/docs/ietf/Makefile.in
+--- evolution-exchange-2.5.9.0-pristine/docs/ietf/Makefile.in	2006-01-30 08:48:32.000000000 -0500
++++ evolution-exchange-2.5.9.0-patched/docs/ietf/Makefile.in	2006-01-30 22:32:58.000000000 -0500
 @@ -142,7 +142,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
  INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
  INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -19408,10 +19661,10 @@
  INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
  INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
  INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-Only in evolution-exchange-2.5.5.1-pristine/docs/ietf: Makefile.in.autotool-results
-diff --recursive -up evolution-exchange-2.5.5.1-pristine/docs/Makefile.in evolution-exchange-2.5.5.1-patched/docs/Makefile.in
---- evolution-exchange-2.5.5.1-pristine/docs/Makefile.in	2006-01-18 08:36:47.000000000 -0500
-+++ evolution-exchange-2.5.5.1-patched/docs/Makefile.in	2006-01-25 14:56:29.000000000 -0500
+Only in evolution-exchange-2.5.9.0-pristine/docs/ietf: Makefile.in.autotool-results
+diff --recursive -up evolution-exchange-2.5.9.0-pristine/docs/Makefile.in evolution-exchange-2.5.9.0-patched/docs/Makefile.in
+--- evolution-exchange-2.5.9.0-pristine/docs/Makefile.in	2006-01-30 08:48:32.000000000 -0500
++++ evolution-exchange-2.5.9.0-patched/docs/Makefile.in	2006-01-30 22:32:58.000000000 -0500
 @@ -152,7 +152,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
  INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
  INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -19420,10 +19673,10 @@
  INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
  INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
  INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-Only in evolution-exchange-2.5.5.1-pristine/docs: Makefile.in.autotool-results
-diff --recursive -up evolution-exchange-2.5.5.1-pristine/docs/reference/Makefile.in evolution-exchange-2.5.5.1-patched/docs/reference/Makefile.in
---- evolution-exchange-2.5.5.1-pristine/docs/reference/Makefile.in	2006-01-18 08:36:48.000000000 -0500
-+++ evolution-exchange-2.5.5.1-patched/docs/reference/Makefile.in	2006-01-25 14:56:30.000000000 -0500
+Only in evolution-exchange-2.5.9.0-pristine/docs: Makefile.in.autotool-results
+diff --recursive -up evolution-exchange-2.5.9.0-pristine/docs/reference/Makefile.in evolution-exchange-2.5.9.0-patched/docs/reference/Makefile.in
+--- evolution-exchange-2.5.9.0-pristine/docs/reference/Makefile.in	2006-01-30 08:48:32.000000000 -0500
++++ evolution-exchange-2.5.9.0-patched/docs/reference/Makefile.in	2006-01-30 22:32:58.000000000 -0500
 @@ -149,7 +149,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
  INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
  INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -19432,10 +19685,10 @@
  INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
  INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
  INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-Only in evolution-exchange-2.5.5.1-pristine/docs/reference: Makefile.in.autotool-results
-diff --recursive -up evolution-exchange-2.5.5.1-pristine/intltool-extract.in evolution-exchange-2.5.5.1-patched/intltool-extract.in
---- evolution-exchange-2.5.5.1-pristine/intltool-extract.in	2006-01-18 08:36:42.000000000 -0500
-+++ evolution-exchange-2.5.5.1-patched/intltool-extract.in	2005-12-11 05:22:12.000000000 -0500
+Only in evolution-exchange-2.5.9.0-pristine/docs/reference: Makefile.in.autotool-results
+diff --recursive -up evolution-exchange-2.5.9.0-pristine/intltool-extract.in evolution-exchange-2.5.9.0-patched/intltool-extract.in
+--- evolution-exchange-2.5.9.0-pristine/intltool-extract.in	2006-01-30 08:48:22.000000000 -0500
++++ evolution-exchange-2.5.9.0-patched/intltool-extract.in	2005-12-11 05:22:12.000000000 -0500
 @@ -485,12 +485,10 @@ sub parseTree
  sub intltool_tree_comment
  {
@@ -19450,10 +19703,10 @@
      push @$clist, 1 => $data;
  }
  
-Only in evolution-exchange-2.5.5.1-pristine: intltool-extract.in.autotool-results
-diff --recursive -up evolution-exchange-2.5.5.1-pristine/intltool-merge.in evolution-exchange-2.5.5.1-patched/intltool-merge.in
---- evolution-exchange-2.5.5.1-pristine/intltool-merge.in	2006-01-18 08:36:42.000000000 -0500
-+++ evolution-exchange-2.5.5.1-patched/intltool-merge.in	2005-12-11 05:22:12.000000000 -0500
+Only in evolution-exchange-2.5.9.0-pristine: intltool-extract.in.autotool-results
+diff --recursive -up evolution-exchange-2.5.9.0-pristine/intltool-merge.in evolution-exchange-2.5.9.0-patched/intltool-merge.in
+--- evolution-exchange-2.5.9.0-pristine/intltool-merge.in	2006-01-30 08:48:22.000000000 -0500
++++ evolution-exchange-2.5.9.0-patched/intltool-merge.in	2005-12-11 05:22:12.000000000 -0500
 @@ -91,7 +91,7 @@ my $OUTFILE;
  
  my %po_files_by_lang = ();
@@ -19472,10 +19725,10 @@
  
      # seek character encoding aliases in charset.alias (glib)
  
-Only in evolution-exchange-2.5.5.1-pristine: intltool-merge.in.autotool-results
-diff --recursive -up evolution-exchange-2.5.5.1-pristine/intltool-update.in evolution-exchange-2.5.5.1-patched/intltool-update.in
---- evolution-exchange-2.5.5.1-pristine/intltool-update.in	2006-01-18 08:36:42.000000000 -0500
-+++ evolution-exchange-2.5.5.1-patched/intltool-update.in	2005-12-11 05:22:12.000000000 -0500
+Only in evolution-exchange-2.5.9.0-pristine: intltool-merge.in.autotool-results
+diff --recursive -up evolution-exchange-2.5.9.0-pristine/intltool-update.in evolution-exchange-2.5.9.0-patched/intltool-update.in
+--- evolution-exchange-2.5.9.0-pristine/intltool-update.in	2006-01-30 08:48:22.000000000 -0500
++++ evolution-exchange-2.5.9.0-patched/intltool-update.in	2005-12-11 05:22:12.000000000 -0500
 @@ -80,8 +80,7 @@ my $ini_support =
  "directory(?:\\.in)+|".	# http://www.freedesktop.org/Standards/menu-spec
  "soundlist(?:\\.in)+|".	# GNOME specific
@@ -19559,10 +19812,10 @@
  
      $name = $domain if $domain;
  
-Only in evolution-exchange-2.5.5.1-pristine: intltool-update.in.autotool-results
-diff --recursive -up evolution-exchange-2.5.5.1-pristine/mail/Makefile.in evolution-exchange-2.5.5.1-patched/mail/Makefile.in
---- evolution-exchange-2.5.5.1-pristine/mail/Makefile.in	2006-01-18 08:36:48.000000000 -0500
-+++ evolution-exchange-2.5.5.1-patched/mail/Makefile.in	2006-01-25 14:56:30.000000000 -0500
+Only in evolution-exchange-2.5.9.0-pristine: intltool-update.in.autotool-results
+diff --recursive -up evolution-exchange-2.5.9.0-pristine/mail/Makefile.in evolution-exchange-2.5.9.0-patched/mail/Makefile.in
+--- evolution-exchange-2.5.9.0-pristine/mail/Makefile.in	2006-01-30 08:48:32.000000000 -0500
++++ evolution-exchange-2.5.9.0-patched/mail/Makefile.in	2006-01-30 22:32:58.000000000 -0500
 @@ -161,7 +161,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
  INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
  INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -19571,10 +19824,10 @@
  INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
  INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
  INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-Only in evolution-exchange-2.5.5.1-pristine/mail: Makefile.in.autotool-results
-diff --recursive -up evolution-exchange-2.5.5.1-pristine/Makefile.in evolution-exchange-2.5.5.1-patched/Makefile.in
---- evolution-exchange-2.5.5.1-pristine/Makefile.in	2006-01-18 08:36:48.000000000 -0500
-+++ evolution-exchange-2.5.5.1-patched/Makefile.in	2006-01-25 14:56:30.000000000 -0500
+Only in evolution-exchange-2.5.9.0-pristine/mail: Makefile.in.autotool-results
+diff --recursive -up evolution-exchange-2.5.9.0-pristine/Makefile.in evolution-exchange-2.5.9.0-patched/Makefile.in
+--- evolution-exchange-2.5.9.0-pristine/Makefile.in	2006-01-30 08:48:33.000000000 -0500
++++ evolution-exchange-2.5.9.0-patched/Makefile.in	2006-01-30 22:32:58.000000000 -0500
 @@ -167,7 +167,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
  INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
  INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -19583,10 +19836,10 @@
  INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
  INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
  INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-Only in evolution-exchange-2.5.5.1-pristine: Makefile.in.autotool-results
-diff --recursive -up evolution-exchange-2.5.5.1-pristine/po/Makefile.in.in evolution-exchange-2.5.5.1-patched/po/Makefile.in.in
---- evolution-exchange-2.5.5.1-pristine/po/Makefile.in.in	2006-01-18 08:36:42.000000000 -0500
-+++ evolution-exchange-2.5.5.1-patched/po/Makefile.in.in	2005-12-11 05:22:12.000000000 -0500
+Only in evolution-exchange-2.5.9.0-pristine: Makefile.in.autotool-results
+diff --recursive -up evolution-exchange-2.5.9.0-pristine/po/Makefile.in.in evolution-exchange-2.5.9.0-patched/po/Makefile.in.in
+--- evolution-exchange-2.5.9.0-pristine/po/Makefile.in.in	2006-01-30 08:48:22.000000000 -0500
++++ evolution-exchange-2.5.9.0-patched/po/Makefile.in.in	2005-12-11 05:22:12.000000000 -0500
 @@ -39,14 +39,13 @@ gnulocaledir = $(datadir)/locale
  gettextsrcdir = $(datadir)/glib-2.0/gettext/po
  subdir = po
@@ -19757,10 +20010,10 @@
  	       $(SHELL) ./config.status
  
  # Tell versions [3.59,3.63) of GNU make not to export all variables.
-Only in evolution-exchange-2.5.5.1-pristine/po: Makefile.in.in.autotool-results
-diff --recursive -up evolution-exchange-2.5.5.1-pristine/storage/Makefile.in evolution-exchange-2.5.5.1-patched/storage/Makefile.in
---- evolution-exchange-2.5.5.1-pristine/storage/Makefile.in	2006-01-18 08:36:48.000000000 -0500
-+++ evolution-exchange-2.5.5.1-patched/storage/Makefile.in	2006-01-25 14:56:30.000000000 -0500
+Only in evolution-exchange-2.5.9.0-pristine/po: Makefile.in.in.autotool-results
+diff --recursive -up evolution-exchange-2.5.9.0-pristine/storage/Makefile.in evolution-exchange-2.5.9.0-patched/storage/Makefile.in
+--- evolution-exchange-2.5.9.0-pristine/storage/Makefile.in	2006-01-30 08:48:33.000000000 -0500
++++ evolution-exchange-2.5.9.0-patched/storage/Makefile.in	2006-01-30 22:32:58.000000000 -0500
 @@ -204,7 +204,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
  INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
  INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -19769,4 +20022,4 @@
  INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
  INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
  INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-Only in evolution-exchange-2.5.5.1-pristine/storage: Makefile.in.autotool-results
+Only in evolution-exchange-2.5.9.0-pristine/storage: Makefile.in.autotool-results




More information about the fedora-cvs-commits mailing list