Add missing files in the publish pluginV_2_21_5

2007-12-06  Bastien Nocera  <hadess@hadess.net>

	* POTFILES.in: Add missing files in the publish plugin

2007-12-06  Bastien Nocera  <hadess@hadess.net>

	* NEWS: upd
	* configure.in: 2.21.5
	* src/plugins/sample-vala/Makefile.am: fix distcheck


svn path=/trunk/; revision=4956

6 files changed, 33 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 4af0245b6..aff39e548 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+============ Version 2.21.5
+
+2007-12-06  Bastien Nocera  <hadess@hadess.net>
+
+	* NEWS: upd
+	* configure.in: 2.21.5
+	* src/plugins/sample-vala/Makefile.am: fix distcheck
+
 2007-12-06  Bastien Nocera  <hadess@hadess.net>
 
 	* src/plugins/mythtv/totem-mythtv.c: (impl_activate):
diff --git a/NEWS b/NEWS
index bd87d901a..ae4a56719 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 New features and significant updates in version...
 
+2.21.5:
+* Fix the browser plugin not linking against the playlist parser
+* Add more strings to be marked as translations
+* Fix some missing files in the release
+* Stop the sidebar showing up even when it was closed in the previous run
+
 2.21.4:
 * Small improvements to the playlist sharing plugin
 * Depend on the split totem-pl-parser module
diff --git a/configure.in b/configure.in
index 10ff1e788..c776b058f 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_PREREQ(2.52)
 
 m4_define(totem_version_major, 2)
 m4_define(totem_version_minor, 21)
-m4_define(totem_version_micro, 4)
+m4_define(totem_version_micro, 5)
 
 AC_INIT([totem],
         [totem_version_major.totem_version_minor.totem_version_micro],
diff --git a/po/ChangeLog b/po/ChangeLog
index 52be13ee8..8fa138b28 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-06  Bastien Nocera  <hadess@hadess.net>
+
+	* POTFILES.in: Add missing files in the publish plugin
+
 2007-12-06  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
         * es.po: Updated Spanish translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 88c3f8629..8c2550217 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -50,6 +50,7 @@ src/plugins/properties/bacon-video-widget-properties.c
 [type: gettext/ini]src/plugins/properties/movie-properties.totem-plugin.in
 src/plugins/publish/totem-publish.c
 [type: gettext/ini]src/plugins/publish/publish.totem-plugin.in
+src/plugins/publish/publish-plugin.ui
 [type: gettext/ini]src/plugins/screensaver/screensaver.totem-plugin.in
 [type: gettext/ini]src/plugins/skipto/skipto.totem-plugin.in
 src/plugins/skipto/totem-skipto.c
diff --git a/src/plugins/sample-vala/Makefile.am b/src/plugins/sample-vala/Makefile.am
index b819b55bc..5c31c11a7 100644
--- a/src/plugins/sample-vala/Makefile.am
+++ b/src/plugins/sample-vala/Makefile.am
@@ -1,17 +1,19 @@
-modules_flags = -export_dynamic -avoid-version -module
+BUILT_SOURCES = totem-sample-vala-plugin.c totem-sample-vala-plugin.h
 
 plugindir = $(PLUGINDIR)/sample-vala
-plugin_LTLIBRARIES = libsample-vala.la
-# override to _not_ install the test plugins
-install-pluginLTLIBRARIES:
+plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
 
 plugin_in_files = sample-vala.totem-plugin.in
-
 %.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
+if ENABLE_VALA
+modules_flags = -export_dynamic -avoid-version -module
+
+plugin_LTLIBRARIES = libsample-vala.la
+# override to _not_ install the test plugins
+install-pluginLTLIBRARIES:
 
-%.c %.h: %.vala
+totem-sample-vala-plugin.c totem-sample-vala-plugin.h: totem-sample-vala-plugin.vala
 	$(VALAC) --vapidir=$(top_srcdir)/bindings/vala --pkg=totem $^
 
 common_defines = \
@@ -25,10 +27,7 @@ common_defines = \
 	-DTOTEM_PLUGIN_DIR=\""$(libdir)/totem/plugins"\"\
 	$(DISABLE_DEPRECATED)
 
-libsample_vala_la_SOURCES = \
-	totem-sample-vala-plugin.c		\
-	totem-sample-vala-plugin.h		\
-	totem-sample-vala-plugin.vala
+nodist_libsample_vala_la_SOURCES = $(BUILT_SOURCES)
 libsample_vala_la_LDFLAGS = $(modules_flags)
 libsample_vala_la_CPPFLAGS = $(common_defines)
 
@@ -42,7 +41,9 @@ libsample_vala_la_CFLAGS = \
 	-I$(top_srcdir)/src	\
 	-I$(top_srcdir)/src/plugins
 
+endif
+
 EXTRA_DIST = $(plugin_in_files) totem-sample-vala-plugin.vala
 
 CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
-DISTCLEANFILES = $(plugin_DATA)
+DISTCLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)