Merge.

18 files changed, 10 insertions, 71 deletions

diff --git a/builds/debian-12.04/control b/builds/control-12.04
index f47058bcc..f47058bcc 100644
--- a/builds/debian-12.04/control
+++ b/builds/control-12.04
diff --git a/builds/debian-12.10/control b/builds/control-12.10
index 5be972616..5be972616 100644
--- a/builds/debian-12.10/control
+++ b/builds/control-12.10
diff --git a/builds/deb-12.04 b/builds/deb-12.04
index aea23509a..ab1469e87 100755
--- a/builds/deb-12.04
+++ b/builds/deb-12.04
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-cp -r builds/debian-12.04 debian
+cp builds/control-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
index ccb0bb286..ec206fdb1 100755
--- a/builds/deb-12.10
+++ b/builds/deb-12.10
@@ -1,13 +1,17 @@
-#!/bin/bash
+#!/bin/bash -e
 
-cp -r builds/debian-12.10 debian
+cp builds/control-12.10 debian/
 ./waf dist
+TARBALL=`ls -1 *.tar.bz2`
+VERSION=`echo $TARBALL | sed -e 's/^dvdomatic-\(.*\).tar.bz2/\1/'`
+
+echo "dvdomatic_$VERSION-1_i386.deb video extra" > debian/files
+
 rm -rf build/deb
-mkdir build/deb
+mkdir -p 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/"`
+DEB_TARBALL="dvdomatic_$VERSION.orig.tar.bz2"
 echo "Renaming $TARBALL to $DEB_TARBALL"
 mv $TARBALL $DEB_TARBALL
 tar xjf $DEB_TARBALL
diff --git a/builds/debian-12.10/changelog b/builds/debian-12.10/changelog
deleted file mode 100644
index de8b601db..000000000
--- a/builds/debian-12.10/changelog
+++ /dev/null
@@ -1,11 +0,0 @@
-dvdomatic (0.59beta3-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Carl Hetherington <carl@houllier.lan>  Sun, 09 Dec 2012 20:20:29 +0000
-
-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/builds/debian-12.10/compat b/builds/debian-12.10/compat
deleted file mode 100644
index 45a4fb75d..000000000
--- a/builds/debian-12.10/compat
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/builds/debian-12.10/copyright b/builds/debian-12.10/copyright
deleted file mode 100644
index 2579947e4..000000000
--- a/builds/debian-12.10/copyright
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index e845566c0..000000000
--- a/builds/debian-12.10/docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/builds/debian-12.10/files b/builds/debian-12.10/files
deleted file mode 100644
index 7639f05ac..000000000
--- a/builds/debian-12.10/files
+++ /dev/null
@@ -1 +0,0 @@
-dvdomatic_0.59beta1-1_i386.deb video extra
diff --git a/builds/debian-12.10/rules b/builds/debian-12.10/rules
deleted file mode 100755
index 3320087a5..000000000
--- a/builds/debian-12.10/rules
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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
deleted file mode 100644
index 163aaf8d8..000000000
--- a/builds/debian-12.10/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/builds/debian-12.04/changelog b/debian/changelog
index 9908e7cb4..9908e7cb4 100644
--- a/builds/debian-12.04/changelog
+++ b/debian/changelog
diff --git a/builds/debian-12.04/compat b/debian/compat
index 45a4fb75d..45a4fb75d 100644
--- a/builds/debian-12.04/compat
+++ b/debian/compat
diff --git a/builds/debian-12.04/copyright b/debian/copyright
index 2579947e4..2579947e4 100644
--- a/builds/debian-12.04/copyright
+++ b/debian/copyright
diff --git a/builds/debian-12.04/docs b/debian/docs
index e845566c0..e845566c0 100644
--- a/builds/debian-12.04/docs
+++ b/debian/docs
diff --git a/builds/debian-12.04/files b/debian/files
index 7639f05ac..7639f05ac 100644
--- a/builds/debian-12.04/files
+++ b/debian/files
diff --git a/builds/debian-12.04/rules b/debian/rules
index 3320087a5..3320087a5 100755
--- a/builds/debian-12.04/rules
+++ b/debian/rules
diff --git a/builds/debian-12.04/source/format b/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/builds/debian-12.04/source/format
+++ b/debian/source/format