aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnny Jacob <jjohnny@src.gnome.org>2007-08-20 12:38:18 +0800
committerJohnny Jacob <jjohnny@src.gnome.org>2007-08-20 12:38:18 +0800
commita941352c299c6fe0587c43dfa27b40d491e2f205 (patch)
treeb0052caf39b3abcce316151cab4a3cbe4c8180cf
parent3ea7bd690fb04f799fea74dc251446ba735a4927 (diff)
downloadgsoc2013-evolution-a941352c299c6fe0587c43dfa27b40d491e2f205.tar.gz
gsoc2013-evolution-a941352c299c6fe0587c43dfa27b40d491e2f205.tar.zst
gsoc2013-evolution-a941352c299c6fe0587c43dfa27b40d491e2f205.zip
Fix for 468159 from Gilles Dartiguelongue <gdartigu@svn.gnome.org>
--This line, and th se below, will be ignored-- A plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in M plugins/attachment-reminder/ChangeLog M plugins/attachment-reminder/Makefile.am D plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.in M plugins/tnef-attachments/Makefile.am svn path=/trunk/; revision=34040
-rw-r--r--plugins/attachment-reminder/ChangeLog10
-rw-r--r--plugins/attachment-reminder/Makefile.am7
-rw-r--r--plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in (renamed from plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.in)0
-rw-r--r--plugins/tnef-attachments/Makefile.am2
4 files changed, 13 insertions, 6 deletions
diff --git a/plugins/attachment-reminder/ChangeLog b/plugins/attachment-reminder/ChangeLog
index 59e2a98020..0cd6d5ee9b 100644
--- a/plugins/attachment-reminder/ChangeLog
+++ b/plugins/attachment-reminder/ChangeLog
@@ -1,3 +1,13 @@
+2007-08-20 Johnny Jacob <jjohnny@novell.com>
+
+ ** Fix for 468159 from Gilles Dartiguelongue
+ <gdartigu@svn.gnome.org>
+
+ * apps-evolution-attachment-reminder.schemas.in.in : Renamed to
+ apps-evolution-attachment-reminder.schemas.in
+
+ * Makefile.am : Removed usage of BASE_VERSION
+
2007-08-03 Johnny Jacob <jjohnny@novell.com>
* org-gnome-attachment-reminder.errors.xml: Renamed to
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index 3a4c8b62ac..79e4271370 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -22,11 +22,8 @@ liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c
liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version
schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps-evolution-attachment-reminder.schemas.in.in
-schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
- cp $< $@
+schema_in_files = apps-evolution-attachment-reminder.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
diff --git a/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.in b/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in
index e8b62241e4..e8b62241e4 100644
--- a/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.in
+++ b/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index 5f9c56b242..c6fe9a1d34 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
- -DLOCALEDIR="\"$(LOCALEDIR)\"" \
+ -DLOCALEDIR="\"$(LOCALEDIR)\"" \
$(EVOLUTION_MAIL_CFLAGS)
@EVO_PLUGIN_RULE@