Merge branch 'external-audio' of /home/carl/git/dvdomatic into external-audio

18 files changed, 93 insertions, 0 deletions

diff --git a/builds/deb b/builds/deb-12.04
index 2289bbbb3..aea23509a 100755
--- a/builds/deb
+++ b/builds/deb-12.04
@@ -1,5 +1,6 @@
 #!/bin/bash -e
 
+cp -r builds/debian-12.04 debian
 ./waf dist
 TARBALL=`ls -1 *.tar.bz2`
 VERSION=`echo $TARBALL | sed -e 's/^dvdomatic-\(.*\).tar.bz2/\1/'`
diff --git a/builds/deb-12.10 b/builds/deb-12.10
new file mode 100755
index 000000000..ccb0bb286
--- /dev/null
+++ b/builds/deb-12.10
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+cp -r builds/debian-12.10 debian
+./waf dist
+rm -rf build/deb
+mkdir build/deb
+cd build/deb
+mv ../../*.tar.bz2 .
+TARBALL=`ls -1 *.tar.bz2`
+DEB_TARBALL=`echo $TARBALL | sed -e "s/dvdomatic-/dvdomatic_/" | sed -e "s/.tar.bz2/.orig.tar.bz2/"`
+echo "Renaming $TARBALL to $DEB_TARBALL"
+mv $TARBALL $DEB_TARBALL
+tar xjf $DEB_TARBALL
+cd dvdomatic-*
+dpkg-source -b .
+dpkg-buildpackage
+cp ../*.deb ../../../
+
diff --git a/builds/debian-12.04/changelog b/builds/debian-12.04/changelog
new file mode 100644
index 000000000..9908e7cb4
--- /dev/null
+++ b/builds/debian-12.04/changelog
@@ -0,0 +1,5 @@
+dvdomatic (0.59beta1-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Carl Hetherington <cth@carlh.net>  Sat, 08 Dec 2012 12:41:20 +0000
diff --git a/debian/compat b/builds/debian-12.04/compat
index 45a4fb75d..45a4fb75d 100644
--- a/debian/compat
+++ b/builds/debian-12.04/compat
diff --git a/builds/debian-12.04/control b/builds/debian-12.04/control
new file mode 100644
index 000000000..f47058bcc
--- /dev/null
+++ b/builds/debian-12.04/control
@@ -0,0 +1,15 @@
+Source: dvdomatic
+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), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem1.49-dev (>= 1.49.0), libboost-thread1.49-dev (>= 1.49.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.7.7.10)
+Standards-Version: 3.9.3
+Homepage: http://carlh.net/software/dvdomatic
+
+Package: dvdomatic
+Architecture: any
+Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.0 (>= 1.46.0), libboost-thread1.46.0 (>= 1.46.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10)
+Description: Generator of Digital Cinema Packages (DCPs)
+  DVD-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.
diff --git a/debian/copyright b/builds/debian-12.04/copyright
index 2579947e4..2579947e4 100644
--- a/debian/copyright
+++ b/builds/debian-12.04/copyright
diff --git a/debian/docs b/builds/debian-12.04/docs
index e845566c0..e845566c0 100644
--- a/debian/docs
+++ b/builds/debian-12.04/docs
diff --git a/debian/files b/builds/debian-12.04/files
index 7639f05ac..7639f05ac 100644
--- a/debian/files
+++ b/builds/debian-12.04/files
diff --git a/debian/rules b/builds/debian-12.04/rules
index 3320087a5..3320087a5 100755
--- a/debian/rules
+++ b/builds/debian-12.04/rules
diff --git a/debian/source/format b/builds/debian-12.04/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/source/format
+++ b/builds/debian-12.04/source/format
diff --git a/debian/changelog b/builds/debian-12.10/changelog
index de8b601db..de8b601db 100644
--- a/debian/changelog
+++ b/builds/debian-12.10/changelog
diff --git a/builds/debian-12.10/compat b/builds/debian-12.10/compat
new file mode 100644
index 000000000..45a4fb75d
--- /dev/null
+++ b/builds/debian-12.10/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/builds/debian-12.10/control
index 5be972616..5be972616 100644
--- a/debian/control
+++ b/builds/debian-12.10/control
diff --git a/builds/debian-12.10/copyright b/builds/debian-12.10/copyright
new file mode 100644
index 000000000..2579947e4
--- /dev/null
+++ b/builds/debian-12.10/copyright
@@ -0,0 +1,27 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: dvdomatic
+Source: <url://carlh.net/software/dvdomatic>
+
+Files: *
+Copyright: 2012 Carl Hetherington <cth@carlh.net>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
diff --git a/builds/debian-12.10/docs b/builds/debian-12.10/docs
new file mode 100644
index 000000000..e845566c0
--- /dev/null
+++ b/builds/debian-12.10/docs
@@ -0,0 +1 @@
+README
diff --git a/builds/debian-12.10/files b/builds/debian-12.10/files
new file mode 100644
index 000000000..7639f05ac
--- /dev/null
+++ b/builds/debian-12.10/files
@@ -0,0 +1 @@
+dvdomatic_0.59beta1-1_i386.deb video extra
diff --git a/builds/debian-12.10/rules b/builds/debian-12.10/rules
new file mode 100755
index 000000000..3320087a5
--- /dev/null
+++ b/builds/debian-12.10/rules
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ 
+
+override_dh_auto_configure:
+	./waf --nocache configure --prefix=/usr --static
+
+override_dh_auto_build:
+	./waf --nocache build
+
+override_dh_auto_install:
+	./waf --nocache install --destdir=debian/dvdomatic
+
diff --git a/builds/debian-12.10/source/format b/builds/debian-12.10/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/builds/debian-12.10/source/format
@@ -0,0 +1 @@
+3.0 (quilt)