diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2007-05-13 08:24:55 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-05-13 08:24:55 +0800 |
| commit | 62fd2f2989a1b9843d84109580d3bd9746ff4c75 (patch) | |
| tree | 34f791fc4c6d390879da400eb6e85070919ef673 | |
| parent | e059dafbdf855fc6f522512fe48051e050b68109 (diff) | |
| download | gsoc2013-evolution-62fd2f2989a1b9843d84109580d3bd9746ff4c75.tar gsoc2013-evolution-62fd2f2989a1b9843d84109580d3bd9746ff4c75.tar.gz gsoc2013-evolution-62fd2f2989a1b9843d84109580d3bd9746ff4c75.tar.bz2 gsoc2013-evolution-62fd2f2989a1b9843d84109580d3bd9746ff4c75.tar.lz gsoc2013-evolution-62fd2f2989a1b9843d84109580d3bd9746ff4c75.tar.xz gsoc2013-evolution-62fd2f2989a1b9843d84109580d3bd9746ff4c75.tar.zst gsoc2013-evolution-62fd2f2989a1b9843d84109580d3bd9746ff4c75.zip | |
** Fixes part of bug #337616
2007-05-12 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #337616
* Makefile.am:
Add --disable-scrollkeeper to DISTCHECK_CONFIGURE_FLAGS.
* addressbook/Makefile.am:
* calendar/gui/Makefile.am:
* mail/Makefile.am:
* plugins/bogo-junk-plugins/Makefile.am:
* plugins/default-mailer/Makefile.am:
* shell/Makefile.am:
Add $(schema_DATA) to DISTCLEANFILES.
* plugins/bogo-junk-plugins/org-gnome-bogo-junk-plugin.eplug.in:
Rename as org-gnome-bogo-junk-plugin.eplug.xml.
* plugins/caldav/Makefile.am:
* plugins/import-ics-attachments/Makefile.am:
* plugins/publish-calendar/Makefile.am:
Add "eplug" file to CLEANFILES.
* plugins/mail-remote/Makefile.am:
Add "eplug.xml" file to EXTRA_DIST.
* po/POTFILES.in: Don't translate files we no longer ship.
svn path=/trunk/; revision=33521
25 files changed, 101 insertions, 28 deletions
@@ -1,3 +1,10 @@ +2007-05-12 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #337616 + + * Makefile.am: + Add --disable-scrollkeeper to DISTCHECK_CONFIGURE_FLAGS. + 2007-05-08 Wang Xin <jedy.wang@sun.com> * configure.in: Fixes 394579:incompatible awk on Solaris cause diff --git a/Makefile.am b/Makefile.am index 6a464a2b06..f514784595 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,6 +63,9 @@ DISTCLEANFILES = \ gnome-doc-utils.make \ $(pkgconfig_DATA) +# Scrollkeeper must be disabled for distcheck to work because +# distcheck uses a custom prefix. See GNOME bug #354357. +DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper # CDE Stuff diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 8cc4f954cf..caad300835 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2007-05-12 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #337616 + + * Makefile.am: Add $(schema_DATA) to DISTCLEANFILES. + 2007-05-11 Srinivasa Ragavan <sragavan@novell.com> * gui/component/GNOME_Evolution_Addressbook.server.in.in: Add Tango diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index e948202561..b34d51863b 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -102,6 +102,8 @@ glade_DATA = \ BUILT_SOURCES = $(server_DATA) CLEANFILES = $(BUILT_SOURCES) +DISTCLEANFILES = $(schema_DATA) + EXTRA_DIST = \ $(glade_DATA) \ $(schema_in_files) \ diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 3d4f86aa58..01553e23de 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2007-05-12 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #337616 + + * gui/Makefile.am: Add $(schema_DATA) to DISTCLEANFILES. + 2007-05-12 simon.zheng <simon.zheng@sun.com> ** Fix for bug #427789 diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index c9f54cde03..bd0601b264 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -268,6 +268,8 @@ EXTRA_DIST = \ BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA) CLEANFILES = $(BUILT_SOURCES) +DISTCLEANFILES = $(schema_DATA) + if OS_WIN32 install-data-local: if test -z "$(DESTDIR)"; then \ diff --git a/mail/ChangeLog b/mail/ChangeLog index 23699ceaa5..19c4614746 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2007-05-12 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #337616 + + * Makefile.am: Add $(schema_DATA) to DISTCLEANFILES. + 2007-05-11 Jules Colding <colding@omesc.com> * mail-config.c (mail_config_signature_run_script): file descriptor leaks fixed diff --git a/mail/Makefile.am b/mail/Makefile.am index 0a7bd980fc..5345bb3c37 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -331,3 +331,5 @@ dist-hook: BUILT_SOURCES = $(SPELL_IDL_GENERATED) $(MAIL_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(error_DATA) CLEANFILES = $(BUILT_SOURCES) + +DISTCLEANFILES = $(schema_DATA) diff --git a/plugins/bogo-junk-plugin/ChangeLog b/plugins/bogo-junk-plugin/ChangeLog index 7ff27f19e0..654c8c1978 100644 --- a/plugins/bogo-junk-plugin/ChangeLog +++ b/plugins/bogo-junk-plugin/ChangeLog @@ -1,3 +1,11 @@ +2007-05-12 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #337616 + + * Makefile.am: Add $(schema_DATA) to DISTCLEANFILES. + + * org-gnome-bogo-junk-plugin.eplug.in: Rename as *.eplug.xml. + 2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr> * bf-junk-filter.c: add prototypes to clean compilation warnings diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am index e055f6a1cb..604dc452a3 100644 --- a/plugins/bogo-junk-plugin/Makefile.am +++ b/plugins/bogo-junk-plugin/Makefile.am @@ -31,7 +31,9 @@ BUILT_SOURCES = $(plugin_DATA) $(error_DATA) CLEANFILES = $(BUILT_SOURCES) +DISTCLEANFILES = $(schema_DATA) + EXTRA_DIST = \ - org-gnome-bogo-junk-plugin.eplug.in \ + org-gnome-bogo-junk-plugin.eplug.xml \ $(schema_in_files) diff --git a/plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.in b/plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml index 3ce26cc0b7..3ce26cc0b7 100644 --- a/plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.in +++ b/plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml diff --git a/plugins/caldav/ChangeLog b/plugins/caldav/ChangeLog index 066da1780d..777abad41b 100644 --- a/plugins/caldav/ChangeLog +++ b/plugins/caldav/ChangeLog @@ -1,3 +1,9 @@ +2007-05-12 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #337616 + + * Makefile.am: Add "eplug" file to CLEANFILES. + 2006-08-28 Kjartan Maraas <kmaraas@gnome.org> * org-gnome-evolution-caldav.eplug.xml: Mark name and diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am index 68c167f32a..b43ceebcd4 100644 --- a/plugins/caldav/Makefile.am +++ b/plugins/caldav/Makefile.am @@ -20,3 +20,5 @@ liborg_gnome_evolution_caldav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED EXTRA_DIST = \ org-gnome-evolution-caldav.eplug.xml + +CLEANFILES = org-gnome-evolution-caldav.eplug diff --git a/plugins/default-mailer/ChangeLog b/plugins/default-mailer/ChangeLog index 6faf41ac8b..98a314f1e6 100644 --- a/plugins/default-mailer/ChangeLog +++ b/plugins/default-mailer/ChangeLog @@ -1,3 +1,9 @@ +2007-05-12 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #337616 + + * Makefile.am: Add $(schema_DATA) to DISTCLEANFILES. + 2007-04-02 Sankar P <psankar@novell.com> * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am index 0a0b51ffd9..8f4876e45e 100644 --- a/plugins/default-mailer/Makefile.am +++ b/plugins/default-mailer/Makefile.am @@ -38,3 +38,5 @@ BUILT_SOURCES = org-gnome-default-mailer.eplug \ org-gnome-default-mailer.error CLEANFILES = $(BUILT_SOURCES) + +DISTCLEANFILES = $(schema_DATA) diff --git a/plugins/import-ics-attachments/ChangeLog b/plugins/import-ics-attachments/ChangeLog index ebd4d650bf..b20af87b27 100644 --- a/plugins/import-ics-attachments/ChangeLog +++ b/plugins/import-ics-attachments/ChangeLog @@ -1,3 +1,9 @@ +2007-05-12 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #337616 + + * Makefile.am: Add "eplug" file to CLEANFILES. + 2007-03-27 Matthew Barnes <mbarnes@redhat.com> * icsimporter.c: Don't mix declarations and code (#405495). diff --git a/plugins/import-ics-attachments/Makefile.am b/plugins/import-ics-attachments/Makefile.am index c73177db92..cae0cec7ab 100644 --- a/plugins/import-ics-attachments/Makefile.am +++ b/plugins/import-ics-attachments/Makefile.am @@ -27,3 +27,5 @@ liborg_gnome_evolution_mail_attachments_import_ics_la_LIBADD = \ $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = org-gnome-evolution-mail-attachments-import-ics.eplug.xml + +CLEANFILES = org-gnome-evolution-mail-attachments-import-ics.eplug diff --git a/plugins/mail-remote/ChangeLog b/plugins/mail-remote/ChangeLog index 16dc730c7a..d565ef53c1 100644 --- a/plugins/mail-remote/ChangeLog +++ b/plugins/mail-remote/ChangeLog @@ -1,3 +1,9 @@ +2007-05-12 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #337616 + + * Makefile.am: Add "eplug.xml" file to EXTRA_DIST. + 2007-04-02 Sankar P <psankar@novell.com> * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> diff --git a/plugins/mail-remote/Makefile.am b/plugins/mail-remote/Makefile.am index 800cf71dc6..99375bc92f 100644 --- a/plugins/mail-remote/Makefile.am +++ b/plugins/mail-remote/Makefile.am @@ -84,10 +84,11 @@ $(EVO_GENERATED): $(srcdir)/Evolution.idl MARSHAL_GENERATED = evolution-mail-marshal.c evolution-mail-marshal.h @EVO_MARSHAL_RULE@ -EXTRA_DIST = \ - $(IDL) \ - Evolution.idl \ - evolution-mail-marshal.list +EXTRA_DIST = \ + $(IDL) \ + Evolution.idl \ + evolution-mail-marshal.list \ + org-gnome-evolution-mail-remote.eplug.xml BUILT_SOURCES = $(IDL_GENERATED_H) $(IDL_GENERATED_C) $(MARSHAL_GENERATED) $(SHELL_GENERATED) CLEANFILES = $(BUILT_SOURCES) diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog index f72b9da841..2af4178446 100644 --- a/plugins/publish-calendar/ChangeLog +++ b/plugins/publish-calendar/ChangeLog @@ -1,3 +1,7 @@ +2007-05-12 Matthew Barnes <mbarnes@redhat.com> + + * Makefile.am: Add "eplug" file to CLEANFILES. + 2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr> * url-editor-dialog.c: (set_from_uri): fixes casts in strcmp, diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index 7a40a7860d..8c712ede96 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -33,3 +33,5 @@ EXTRA_DIST = \ org-gnome-publish-calendar.eplug.xml \ publish-calendar.glade \ org-gnome-publish-calendar.xml + +CLEANFILES = org-gnome-publish-calendar.eplug diff --git a/po/ChangeLog b/po/ChangeLog index f7930eb4bc..846453d035 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,9 @@ +2007-05-12 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #337616 + + * POTFILES.in: Don't translate files we no longer ship. + 2007-05-12 Jorge Gonzalez <jorgegonz@svn.gnome.org> * es.po: Updated Spanish translation diff --git a/po/POTFILES.in b/po/POTFILES.in index 5f1d3eac97..83d73c93e8 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -62,21 +62,16 @@ addressbook/gui/widgets/e-minicard-label.c addressbook/gui/widgets/e-minicard-view.c addressbook/gui/widgets/e-minicard-view-widget.c addressbook/gui/widgets/gal-view-factory-minicard.c -addressbook/gui/widgets/gal-view-factory-treeview.c -addressbook/gui/widgets/test-reflow.c addressbook/importers/evolution-csv-importer.c addressbook/importers/evolution-ldif-importer.c addressbook/importers/evolution-vcard-importer.c addressbook/printing/e-contact-print.c -addressbook/printing/e-contact-print-envelope.c addressbook/printing/e-contact-print.glade addressbook/printing/test-contact-print-style-editor.c addressbook/printing/test-print.c -addressbook/tools/evolution-addressbook-abuse.c addressbook/tools/evolution-addressbook-export.c addressbook/tools/evolution-addressbook-export-list-cards.c addressbook/tools/evolution-addressbook-export-list-folders.c -addressbook/tools/evolution-addressbook-import.c calendar/calendar.error.xml calendar/common/authentication.c calendar/conduits/calendar/calendar-conduit.c @@ -101,7 +96,6 @@ calendar/gui/dialogs/alarm-list-dialog.c calendar/gui/dialogs/alarm-list-dialog.glade calendar/gui/dialogs/cal-attachment-select-file.c calendar/gui/dialogs/calendar-setup.c -calendar/gui/dialogs/calendar-setup.glade calendar/gui/dialogs/cal-prefs-dialog.c calendar/gui/dialogs/cal-prefs-dialog.glade calendar/gui/dialogs/cancel-comp.c @@ -116,13 +110,10 @@ calendar/gui/dialogs/e-delegate-dialog.glade calendar/gui/dialogs/event-editor.c calendar/gui/dialogs/event-page.c calendar/gui/dialogs/event-page.glade -calendar/gui/dialogs/meeting-page.etspec calendar/gui/dialogs/meeting-page.glade calendar/gui/dialogs/memo-editor.c calendar/gui/dialogs/memo-page.c calendar/gui/dialogs/memo-page.glade -calendar/gui/dialogs/new-calendar.glade -calendar/gui/dialogs/new-task-list.glade calendar/gui/dialogs/recur-comp.c calendar/gui/dialogs/recurrence-page.c calendar/gui/dialogs/recurrence-page.glade @@ -136,7 +127,6 @@ calendar/gui/dialogs/task-details-page.glade calendar/gui/dialogs/task-editor.c calendar/gui/dialogs/task-page.c calendar/gui/dialogs/task-page.glade -calendar/gui/dialogs/url-editor-dialog.glade calendar/gui/e-alarm-list.c calendar/gui/e-cal-component-memo-preview.c calendar/gui/e-cal-component-preview.c @@ -163,7 +153,6 @@ calendar/gui/e-meeting-time-sel-item.c calendar/gui/e-memos.c calendar/gui/e-memo-table.c calendar/gui/e-memo-table.etspec -calendar/gui/e-pub-utils.c calendar/gui/e-tasks.c calendar/gui/e-timezone-entry.c calendar/gui/e-week-view.c @@ -183,9 +172,6 @@ calendar/gui/tasks-control.c calendar/gui/weekday-picker.c calendar/importers/icalendar-importer.c calendar/zones.h -composer/e-msg-composer-attachment-bar.c -composer/e-msg-composer-attachment.c -composer/e-msg-composer-attachment.glade composer/e-msg-composer.c composer/e-msg-composer-hdrs.c composer/e-msg-composer-select-file.c @@ -193,8 +179,6 @@ composer/evolution-composer.c composer/mail-composer.error.xml data/evolution.desktop.in.in data/evolution.keys.in.in -designs/OOA/ooa.glade -designs/read_receipts/read.glade e-util/e-categories-config.c e-util/e-dialog-utils.c e-util/e-error.c @@ -245,9 +229,7 @@ mail/evolution-mail.schemas.in.in mail/GNOME_Evolution_Mail.server.in.in mail/importers/elm-importer.c mail/importers/evolution-mbox-importer.c -mail/importers/evolution-outlook-importer.c mail/importers/mail-importer.c -mail/importers/netscape-importer.c mail/importers/pine-importer.c mail/mail-autofilter.c mail/mail-component.c @@ -268,7 +250,6 @@ mail/message-list.c mail/message-list.etspec mail/message-tag-editor.c mail/message-tag-followup.c -mail/message-tags.glade mail/searchtypes.xml plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml plugins/audio-inline/org-gnome-audio-inline.eplug.xml @@ -281,7 +262,7 @@ plugins/bbdb/bbdb.c plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml plugins/bogo-junk-plugin/bf-junk-filter.c plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.in -plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.in +plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml plugins/caldav/caldav-source.c plugins/caldav/org-gnome-evolution-caldav.eplug.xml plugins/calendar-file/org-gnome-calendar-file.eplug.xml @@ -358,7 +339,6 @@ plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.e plugins/ipod-sync/evolution-ipod-sync.c plugins/ipod-sync/ical-format.c plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml -plugins/ipod-sync/sync.c plugins/itip-formatter/itip-formatter.c plugins/itip-formatter/itip-view.c plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml @@ -437,7 +417,6 @@ smime/gui/smime-ui.glade smime/lib/e-cert.c smime/lib/e-cert-db.c smime/lib/e-pkcs12.c -tools/evolution-launch-composer.c tools/killev.c ui/evolution-addressbook.xml ui/evolution-calendar.xml @@ -521,7 +500,6 @@ widgets/table/e-tree.c widgets/table/e-tree-scrolled.c widgets/table/e-tree-selection-model.c widgets/text/e-entry.c -widgets/text/e-entry-test.c widgets/text/e-text.c views/addressbook/galview.xml views/calendar/galview.xml diff --git a/shell/ChangeLog b/shell/ChangeLog index 388a5ef150..db05a671a9 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2007-05-12 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #337616 + + * Makefile.am: Add $(schema_DATA) to DISTCLEANFILES. + 2007-05-11 Matthew Barnes <mbarnes@redhat.com> * e-shell.c (impl_Shell_handleURI): diff --git a/shell/Makefile.am b/shell/Makefile.am index b1bbce14c6..4b671f52aa 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -289,6 +289,8 @@ endif BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(testserver_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA) CLEANFILES = $(BUILT_SOURCES) +DISTCLEANFILES = $(schema_DATA) + dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) |