More rejigging.
authorCarl Hetherington <cth@carlh.net>
Sun, 9 Dec 2012 21:35:13 +0000 (21:35 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 9 Dec 2012 21:35:13 +0000 (21:35 +0000)
27 files changed:
builds/control-12.04 [new file with mode: 0644]
builds/control-12.10 [new file with mode: 0644]
builds/deb-12.04
builds/deb-12.10
builds/debian-12.04/changelog [deleted file]
builds/debian-12.04/compat [deleted file]
builds/debian-12.04/control [deleted file]
builds/debian-12.04/copyright [deleted file]
builds/debian-12.04/docs [deleted file]
builds/debian-12.04/files [deleted file]
builds/debian-12.04/rules [deleted file]
builds/debian-12.04/source/format [deleted file]
builds/debian-12.10/changelog [deleted file]
builds/debian-12.10/compat [deleted file]
builds/debian-12.10/control [deleted file]
builds/debian-12.10/copyright [deleted file]
builds/debian-12.10/docs [deleted file]
builds/debian-12.10/files [deleted file]
builds/debian-12.10/rules [deleted file]
builds/debian-12.10/source/format [deleted file]
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/docs [new file with mode: 0644]
debian/files [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]

diff --git a/builds/control-12.04 b/builds/control-12.04
new file mode 100644 (file)
index 0000000..f47058b
--- /dev/null
@@ -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/builds/control-12.10 b/builds/control-12.10
new file mode 100644 (file)
index 0000000..126d422
--- /dev/null
@@ -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.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.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.
index aea23509a1706f637296e36021139902021ed0f2..ab1469e873f656e87a2bcc483cb0514078c7738c 100755 (executable)
@@ -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/'`
index ccb0bb28630eb7701590e52c3a9ef67ffc946f94..ec206fdb13930a6f94612d3b3c3c04abd17a0e3e 100755 (executable)
@@ -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.04/changelog b/builds/debian-12.04/changelog
deleted file mode 100644 (file)
index 9908e7c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-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.04/compat b/builds/debian-12.04/compat
deleted file mode 100644 (file)
index 45a4fb7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/builds/debian-12.04/control b/builds/debian-12.04/control
deleted file mode 100644 (file)
index f47058b..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-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/builds/debian-12.04/copyright b/builds/debian-12.04/copyright
deleted file mode 100644 (file)
index 2579947..0000000
+++ /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.04/docs b/builds/debian-12.04/docs
deleted file mode 100644 (file)
index e845566..0000000
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/builds/debian-12.04/files b/builds/debian-12.04/files
deleted file mode 100644 (file)
index 7639f05..0000000
+++ /dev/null
@@ -1 +0,0 @@
-dvdomatic_0.59beta1-1_i386.deb video extra
diff --git a/builds/debian-12.04/rules b/builds/debian-12.04/rules
deleted file mode 100755 (executable)
index 3320087..0000000
+++ /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.04/source/format b/builds/debian-12.04/source/format
deleted file mode 100644 (file)
index 163aaf8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/builds/debian-12.10/changelog b/builds/debian-12.10/changelog
deleted file mode 100644 (file)
index 9908e7c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-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 (file)
index 45a4fb7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/builds/debian-12.10/control b/builds/debian-12.10/control
deleted file mode 100644 (file)
index 126d422..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-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.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.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/builds/debian-12.10/copyright b/builds/debian-12.10/copyright
deleted file mode 100644 (file)
index 2579947..0000000
+++ /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 (file)
index e845566..0000000
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/builds/debian-12.10/files b/builds/debian-12.10/files
deleted file mode 100644 (file)
index 7639f05..0000000
+++ /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 (executable)
index 3320087..0000000
+++ /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 (file)
index 163aaf8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..9908e7c
--- /dev/null
@@ -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/debian/compat
new file mode 100644 (file)
index 0000000..45a4fb7
--- /dev/null
@@ -0,0 +1 @@
+8
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..2579947
--- /dev/null
@@ -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/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..e845566
--- /dev/null
@@ -0,0 +1 @@
+README
diff --git a/debian/files b/debian/files
new file mode 100644 (file)
index 0000000..7639f05
--- /dev/null
@@ -0,0 +1 @@
+dvdomatic_0.59beta1-1_i386.deb video extra
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..3320087
--- /dev/null
@@ -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/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)