Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0

6 files changed, 57 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3a3dffd12..f6edb0f5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-04  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.25 released.
+
 2013-10-29  Carl Hetherington  <cth@carlh.net>
 
 	* Improve performance when start-trimming
diff --git a/debian/changelog b/debian/changelog
index 229d4801a..b9dfe68ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.24-1) UNRELEASED; urgency=low
+dcpomatic (1.25-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -28,8 +28,9 @@ dcpomatic (1.24-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 28 Oct 2013 12:17:38 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 04 Nov 2013 20:07:04 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/platform/linux/control-7-32 b/platform/linux/control-7-32
new file mode 100644
index 000000000..fda3d504b
--- /dev/null
+++ b/platform/linux/control-7-32
@@ -0,0 +1,24 @@
+Source: dcpomatic
+Section: video
+Priority: extra
+Maintainer: Carl Hetherington <cth@carlh.net>
+Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.7.2), pkg-config (>= 0.26), libssh-dev (>= 0.5.4), libboost-filesystem-dev (>= 1.49.0), libboost-thread-dev (>= 1.49.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.7.7.10), libgtk2.0-dev (>= 2.24.10)
+Standards-Version: 3.9.3
+Homepage: http://dcpomatic.com/
+
+Package: dcpomatic
+Architecture: i386
+Depends: libc6 (>= 2.13), libssh-4 (>= 0.5.4), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2), libgtk2.0-0 (>= 2.24.10), libxmlsec1 (>= 1.2.18), libboost-date-time1.49.0 (>= 1.49.0), libxmlsec1-openssl (>= 1.2.18), libcurl3 (>= 7.26.0), libzip2 (>= 0.10.1)
+Description: Generator of Digital Cinema Packages (DCPs)
+  DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio
+  files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant
+  digital projectors.
+
+Package: dcpomatic-dbg
+Architecture: i386
+Section: debug
+Priority: extra
+Depends: ${dcpomatic:Depends}, ${misc:Depends}
+Description: debugging symbols for dcpomatic
+  This package contains the debugging symbols for dcpomatic.
+
diff --git a/platform/linux/control-7-64 b/platform/linux/control-7-64
new file mode 100644
index 000000000..72c89f4eb
--- /dev/null
+++ b/platform/linux/control-7-64
@@ -0,0 +1,24 @@
+Source: dcpomatic
+Section: video
+Priority: extra
+Maintainer: Carl Hetherington <cth@carlh.net>
+Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.7.2), pkg-config (>= 0.26), libssh-dev (>= 0.5.4), libboost-filesystem-dev (>= 1.49.0), libboost-thread-dev (>= 1.49.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.7.7.10), libgtk2.0-dev (>= 2.24.10)
+Standards-Version: 3.9.3
+Homepage: http://dcpomatic.com/
+
+Package: dcpomatic
+Architecture: amd64
+Depends: libc6 (>= 2.13), libssh-4 (>= 0.5.4), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2), libgtk2.0-0 (>= 2.24.10), libxmlsec1 (>= 1.2.18), libboost-date-time1.49.0 (>= 1.49.0), libxmlsec1-openssl (>= 1.2.18), libcurl3 (>= 7.26.0), libzip2 (>= 0.10.1)
+Description: Generator of Digital Cinema Packages (DCPs)
+  DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio
+  files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant
+  digital projectors.
+
+Package: dcpomatic-dbg
+Architecture: amd64
+Section: debug
+Priority: extra
+Depends: ${dcpomatic:Depends}, ${misc:Depends}
+Description: debugging symbols for dcpomatic
+  This package contains the debugging symbols for dcpomatic.
+
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 489995faa..95a4cc426 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -123,6 +123,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Sean Leigh"));
 	supported_by.Add (wxT ("Wolfram Weber"));
 	supported_by.Add (wxT ("Randy Stankey"));
+	supported_by.Add (wxT ("Frank Cianciolo"));
 	add_section (_("Supported by"), supported_by);
 
 	sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16).Expand());
diff --git a/wscript b/wscript
index 2af209568..5397eda3d 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.25pre'
+VERSION = '1.26pre'
 
 def options(opt):
     opt.load('compiler_cxx')