From 62fd2f2989a1b9843d84109580d3bd9746ff4c75 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 13 May 2007 00:24:55 +0000
Subject: ** 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
---
 plugins/bogo-junk-plugin/ChangeLog                 |  8 +++++++
 plugins/bogo-junk-plugin/Makefile.am               |  4 +++-
 .../org-gnome-bogo-junk-plugin.eplug.in            | 27 ----------------------
 .../org-gnome-bogo-junk-plugin.eplug.xml           | 27 ++++++++++++++++++++++
 4 files changed, 38 insertions(+), 28 deletions(-)
 delete mode 100644 plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.in
 create mode 100644 plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml

(limited to 'plugins/bogo-junk-plugin')

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.in
deleted file mode 100644
index 3ce26cc0b7..0000000000
--- a/plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.in
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<e-plugin-list>
-	<e-plugin type="shlib"
-	          location="@PLUGINDIR@/liborg-gnome-bogo-junk-plugin.so"
-	          id="org.gnome.evolution.bogo.bf_junk_plugin"
-	          name="Bogofilter junk plugin">
-		<description>Filters junk messages using Bogofilter.</description>
-		<author name="Mikhail Zabaluev" email="mhz@altlinux.org"/>
-		<hook class="org.gnome.evolution.mail.junk:1.0">
-			<group id="EMJunk" >
-				<item name="Bogofilter" report_non_junk="em_junk_bf_report_non_junk"
-				      report_junk="em_junk_bf_report_junk"
-				      check_junk="em_junk_bf_check_junk"
-				      commit_reports="em_junk_bf_commit_reports" 
-				      validate_binary="em_junk_bf_validate_binary"/>
-			</group>
-		</hook>
-		<!-- hook into the 'mail properties' menu -->
-		<hook class="org.gnome.evolution.mail.config:1.0">
-		        <group target="prefs" id="org.gnome.evolution.mail.prefs">
-				<item type="section_table" path="40.junk/30.options" label="Bogofilter Options"/>
-				<item type="item_table" path="40.junk/40.options" factory="org_gnome_bogo_convert_unicode"/>
-		        </group>
-			    </hook>
-
-	</e-plugin>
-</e-plugin-list>
diff --git a/plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml b/plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml
new file mode 100644
index 0000000000..3ce26cc0b7
--- /dev/null
+++ b/plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<e-plugin-list>
+	<e-plugin type="shlib"
+	          location="@PLUGINDIR@/liborg-gnome-bogo-junk-plugin.so"
+	          id="org.gnome.evolution.bogo.bf_junk_plugin"
+	          name="Bogofilter junk plugin">
+		<description>Filters junk messages using Bogofilter.</description>
+		<author name="Mikhail Zabaluev" email="mhz@altlinux.org"/>
+		<hook class="org.gnome.evolution.mail.junk:1.0">
+			<group id="EMJunk" >
+				<item name="Bogofilter" report_non_junk="em_junk_bf_report_non_junk"
+				      report_junk="em_junk_bf_report_junk"
+				      check_junk="em_junk_bf_check_junk"
+				      commit_reports="em_junk_bf_commit_reports" 
+				      validate_binary="em_junk_bf_validate_binary"/>
+			</group>
+		</hook>
+		<!-- hook into the 'mail properties' menu -->
+		<hook class="org.gnome.evolution.mail.config:1.0">
+		        <group target="prefs" id="org.gnome.evolution.mail.prefs">
+				<item type="section_table" path="40.junk/30.options" label="Bogofilter Options"/>
+				<item type="item_table" path="40.junk/40.options" factory="org_gnome_bogo_convert_unicode"/>
+		        </group>
+			    </hook>
+
+	</e-plugin>
+</e-plugin-list>
-- 
cgit v1.2.3