rpms/evolution-connector/devel .cvsignore, 1.24, 1.25 evolution-connector.spec, 1.46, 1.47 regenerate-patch.sh, 1.12, 1.13 sources, 1.24, 1.25 ximian-connector-2.1.4-generated-autotool.patch, 1.11, 1.12
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Jan 28 00:37:33 UTC 2006
- Previous message (by thread): rpms/kernel-xen/devel .cvsignore, 1.9, 1.10 kernel-xen.spec, 1.32, 1.33 sources, 1.9, 1.10
- Next message (by thread): rpms/libsemanage/devel .cvsignore, 1.47, 1.48 libsemanage.spec, 1.67, 1.68 sources, 1.49, 1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dmalcolm
Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1259
Modified Files:
.cvsignore evolution-connector.spec regenerate-patch.sh
sources ximian-connector-2.1.4-generated-autotool.patch
Log Message:
* Wed Jan 25 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.5.1-1
- 2.5.5.1
- regenerate patch 200
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 4 Jan 2006 18:07:35 -0000 1.24
+++ .cvsignore 28 Jan 2006 00:37:28 -0000 1.25
@@ -1 +1 @@
-evolution-exchange-2.5.4.tar.bz2
+evolution-exchange-2.5.5.1.tar.bz2
Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- evolution-connector.spec 4 Jan 2006 18:07:35 -0000 1.46
+++ evolution-connector.spec 28 Jan 2006 00:37:29 -0000 1.47
@@ -6,7 +6,7 @@
%define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null)
Name: evolution-connector
-Version: 2.5.4
+Version: 2.5.5.1
Release: 1
License: GPL
Group: Applications/Productivity
@@ -94,6 +94,10 @@
%{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
%changelog
+* Wed Jan 25 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.5.1-1
+- 2.5.5.1
+- regenerate patch 200
+
* Wed Jan 4 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.4-1
- 2.5.4
Index: regenerate-patch.sh
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/regenerate-patch.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- regenerate-patch.sh 20 Dec 2005 04:43:55 -0000 1.12
+++ regenerate-patch.sh 28 Jan 2006 00:37:29 -0000 1.13
@@ -1,5 +1,5 @@
#!/bin/sh
-BASE_NAME=evolution-exchange-2.5.3
+BASE_NAME=evolution-exchange-2.5.5.1
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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 4 Jan 2006 18:07:35 -0000 1.24
+++ sources 28 Jan 2006 00:37:29 -0000 1.25
@@ -1 +1 @@
-e96018d6edbab97a45a97578a6d210ef evolution-exchange-2.5.4.tar.bz2
+36a8dbcfc2b69c1899afe22480f0e760 evolution-exchange-2.5.5.1.tar.bz2
ximian-connector-2.1.4-generated-autotool.patch:
evolution-exchange-2.5.5.1-patched/Makefile.in | 1
evolution-exchange-2.5.5.1-patched/acinclude.m4 | 22
evolution-exchange-2.5.5.1-patched/aclocal.m4 |10009 +++++-----
evolution-exchange-2.5.5.1-patched/addressbook/Makefile.in | 1
evolution-exchange-2.5.5.1-patched/autom4te.cache |only
evolution-exchange-2.5.5.1-patched/calendar/Makefile.in | 1
evolution-exchange-2.5.5.1-patched/camel/Makefile.in | 1
evolution-exchange-2.5.5.1-patched/configure | 5810 ++---
evolution-exchange-2.5.5.1-patched/docs/Makefile.in | 1
evolution-exchange-2.5.5.1-patched/docs/ietf/Makefile.in | 1
evolution-exchange-2.5.5.1-patched/docs/reference/Makefile.in | 1
evolution-exchange-2.5.5.1-patched/intltool-extract.in | 4
evolution-exchange-2.5.5.1-patched/intltool-merge.in | 4
evolution-exchange-2.5.5.1-patched/intltool-update.in | 26
evolution-exchange-2.5.5.1-patched/mail/Makefile.in | 1
evolution-exchange-2.5.5.1-patched/po/Makefile.in.in | 83
evolution-exchange-2.5.5.1-patched/storage/Makefile.in | 1
evolution-exchange-2.5.5.1-pristine/Makefile.in.autotool-results |only
evolution-exchange-2.5.5.1-pristine/acinclude.m4.autotool-results |only
evolution-exchange-2.5.5.1-pristine/aclocal.m4.autotool-results |only
evolution-exchange-2.5.5.1-pristine/addressbook/Makefile.in.autotool-results |only
evolution-exchange-2.5.5.1-pristine/calendar/Makefile.in.autotool-results |only
evolution-exchange-2.5.5.1-pristine/camel/Makefile.in.autotool-results |only
evolution-exchange-2.5.5.1-pristine/configure.autotool-results |only
evolution-exchange-2.5.5.1-pristine/configure.rej |only
evolution-exchange-2.5.5.1-pristine/docs/Makefile.in.autotool-results |only
evolution-exchange-2.5.5.1-pristine/docs/ietf/Makefile.in.autotool-results |only
evolution-exchange-2.5.5.1-pristine/docs/reference/Makefile.in.autotool-results |only
evolution-exchange-2.5.5.1-pristine/intltool-extract.in.autotool-results |only
evolution-exchange-2.5.5.1-pristine/intltool-merge.in.autotool-results |only
evolution-exchange-2.5.5.1-pristine/intltool-update.in.autotool-results |only
evolution-exchange-2.5.5.1-pristine/mail/Makefile.in.autotool-results |only
evolution-exchange-2.5.5.1-pristine/po/Makefile.in.in.autotool-results |only
evolution-exchange-2.5.5.1-pristine/storage/Makefile.in.autotool-results |only
34 files changed, 7699 insertions(+), 8268 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.11 -r 1.12 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ximian-connector-2.1.4-generated-autotool.patch 20 Dec 2005 04:43:55 -0000 1.11
+++ ximian-connector-2.1.4-generated-autotool.patch 28 Jan 2006 00:37:29 -0000 1.12
@@ -1,6 +1,6 @@
-diff --recursive -up evolution-exchange-2.5.3-pristine/acinclude.m4 evolution-exchange-2.5.3-patched/acinclude.m4
---- evolution-exchange-2.5.3-pristine/acinclude.m4 2004-08-13 14:16:45.000000000 -0400
-+++ evolution-exchange-2.5.3-patched/acinclude.m4 2005-12-19 22:24:50.000000000 -0500
+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
@@ -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,10 +54,11 @@
else
LDAP_LIBS="-lldap $LDAP_LIBS"
fi],
-diff --recursive -up evolution-exchange-2.5.3-pristine/aclocal.m4 evolution-exchange-2.5.3-patched/aclocal.m4
---- evolution-exchange-2.5.3-pristine/aclocal.m4 2005-12-12 11:31:33.000000000 -0500
-+++ evolution-exchange-2.5.3-patched/aclocal.m4 2005-12-19 22:25:33.000000000 -0500
-@@ -11,3947 +11,3068 @@
+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 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@@ -2482,7 +2483,7 @@
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
-+# serial 47 AC_PROG_LIBTOOL
++# serial 48 AC_PROG_LIBTOOL
-dnl
-dnl We go to great lengths to make sure that aclocal won't
@@ -2972,6 +2973,7 @@
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
@@ -3002,10 +3004,10 @@
+if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
-+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ ;;
+ *)
-+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ ;;
+ esac
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
@@ -3100,8 +3102,6 @@
- WARN_CFLAGS="$warning_flags $complCFLAGS"
- AC_SUBST(WARN_CFLAGS)
-])
--
--dnl For C++, do basically the same thing.
+AC_ARG_WITH([pic],
+ [AC_HELP_STRING([--with-pic],
+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
@@ -3109,17 +3109,19 @@
+ [pic_mode=default])
+test -z "$pic_mode" && pic_mode=default
--AC_DEFUN([GNOME_CXX_WARNINGS],[
-- AC_ARG_ENABLE(cxx-warnings,
-- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-- [Turn on compiler warnings.]),,
-- [enable_cxx_warnings="m4_default([$1],[minimum])"])
+-dnl For C++, do basically the same thing.
+# Use C for the default configuration in the libtool script
+tagname=
+AC_LIBTOOL_LANG_C_CONFIG
+_LT_AC_TAGCONFIG
+])# AC_LIBTOOL_SETUP
+-AC_DEFUN([GNOME_CXX_WARNINGS],[
+- AC_ARG_ENABLE(cxx-warnings,
+- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
+- [Turn on compiler warnings.]),,
+- [enable_cxx_warnings="m4_default([$1],[minimum])"])
+
- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
- warnCXXFLAGS=
- if test "x$GCC" != xyes; then
@@ -3131,6 +3133,10 @@
- *[\ \ ]-Wall[\ \ ]*) ;;
- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
- esac
++# _LT_AC_SYS_COMPILER
++# -------------------
++AC_DEFUN([_LT_AC_SYS_COMPILER],
++[AC_REQUIRE([AC_PROG_CC])dnl
- ## -W is not all that useful. And it cannot be controlled
- ## with individual -Wno-xxx flags, unlike -Wall
@@ -3140,17 +3146,15 @@
- fi
- fi
- AC_MSG_RESULT($warnCXXFLAGS)
-+# _LT_AC_SYS_COMPILER
-+# -------------------
-+AC_DEFUN([_LT_AC_SYS_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
- AC_ARG_ENABLE(iso-cxx,
- AC_HELP_STRING([--enable-iso-cxx],
- [Try to warn if code is not ISO C++ ]),,
- [enable_iso_cxx=no])
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
- complCXXFLAGS=
@@ -3197,15 +3201,6 @@
-
-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,11 +3208,20 @@
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$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 $< [$]@'
@@ -3236,6 +3240,17 @@
- 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)
@@ -3255,38 +3270,11 @@
-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' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
[...13806 lines suppressed...]
fi
-@@ -25735,8 +25990,9 @@ Usually this means the macro was only in
+@@ -25743,8 +24915,9 @@ Usually this means the macro was only in
{ (exit 1); exit 1; }; }
fi
@@ -12633,7 +19275,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.
-@@ -26207,11 +26463,10 @@ cat >>$CONFIG_STATUS <<_ACEOF
+@@ -26215,11 +25388,10 @@ cat >>$CONFIG_STATUS <<_ACEOF
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
@@ -12649,7 +19291,7 @@
_ACEOF
-@@ -26236,7 +26491,6 @@ do
+@@ -26245,7 +25417,6 @@ do
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
@@ -12657,7 +19299,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;}
-@@ -26411,7 +26665,6 @@ s, at INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_
+@@ -26421,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
@@ -12665,7 +19307,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
-@@ -27174,51 +27427,47 @@ done
+@@ -27184,51 +26354,47 @@ done
;;
intltool )
@@ -12753,10 +19395,12 @@
esac
done
_ACEOF
-diff --recursive -up evolution-exchange-2.5.3-pristine/docs/ietf/Makefile.in evolution-exchange-2.5.3-patched/docs/ietf/Makefile.in
---- evolution-exchange-2.5.3-pristine/docs/ietf/Makefile.in 2005-12-12 11:31:42.000000000 -0500
-+++ evolution-exchange-2.5.3-patched/docs/ietf/Makefile.in 2005-12-19 22:26:22.000000000 -0500
-@@ -141,7 +141,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
+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
+@@ -142,7 +142,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
@@ -12764,10 +19408,11 @@
INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-diff --recursive -up evolution-exchange-2.5.3-pristine/docs/Makefile.in evolution-exchange-2.5.3-patched/docs/Makefile.in
---- evolution-exchange-2.5.3-pristine/docs/Makefile.in 2005-12-12 11:31:42.000000000 -0500
-+++ evolution-exchange-2.5.3-patched/docs/Makefile.in 2005-12-19 22:26:19.000000000 -0500
-@@ -151,7 +151,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_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
+@@ -152,7 +152,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
@@ -12775,10 +19420,11 @@
INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-diff --recursive -up evolution-exchange-2.5.3-pristine/docs/reference/Makefile.in evolution-exchange-2.5.3-patched/docs/reference/Makefile.in
---- evolution-exchange-2.5.3-pristine/docs/reference/Makefile.in 2005-12-12 11:31:42.000000000 -0500
-+++ evolution-exchange-2.5.3-patched/docs/reference/Makefile.in 2005-12-19 22:26:24.000000000 -0500
-@@ -148,7 +148,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_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
+@@ -149,7 +149,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
@@ -12786,9 +19432,10 @@
INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-diff --recursive -up evolution-exchange-2.5.3-pristine/intltool-extract.in evolution-exchange-2.5.3-patched/intltool-extract.in
---- evolution-exchange-2.5.3-pristine/intltool-extract.in 2005-12-12 11:31:28.000000000 -0500
-+++ evolution-exchange-2.5.3-patched/intltool-extract.in 2005-08-04 14:47:54.000000000 -0400
+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
@@ -485,12 +485,10 @@ sub parseTree
sub intltool_tree_comment
{
@@ -12803,9 +19450,10 @@
push @$clist, 1 => $data;
}
-diff --recursive -up evolution-exchange-2.5.3-pristine/intltool-merge.in evolution-exchange-2.5.3-patched/intltool-merge.in
---- evolution-exchange-2.5.3-pristine/intltool-merge.in 2005-12-12 11:31:28.000000000 -0500
-+++ evolution-exchange-2.5.3-patched/intltool-merge.in 2005-08-04 14:47:54.000000000 -0400
+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
@@ -91,7 +91,7 @@ my $OUTFILE;
my %po_files_by_lang = ();
@@ -12824,9 +19472,10 @@
# seek character encoding aliases in charset.alias (glib)
-diff --recursive -up evolution-exchange-2.5.3-pristine/intltool-update.in evolution-exchange-2.5.3-patched/intltool-update.in
---- evolution-exchange-2.5.3-pristine/intltool-update.in 2005-12-12 11:31:28.000000000 -0500
-+++ evolution-exchange-2.5.3-patched/intltool-update.in 2005-08-04 14:47:54.000000000 -0400
+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
@@ -80,8 +80,7 @@ my $ini_support =
"directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec
"soundlist(?:\\.in)+|". # GNOME specific
@@ -12910,10 +19559,11 @@
$name = $domain if $domain;
-diff --recursive -up evolution-exchange-2.5.3-pristine/mail/Makefile.in evolution-exchange-2.5.3-patched/mail/Makefile.in
---- evolution-exchange-2.5.3-pristine/mail/Makefile.in 2005-12-12 11:31:42.000000000 -0500
-+++ evolution-exchange-2.5.3-patched/mail/Makefile.in 2005-12-19 22:26:27.000000000 -0500
-@@ -160,7 +160,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
+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
+@@ -161,7 +161,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
@@ -12921,10 +19571,11 @@
INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-diff --recursive -up evolution-exchange-2.5.3-pristine/Makefile.in evolution-exchange-2.5.3-patched/Makefile.in
---- evolution-exchange-2.5.3-pristine/Makefile.in 2005-12-12 11:31:43.000000000 -0500
-+++ evolution-exchange-2.5.3-patched/Makefile.in 2005-12-19 22:26:35.000000000 -0500
-@@ -166,7 +166,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_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
+@@ -167,7 +167,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
@@ -12932,9 +19583,10 @@
INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-diff --recursive -up evolution-exchange-2.5.3-pristine/po/Makefile.in.in evolution-exchange-2.5.3-patched/po/Makefile.in.in
---- evolution-exchange-2.5.3-pristine/po/Makefile.in.in 2005-12-12 11:31:28.000000000 -0500
-+++ evolution-exchange-2.5.3-patched/po/Makefile.in.in 2005-08-04 14:47:54.000000000 -0400
+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
@@ -39,14 +39,13 @@ gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po
@@ -13105,10 +19757,11 @@
$(SHELL) ./config.status
# Tell versions [3.59,3.63) of GNU make not to export all variables.
-diff --recursive -up evolution-exchange-2.5.3-pristine/storage/Makefile.in evolution-exchange-2.5.3-patched/storage/Makefile.in
---- evolution-exchange-2.5.3-pristine/storage/Makefile.in 2005-12-12 11:31:43.000000000 -0500
-+++ evolution-exchange-2.5.3-patched/storage/Makefile.in 2005-12-19 22:26:33.000000000 -0500
-@@ -203,7 +203,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
+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
+@@ -204,7 +204,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
@@ -13116,3 +19769,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
- Previous message (by thread): rpms/kernel-xen/devel .cvsignore, 1.9, 1.10 kernel-xen.spec, 1.32, 1.33 sources, 1.9, 1.10
- Next message (by thread): rpms/libsemanage/devel .cvsignore, 1.47, 1.48 libsemanage.spec, 1.67, 1.68 sources, 1.49, 1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list