- moved from evolution2

Changed files:
    evolution-am.patch -> 1.3
    evolution-configure_in.patch -> 1.1
    evolution-desktop.patch -> 1.1

diff --git a/evolution-am.patch b/evolution-am.patch
index 2965ce78922dad1803f489509acada0d32b600da..97731f5ea460e5ba68bc4d45b11533954de18cee 100644 (file)
--- a/evolution-am.patch
+++ b/evolution-am.patch
@@ -1,135 +1,17 @@
-diff -Nur evolution-1.2.0.orig/camel/Makefile.am evolution-1.2.0.chng/camel/Makefile.am
---- evolution-1.2.0.orig/camel/Makefile.am     Tue Sep  3 13:57:52 2002
-+++ evolution-1.2.0.chng/camel/Makefile.am     Thu Nov 14 14:20:52 2002
-@@ -231,9 +231,10 @@
+diff -urN aaa/evolution-1.3.0.99/camel/Makefile.am evolution2-1.3.0.99/camel/Makefile.am
+--- aaa/evolution-1.3.0.99/camel/Makefile.am   Fri Feb 14 13:01:36 2003
++++ evolution2-1.3.0.99/camel/Makefile.am      Sat Feb 15 22:11:33 2003
+@@ -234,12 +234,12 @@
  camel_lock_helper_SOURCES =                   \
        camel-lock-helper.c                     \
        camel-lock-helper.h                     \
 -      camel-lock.c                            \
        camel-lock.h
  
-+camel_lock_helper_LDADD = camel-lock.o
-+
- camel_index_control_SOURCES =                 \
-       camel-index-control.c
- 
-diff -Nur evolution-1.2.0.orig/doc/devel/Makefile.am evolution-1.2.0.chng/doc/devel/Makefile.am
---- evolution-1.2.0.orig/doc/devel/Makefile.am Tue Jul 31 08:45:42 2001
-+++ evolution-1.2.0.chng/doc/devel/Makefile.am Thu Nov 14 14:16:21 2002
-@@ -144,7 +144,7 @@
-       fi)
- 
- #       echo '-- Installing $(srcdir)/html/index.sgml' ; \
--#       $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-+#       $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
- 
- #
- # Require gtk-doc when making dist
-diff -Nur evolution-1.2.0.orig/my-evolution/Makefile.am evolution-1.2.0.chng/my-evolution/Makefile.am
---- evolution-1.2.0.orig/my-evolution/Makefile.am      Fri Sep 13 16:53:20 2002
-+++ evolution-1.2.0.chng/my-evolution/Makefile.am      Thu Nov 14 20:35:57 2002
-@@ -24,36 +24,41 @@
- $(MAIL_GENERATED): $(IDLS)
-       $(ORBIT_IDL) -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` $(top_srcdir)/mail/Mailer.idl
- 
--summary_sources =                             \
--      $(MAIL_GENERATED)                       \
-+summary_sources_c =                           \
-+      Mailer-common.c                         \
-+      Mailer-skels.c                          \
-+      Mailer-stubs.c                          \
-       component-factory.c                     \
--      component-factory.h                     \
-       e-cell-tri.c                            \
--      e-cell-tri.h                            \
-       e-summary.c                             \
--      e-summary.h                             \
-       e-summary-calendar.c                    \
--      e-summary-calendar.h                    \
-       e-summary-factory.c                     \
--      e-summary-factory.h                     \
-       e-summary-mail.c                        \
--      e-summary-mail.h                        \
-       e-summary-offline-handler.c             \
--      e-summary-offline-handler.h             \
-       e-summary-preferences.c                 \
--      e-summary-preferences.h                 \
-       e-summary-rdf.c                         \
--      e-summary-rdf.h                         \
-       e-summary-shown.c                       \
--      e-summary-shown.h                       \
-       e-summary-table.c                       \
--      e-summary-table.h                       \
-       e-summary-tasks.c                       \
-+      e-summary-weather.c                     \
-+      metar.c
-+
-+summary_sources_h =                           \
-+      Mailer.h                                \
-+      component-factory.h                     \
-+      e-cell-tri.h                            \
-+      e-summary.h                             \
-+      e-summary-calendar.h                    \
-+      e-summary-factory.h                     \
-+      e-summary-mail.h                        \
-+      e-summary-offline-handler.h             \
-+      e-summary-preferences.h                 \
-+      e-summary-rdf.h                         \
-+      e-summary-shown.h                       \
-+      e-summary-table.h                       \
-       e-summary-tasks.h                       \
-       e-summary-type.h                        \
--      e-summary-weather.c                     \
-       e-summary-weather.h                     \
--      metar.c                                 \
-       metar.h                                 \
-       my-evolution-html.h                     \
-       weather.h
-@@ -73,14 +78,22 @@
-       $(top_builddir)/libwombat/libwombat.la                          \
-       $(EVOLUTION_EXECUTIVE_SUMMARY_LIBS)
- 
-+noinst_LIBRARIES = libevoltmp.a
-+
-+libevoltmp_a_SOURCES =                \
-+      $(summary_sources_c)    \
-+      $(summary_sources_h)
-+
- if ENABLE_SHLIB_COMPONENTS
- 
- lib_LTLIBRARIES = libevolution-executive-summary.la
+ # NOTE: This needs to be cleaned up, it shouldn't link with all this crap,
+ # because it might be setuid.
+ camel_lock_helper_LDADD =                     \
++      camel-lock.o                    \
+       $(libcamel_la_LIBADD)
  
- libevolution_executive_summary_la_SOURCES = \
--      $(summary_sources)
-+      $(summary_sources_h)
-+
- 
--libevolution_executive_summary_la_LIBADD = \
-+libevolution_executive_summary_la_LIBADD =    \
-+      libevoltmp.a                            \
-       $(summary_libs)
- 
- else
-@@ -88,10 +101,11 @@
- bin_PROGRAMS = evolution-executive-summary
- 
- evolution_executive_summary_SOURCES =         \
--      $(summary_sources)                      \
-+      $(summary_sources_h)                    \
-       $(summary_exe_sources)
- 
- evolution_executive_summary_LDADD =           \
-+      libevoltmp.a                            \
-       $(summary_libs)
- 
- endif
-@@ -112,7 +126,8 @@
- @XML_I18N_MERGE_OAF_RULE@
- 
- EXTRA_DIST =                          \
--      $(summary_sources)              \
-+      $(summary_sources_c)            \
-+      $(summary_sources_h)            \
-       $(summary_exe_sources)          \
-       $(oaf_files)                    \
-       $(oaf_in_files)                 \
+ camel_index_control_SOURCES =                 \

diff --git a/evolution-configure_in.patch b/evolution-configure_in.patch
new file mode 100644 (file)
index 0000000..6250be4
--- /dev/null
+++ b/evolution-configure_in.patch
@@ -0,0 +1,12 @@
+diff -urN aaa/evolution-1.3.0.99/configure.in evolution2-1.3.0.99/configure.in
+--- aaa/evolution-1.3.0.99/configure.in        Fri Feb 14 13:01:40 2003
++++ evolution2-1.3.0.99/configure.in   Sat Feb 15 20:54:20 2003
+@@ -1377,6 +1377,8 @@
+ evolution-addressbook.pc
+ evolution-calendar.pc
+ camel.pc
++data/evolution.desktop
++data/evolution.keys
+ ])
+ 
+ if test "x$with_sub_version" != "x"; then

diff --git a/evolution-desktop.patch b/evolution-desktop.patch
new file mode 100644 (file)
index 0000000..9fe8489
--- /dev/null
+++ b/evolution-desktop.patch
@@ -0,0 +1,20 @@
+diff -urN aaa/evolution2-1.3.2.99/data/evolution.desktop.in evolution2-1.3.2.99/data/evolution.desktop.in
+--- aaa/evolution2-1.3.2.99/data/evolution.desktop.in  Sat Mar 29 23:49:09 2003
++++ evolution2-1.3.2.99/data/evolution.desktop.in      Fri Apr 18 23:29:14 2003
+@@ -1,6 +1,8 @@
+ [Desktop Entry]
+-_Name=Ximian Evolution
+-_Comment=The Evolution groupware suite
++Name=Ximian Evolution
++Name[pl]=Ximian Evolution
++Comment=The Evolution groupware suite
++Comment[pl]=Zestaw programów do pracy grupowej Evolution
+ Exec=evolution-1.3
+ Icon=evolution-1.3.png
+ Terminal=false
+@@ -10,3 +12,5 @@
+ X-GNOME-Bugzilla-Bugzilla=Ximian
+ X-GNOME-Bugzilla-Product=evolution
+ X-GNOME-Bugzilla-OtherBinaries=evolution-wombat;evolution-exchange-storage;
++
++# vi: encoding=utf-8