GNOME.org
 

Re: [evolution-patches] ChangeLog rollover patch

mailer parts look ok :-)

On Mon, 2003-06-09 at 16:24, Ettore Perazzoli wrote:
> (Hm, do we want ChangeLog entries for this?  Sounds a bit overkill.)
> 
> -- Ettore
> 
> ______________________________________________________________________
> Index: Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/Makefile.am,v
> retrieving revision 1.80
> diff -u -p -r1.80 Makefile.am
> --- Makefile.am	26 Mar 2003 23:02:26 -0000	1.80
> +++ Makefile.am	9 Jun 2003 20:19:19 -0000
> @@ -1,5 +1,6 @@
> -changelogs =			\
> -	ChangeLog
> +changelogs =				\
> +	ChangeLog			\
> +	ChangeLog.pre-1-4
>  
>  pkgconfigdir = $(libdir)/pkgconfig
>  pkgconfig_DATA = 			\
> Index: addressbook/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/addressbook/Makefile.am,v
> retrieving revision 1.21
> diff -u -p -r1.21 Makefile.am
> --- addressbook/Makefile.am	7 Apr 2003 16:25:20 -0000	1.21
> +++ addressbook/Makefile.am	9 Jun 2003 20:19:19 -0000
> @@ -4,3 +4,6 @@ endif
>  
>  SUBDIRS =	\
>  	backend printing gui tools $(CONDUIT_SUBDIR)
> +
> +EXTRA_DIST =	\
> +	ChangeLog.pre-1-4
> Index: art/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/art/Makefile.am,v
> retrieving revision 1.104
> diff -u -p -r1.104 Makefile.am
> --- art/Makefile.am	2 Jun 2003 15:27:12 -0000	1.104
> +++ art/Makefile.am	9 Jun 2003 20:19:20 -0000
> @@ -229,6 +229,7 @@ if DEFAULT_BINARY
>  endif
>  
>  EXTRA_DIST = 				\
> +	ChangeLog.pre-1-4		\
>  	attachment.xpm			\
>  	bell.xpm			\
>  	check-filled.xpm		\
> Index: calendar/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/calendar/Makefile.am,v
> retrieving revision 1.114
> diff -u -p -r1.114 Makefile.am
> --- calendar/Makefile.am	1 Mar 2003 18:04:54 -0000	1.114
> +++ calendar/Makefile.am	9 Jun 2003 20:19:20 -0000
> @@ -6,4 +6,7 @@ endif
>  
>  SUBDIRS = idl cal-util pcs cal-client gui importers $(CONDUIT_DIR)
>  
> -EXTRA_DIST = zones.h
> +EXTRA_DIST =			\
> +	ChangeLog.pre-1-4	\
> +	zones.h
> +
> Index: camel/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/camel/Makefile.am,v
> retrieving revision 1.182
> diff -u -p -r1.182 Makefile.am
> --- camel/Makefile.am	30 Apr 2003 15:35:28 -0000	1.182
> +++ camel/Makefile.am	9 Jun 2003 20:19:21 -0000
> @@ -288,4 +288,5 @@ noinst_HEADERS =				\
>  	camel-html-parser.h
>  
>  EXTRA_DIST =					\
> +	ChangeLog.pre-1-4			\
>  	README
> Index: composer/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/composer/Makefile.am,v
> retrieving revision 1.61
> diff -u -p -r1.61 Makefile.am
> --- composer/Makefile.am	18 Apr 2003 17:44:25 -0000	1.61
> +++ composer/Makefile.am	9 Jun 2003 20:19:21 -0000
> @@ -93,6 +93,7 @@ libcomposer_la_SOURCES = 			\
>  EXTRA_DIST =					\
>  	$(glade_DATA)				\
>  	$(IDLS)					\
> +	ChangeLog.pre-1-4			\
>  	composer-marshal.list			\
>  	bad-icon.xpm
>  
> Index: default_user/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/default_user/Makefile.am,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile.am
> --- default_user/Makefile.am	21 Apr 2003 13:21:33 -0000	1.20
> +++ default_user/Makefile.am	9 Jun 2003 20:19:21 -0000
> @@ -3,7 +3,9 @@ SUBDIRS = local
>  defaultdir = $(privdatadir)/default_user
>  default_DATA = addressbook-sources.xml searches.xml vfolders.xml
>  
> -EXTRA_DIST = $(default_DATA)
> +EXTRA_DIST =			\
> +	$(default_DATA)		\
> +	ChangeLog.pre-1-4
>  
>  install-data-hook:
>  	-mkdir $(DESTDIR)$(defaultdir)/views
> Index: doc/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/doc/Makefile.am,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile.am
> --- doc/Makefile.am	16 Aug 2001 17:28:29 -0000	1.5
> +++ doc/Makefile.am	9 Jun 2003 20:19:21 -0000
> @@ -1 +1,3 @@
>  SUBDIRS = devel
> +
> +EXTRA_DIST = ChangeLog.pre-1-4
> Index: doc/devel/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/doc/devel/Makefile.am,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile.am
> --- doc/devel/Makefile.am	22 Jan 2003 20:09:50 -0000	1.15
> +++ doc/devel/Makefile.am	9 Jun 2003 20:19:21 -0000
> @@ -94,7 +94,8 @@ EXTRA_DIST =				\
>  	$(extra_files)		  	\
>  	$(installed_content_files)	\
>  	$(HTML_IMAGES)			\
> -	$(DOC_MAIN_SGML_FILE)
> +	$(DOC_MAIN_SGML_FILE)		\
> +	ChangeLog.pre-1-4
>  
>  #	$(DOC_MODULE).types	     \
>  #	$(DOC_MODULE)-sections.txt      \
> Index: e-util/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/e-util/Makefile.am,v
> retrieving revision 1.91
> diff -u -p -r1.91 Makefile.am
> --- e-util/Makefile.am	24 Mar 2003 13:25:43 -0000	1.91
> +++ e-util/Makefile.am	9 Jun 2003 20:19:22 -0000
> @@ -136,7 +136,10 @@ libeconduit_la_SOURCES = $(pilot_compile
>  libeconduit_static_la_SOURCES = $(libeconduit_la_SOURCES)
>  libeconduit_static_la_LDFLAGS = -all-static
>  
> -EXTRA_DIST = $(pilot_sources) e-util-marshal.list
> +EXTRA_DIST =				\
> +	$(pilot_sources)		\
> +	ChangeLog.pre-1-4		\
> +	e-util-marshal.list
>  
>  edb3include_HEADERS =			\
>  	e-db3-utils.h			\
> Index: filter/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/filter/Makefile.am,v
> retrieving revision 1.44
> diff -u -p -r1.44 Makefile.am
> --- filter/Makefile.am	5 Feb 2003 22:37:03 -0000	1.44
> +++ filter/Makefile.am	9 Jun 2003 20:19:22 -0000
> @@ -69,8 +69,13 @@ libfilter_la_SOURCES =				\
>  
>  libfilter_la_DEPENDENCIES = libfilter-i18n.h
>  
> -EXTRA_DIST = filtertypes.xml vfoldertypes.xml \
> -	$(glade_DATA) libfilter-i18n.h filter-marshal.list
> +EXTRA_DIST =					\
> +	$(glade_DATA)				\
> +	ChangeLog.pre-1-4			\
> +	filter-marshal.list			\
> +	filtertypes.xml				\
> +	libfilter-i18n.h			\
> +	vfoldertypes.xml
>  
>  # basic rules.
>  filterdir = $(privdatadir)
> Index: help/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/help/Makefile.am,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile.am
> --- help/Makefile.am	27 Mar 2003 16:39:05 -0000	1.8
> +++ help/Makefile.am	9 Jun 2003 20:19:22 -0000
> @@ -1,3 +1,6 @@
>  SUBDIRS = C
>  
> -EXTRA_DIST = xmldocs.make omf.make
> +EXTRA_DIST =			\
> +	ChangeLog.pre-1-4	\
> +	xmldocs.make		\
> +	omf.make
> Index: help/no/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/help/no/Makefile.am,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile.am
> --- help/no/Makefile.am	16 Aug 2001 14:44:56 -0000	1.2
> +++ help/no/Makefile.am	9 Jun 2003 20:19:22 -0000
> @@ -44,6 +44,8 @@ sgml_ents = \
>  	usage-mainwindow.sgml	\
>  	usage-print.sgml	\
>  	usage-sync.sgml
> -	
> +
>  include $(top_srcdir)/help/sgmldocs.make
>  dist-hook: app-dist-hook
> +
> +EXTRA_DIST = ChangeLog.pre-1-4
> \ No newline at end of file
> Index: importers/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/importers/Makefile.am,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile.am
> --- importers/Makefile.am	21 Feb 2003 21:24:26 -0000	1.18
> +++ importers/Makefile.am	9 Jun 2003 20:19:22 -0000
> @@ -70,6 +70,9 @@ oaf_in_files = GNOME_Evolution_Netscape_
>  
>  oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
>  
> -EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
> +EXTRA_DIST =					\
> +	$(oaf_in_files)				\
> +	$(oaf_DATA)				\
> +	ChangeLog.pre-1-4
>  
>  @XML_I18N_MERGE_OAF_RULE@
> Index: libwombat/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/libwombat/Makefile.am,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile.am
> --- libwombat/Makefile.am	5 Feb 2003 22:37:43 -0000	1.10
> +++ libwombat/Makefile.am	9 Jun 2003 20:19:22 -0000
> @@ -33,3 +33,5 @@ noinst_LTLIBRARIES = libwombat-static.la
>  
>  libwombat_static_la_SOURCES = $(libwombat_la_SOURCES)
>  libwombat_static_la_LDFLAGS = --all-static
> +
> +EXTRA_DIST = ChangeLog.pre-1-4
> \ No newline at end of file
> Index: mail/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/Makefile.am,v
> retrieving revision 1.210
> diff -u -p -r1.210 Makefile.am
> --- mail/Makefile.am	2 Jun 2003 18:14:37 -0000	1.210
> +++ mail/Makefile.am	9 Jun 2003 20:19:23 -0000
> @@ -192,6 +192,7 @@ $(EVOLUTION_MAIL_CORBA_GENERATED_H): Mai
>  $(EVOLUTION_MAIL_CORBA_GENERATED_C): $(EVOLUTION_MAIL_CORBA_GENERATED_H)
>  
>  EXTRA_DIST = 				\
> +	ChangeLog.pre-1-4		\
>  	Mailer.idl 			\
>  	$(SPELL_IDL)			\
>  	$(glade_DATA)			\
> Index: my-evolution/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/my-evolution/Makefile.am,v
> retrieving revision 1.45
> diff -u -p -r1.45 Makefile.am
> --- my-evolution/Makefile.am	18 Apr 2003 17:44:28 -0000	1.45
> +++ my-evolution/Makefile.am	9 Jun 2003 20:19:23 -0000
> @@ -117,6 +117,7 @@ EXTRA_DIST = 				\
>  	$(server_DATA)			\
>  	$(Location_DATA)		\
>  	$(glade_DATA)			\
> +	ChangeLog.pre-1-4		\
>  	Locations.h			\
>  	Location-translation-script	\
>  	check-empty.xpm			\
> Index: shell/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/shell/Makefile.am,v
> retrieving revision 1.154
> diff -u -p -r1.154 Makefile.am
> --- shell/Makefile.am	19 May 2003 19:41:05 -0000	1.154
> +++ shell/Makefile.am	9 Jun 2003 20:19:23 -0000
> @@ -359,6 +359,7 @@ EXTRA_DIST = 					\
>  	$(etspec_DATA)				\
>  	$(schema_DATA)				\
>  	$(icons)				\
> +	ChangeLog.pre-1-4			\
>  	GNOME_Evolution_TestComponent.server	\
>  	e-shell-marshal.list			\
>  	evolution-nognome.in
> Index: ui/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/ui/Makefile.am,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile.am
> --- ui/Makefile.am	7 Apr 2003 23:19:19 -0000	1.22
> +++ ui/Makefile.am	9 Jun 2003 20:19:23 -0000
> @@ -21,4 +21,6 @@ XML_FILES =					\
>  
>  evolutionui_DATA = $(XML_FILES)
>  
> -EXTRA_DIST = $(XML_FILES)
> +EXTRA_DIST =					\
> +	$(XML_FILES)				\
> +	ChangeLog.pre-1-4
> Index: views/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/views/Makefile.am,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile.am
> --- views/Makefile.am	19 Jun 2001 17:22:11 -0000	1.3
> +++ views/Makefile.am	9 Jun 2003 20:19:23 -0000
> @@ -1 +1,3 @@
>  SUBDIRS = addressbook mail tasks calendar
> +
> +EXTRA_DIST = ChangeLog.pre-1-4
> Index: widgets/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/widgets/Makefile.am,v
> retrieving revision 1.43
> diff -u -p -r1.43 Makefile.am
> --- widgets/Makefile.am	19 Sep 2001 04:32:35 -0000	1.43
> +++ widgets/Makefile.am	9 Jun 2003 20:19:23 -0000
> @@ -3,3 +3,6 @@ SUBDIRS =			\
>  	e-timezone-dialog	\
>  	misc			\
>  	menus
> +
> +EXTRA_DIST =			\
> +	ChangeLog.pre-1-4
> Index: widgets/misc/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/widgets/misc/Makefile.am,v
> retrieving revision 1.34
> diff -u -p -r1.34 Makefile.am
> --- widgets/misc/Makefile.am	25 Feb 2003 07:03:46 -0000	1.34
> +++ widgets/misc/Makefile.am	9 Jun 2003 20:19:23 -0000
> @@ -132,4 +132,6 @@ test_title_bar_LDADD = 		\
>  BUILT_SOURCES = $(MARSHAL_GENERATED)
>  CLEANFILES    = $(BUILT_SOURCES)
>  
> -EXTRA_DIST = e-util-marshal.list
> +EXTRA_DIST =			\
> +	e-util-marshal.list	\
> +	ChangeLog.pre-1-4
> Index: wombat/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/wombat/Makefile.am,v
> retrieving revision 1.64
> diff -u -p -r1.64 Makefile.am
> --- wombat/Makefile.am	28 Mar 2003 21:41:44 -0000	1.64
> +++ wombat/Makefile.am	9 Jun 2003 20:19:23 -0000
> @@ -86,6 +86,7 @@ idl_DATA = $(IDLS)
>  EXTRA_DIST = $(server_DATA)				\
>  	$(server_in_files)				\
>  	$(idl_DATA)					\
> +	ChangeLog.pre-1-4				\
>  	GNOME_Evolution_WombatLDAP.server.in.in		\
>  	GNOME_Evolution_WombatNOLDAP.server.in.in
>  
-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]