From: Carl Hetherington <cth@carlh.net>
Date: Mon, 1 Apr 2013 21:49:33 +0000 (+0100)
Subject: Merge branch 'master' into content-rework-take5
X-Git-Tag: v2.0.48~1337^2~487
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=6809fdcbf8c65afe3c986b0e2b430d55ce7b124c;hp=db468a15e50c8491d4b8462ad0676be905f49065

Merge branch 'master' into content-rework-take5
---

diff --git a/ChangeLog b/ChangeLog
index 9dba8fede..9240556b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-03-28  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.78beta16 released.
+
+2013-03-28  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.78beta15 released.
+
 2013-03-28  Carl Hetherington  <cth@carlh.net>
 
 	* Version 0.78beta14 released.
diff --git a/debian/changelog b/debian/changelog
index 4109e5c3b..bf02c7a4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+dvdomatic (0.78beta16-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Thu, 28 Mar 2013 16:28:05 +0000
+
+dvdomatic (0.78beta15-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Thu, 28 Mar 2013 14:25:56 +0000
+
 dvdomatic (0.78beta14-1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/i18n.py b/i18n.py
index ce28d25e9..807aedda6 100644
--- a/i18n.py
+++ b/i18n.py
@@ -32,5 +32,5 @@ def po_to_mo(dir, name, bld):
         po = os.path.join('po', '%s.po' % lang)
         mo = os.path.join('mo', lang, '%s.mo' % name)
 
-        bld(rule = 'msgfmt ${SRC} -o ${TGT}', source = bld.path.make_node(po), target = bld.path.get_bld().make_node(mo))
+        bld(rule = 'msgfmt -f ${SRC} -o ${TGT}', source = bld.path.make_node(po), target = bld.path.get_bld().make_node(mo))
         bld.install_files(os.path.join('${PREFIX}', 'share', 'locale', lang, 'LC_MESSAGES'), mo)
diff --git a/wscript b/wscript
index 9040738fb..9914b3292 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.78beta14'
+VERSION = '0.78beta16'
 
 def options(opt):
     opt.load('compiler_cxx')