--- tovid-0.31.orig/debian/todiscgui.install +++ tovid-0.31/debian/todiscgui.install @@ -0,0 +1,2 @@ +debian/tmp/usr/bin/todiscgui +debian/tmp/usr/share/applications/todiscgui.desktop --- tovid-0.31.orig/debian/changelog +++ tovid-0.31/debian/changelog @@ -0,0 +1,48 @@ +tovid (0.31-0ubuntu5) karmic; urgency=low + + * debian/patches/07_todisc_progress_meter_fix.patch: + - transcode has changed the command-line switch from --print_status to + --progress_meter and thus doesn't get started from todisc (LP: #454549). + + -- Alessio Treglia Sun, 18 Oct 2009 13:23:41 +0200 + +tovid (0.31-0ubuntu4) karmic; urgency=low + + * debian/patches/06_svn-r2494_fix_nav_log_parsing.patch: + - Upstream commit to fix parsing of nav_log for number of frames + (LP: #392735). Thanks to Alex Mauer for spotting the patch. + + -- Chris Coulson Fri, 04 Sep 2009 02:51:05 +0100 + +tovid (0.31-0ubuntu3) karmic; urgency=low + + * debian/control: + - Bumped to Standards-Version 3.8.1. + * debian/control, debian/copyright, debian/README.Debian, debian/man/*.1: + - Updated contributor name and email. + * debian/copyright: + - Replaced (C) sign. + * Added README.source for simple-patchsys. + * Added debian/patches/03_sox_sample_size_fix.diff by Andy Ruddock + : + - Fix todisc passing invalid option to sox. (LP: #357213) + * Added debian/patches/04_name_sections.diff: + - Format manpage NAME sections correctly (with a hyphen). + * Added debian/patches/05_makemenu_man_apostrophes.diff: + - Fix Lintian warning with 'convert' in the makemenu manpage. + + -- Maia Kozheva Sun, 17 May 2009 01:41:25 +0700 + +tovid (0.31-0ubuntu2) intrepid; urgency=low + + * debian/control: + - Added missing dependencies. (LP: #207471) + + -- Matvey Kozhev Sat, 10 May 2008 16:03:12 +0700 + +tovid (0.31-0ubuntu1) hardy; urgency=low + + * Initial release. (LP: #109598) + + -- Matvey Kozhev Thu, 24 Jan 2008 22:04:40 +0600 + --- tovid-0.31.orig/debian/todraw.install +++ tovid-0.31/debian/todraw.install @@ -0,0 +1 @@ +debian/tmp/usr/bin/todraw --- tovid-0.31.orig/debian/README.Debian +++ tovid-0.31/debian/README.Debian @@ -0,0 +1,13 @@ +Most executables installed by upstream into /usr/bin are diverted to +/usr/share/tovid, and scripts are patched accordingly to have this directory +in the PATH. This is done either because they are undocumented internal scripts, +or because they are documented but pollute the namespace (like makexml). + + +If you are writing a shell script using diverted tovid scripts, you can add this +line to the beginning of the file so that the scripts are found correctly: + +PATH=/usr/share/tovid:$PATH + + +-- Maia Kozheva Mon, 04 Feb 2008 00:11:17 +0600 --- tovid-0.31.orig/debian/tovidgui.install +++ tovid-0.31/debian/tovidgui.install @@ -0,0 +1,2 @@ +debian/tmp/usr/bin/tovidgui +debian/tmp/usr/share/applications/tovidgui.desktop --- tovid-0.31.orig/debian/control +++ tovid-0.31/debian/control @@ -0,0 +1,54 @@ +Source: tovid +Section: graphics +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Maia Kozheva +Build-Depends: cdbs, debhelper (>= 6) +Build-Depends-Indep: python (>= 2.4), python-support, txt2tags +Standards-Version: 3.8.1 +Homepage: http://tovid.org + +Package: tovid +Architecture: all +Depends: ${python:Depends}, ${misc:Depends}, python-cairo, libsox-fmt-all, mjpegtools, transcode, vcdimager, + mplayer, mencoder, ffmpeg, dvdauthor, imagemagick +Description: tools for creating video DVDs, VCDs, and SVCDs + tovid can convert your video files to the correct format, + generate navigation menus, and create and burn the disc image. + . + This package includes the following scripts: + * tovid + * todisc + * tovid-batch + * tovid-interactive + * tovid-stats + * idvid + +Package: tovidgui +Architecture: all +Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk2.6, tovid (= ${source:Version}) +Description: tools for creating video DVDs, VCDs, and SVCDs - tovid GUI + tovid can convert your video files to the correct format, + generate navigation menus, and create and burn the disc image. + . + This package includes the GUI front end to the tovid utility, + written using the wxWidgets toolkit. + +Package: todiscgui +Architecture: all +Depends: ${python:Depends}, ${misc:Depends}, python-tk, tovid (= ${source:Version}) +Description: tools for creating video DVDs, VCDs, and SVCDs - todisc GUI + tovid can convert your video files to the correct format, + generate navigation menus, and create and burn the disc image. + . + This package includes the GUI front end to the todisc utility, + written using the Tk widget toolkit. + +Package: todraw +Architecture: all +Depends: ${python:Depends}, ${misc:Depends}, python-imaging-tk, tovid (= ${source:Version}) +Description: tools for creating video DVDs, VCDs, and SVCDs - drawing shell + tovid can convert your video files to the correct format, + generate navigation menus, and create and burn the disc image. + . + This package includes the command-line-based paint program "todraw". --- tovid-0.31.orig/debian/pyversions +++ tovid-0.31/debian/pyversions @@ -0,0 +1 @@ +2.4- --- tovid-0.31.orig/debian/watch +++ tovid-0.31/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://code.google.com/p/tovid/downloads/list http://tovid.googlecode.com/files/tovid-([\d\.]*)\.tar\.gz --- tovid-0.31.orig/debian/tovidgui.manpages +++ tovid-0.31/debian/tovidgui.manpages @@ -0,0 +1 @@ +debian/man/tovidgui.1 --- tovid-0.31.orig/debian/compat +++ tovid-0.31/debian/compat @@ -0,0 +1 @@ +6 --- tovid-0.31.orig/debian/tovid.install +++ tovid-0.31/debian/tovid.install @@ -0,0 +1,26 @@ +debian/tmp/usr/share/icons +debian/tmp/usr/share/man +debian/tmp/usr/lib/python* +debian/tmp/usr/bin/genvid usr/share/tovid +debian/tmp/usr/bin/previd usr/share/tovid +debian/tmp/usr/bin/pyidvid usr/share/tovid +debian/tmp/usr/bin/pymakemenu usr/share/tovid +debian/tmp/usr/bin/pytovid usr/share/tovid +debian/tmp/usr/bin/ripframes usr/share/tovid +debian/tmp/usr/bin/todisc-fade-routine usr/share/tovid +debian/tmp/usr/bin/tovid-init usr/share/tovid +debian/tmp/usr/bin/tovid-test usr/share/tovid +debian/tmp/usr/bin/toyoutube usr/share/tovid +debian/tmp/usr/bin/makedvd usr/share/tovid +debian/tmp/usr/bin/makemenu usr/share/tovid +debian/tmp/usr/bin/makeslides usr/share/tovid +debian/tmp/usr/bin/makevcd usr/share/tovid +debian/tmp/usr/bin/makexml usr/share/tovid +debian/tmp/usr/bin/postproc usr/share/tovid +debian/tmp/usr/bin/pymakexml usr/share/tovid +debian/tmp/usr/bin/idvid +debian/tmp/usr/bin/todisc +debian/tmp/usr/bin/tovid +debian/tmp/usr/bin/tovid-batch +debian/tmp/usr/bin/tovid-interactive +debian/tmp/usr/bin/tovid-stats --- tovid-0.31.orig/debian/copyright +++ tovid-0.31/debian/copyright @@ -0,0 +1,40 @@ +This package was debianized by Maia Kozheva on +Thu, 24 Jan 2008 22:04:40 +0600. + +It was downloaded from + +Upstream Authors: + + Eric Pierce + Jean-Francois Ouellette + Rainer Unseld + Carl Hall + Joe Friedrichsen + Robert Sohn + +Copyright: + + Copyright © 2005 tovid.org + +License: + + This program 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 program 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is © 2008-2009 Maia Kozheva and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- tovid-0.31.orig/debian/todiscgui.manpages +++ tovid-0.31/debian/todiscgui.manpages @@ -0,0 +1 @@ +debian/man/todiscgui.1 --- tovid-0.31.orig/debian/tovid.manpages +++ tovid-0.31/debian/tovid.manpages @@ -0,0 +1,2 @@ +debian/man/tovid-batch.1 +debian/man/tovid-interactive.1 --- tovid-0.31.orig/debian/rules +++ tovid-0.31/debian/rules @@ -0,0 +1,32 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_INSTALL_DOCS_ALL = + +clean:: + rm -f docs/man/*.1 + +build/tovid:: + for x in docs/man/*.1; do \ + sed -i 's/\([[ ]\)-\([a-z0-9]\)/\1\\-\2/g' $$x; \ + sed -i 's/\.SS/.SH/g' $$x; \ + sed -i '/.\SH [A-Za-z ]*/ y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' $$x; \ + done + +binary-install/tovid:: + dh_pysupport -ptovid + for x in `find debian/tovid/usr/share/python-support -name *.py`; do \ + sed -i 's/^#!.*//' $$x; \ + done + +binary-install/tovidgui:: + dh_pysupport -ptovidgui + +binary-install/todiscgui:: + dh_pysupport -ptodiscgui + +binary-install/todraw:: + dh_pysupport -ptodraw --- tovid-0.31.orig/debian/todraw.manpages +++ tovid-0.31/debian/todraw.manpages @@ -0,0 +1 @@ +debian/man/todraw.1 --- tovid-0.31.orig/debian/docs +++ tovid-0.31/debian/docs @@ -0,0 +1 @@ +README --- tovid-0.31.orig/debian/README.source +++ tovid-0.31/debian/README.source @@ -0,0 +1,35 @@ +This package uses CDBS (and therefore simple-patchsys.mk) in order to +apply patches to the upstream source. Patches are stored in +debian/patches and their filenames usually end in .patch or .diff . +For further details, see the man page for cdbs-edit-patch. + +All commands described below should be run from the top directory of the +package source tree, unless otherwise stated. + + * To generate the fully patched source, in a form ready for + editing, that would be built to create Debian packages, run: + + make -f debian/rules apply-patches + + Note: It has been proposed that, in future, this should happen + automatically when you run dpkg-source -x on a CDBS + simple-patchsys.mk source package. However, this proposal has + apparently not yet been implemented, so for now you have to do + it yourself like this. + + * To modify the source and save those modifications so that + they will be applied when building the package, pick a + suitably informative patch file name, for example + 01_add_README.source_file.patch, and then run: + + cdbs-edit-patch 01_add_README.source_file.patch + + This will place you in a new shell in a temporary copy of the + source tree. Make your desired modifications to it, and then + exit the shell to create the patch file containing them (this + file will appear in debian/patches). + + * To remove source modifications that are currently being + applied when building the package, run: + + make -f debian/rules reverse-patches --- tovid-0.31.orig/debian/man/tovid-batch.1 +++ tovid-0.31/debian/man/tovid-batch.1 @@ -0,0 +1,28 @@ +.TH tovid-batch "1" "" "" "User Commands" + +.SH NAME +tovid-batch - batch conversion utility for tovid + +.SH SYNOPSIS +.B tovid-batch [tovidoptions] -infiles input_files + +.SH DESCRIPTION +.B tovid-batch +converts a batch of arbitrary video files into (S)VCD/DVD-compliant MPEG format, +suitable for burning to CD/DVD-R for playback on a standalone DVD player. + +.SH OPTIONS +.TP +.B tovidoptions +Any options that \fBtovid(1)\fR accepts. +.TP +.B -infiles +A list of files to convert, separated by spaces. + +.SH "SEE ALSO" +\fBtovid(1)\fR, \fBtovid-interactive(1)\fR + +.SH AUTHOR +For the list of \fBtovid\fR authors, see \fB/usr/share/doc/tovid/copyright\fR. + +This manual page was written by Maia Kozheva for the Ubuntu project (but may be used by others). --- tovid-0.31.orig/debian/man/tovid-interactive.1 +++ tovid-0.31/debian/man/tovid-interactive.1 @@ -0,0 +1,47 @@ +.TH tovid-interactive "1" "" "" "User Commands" + +.SH NAME +tovid-interactive - interactive CLI front end to tovid + +.SH SYNOPSIS +.B tovid-interactive [file] + +.SH DESCRIPTION +.B tovid-interactive +is a simple wizard-like command line front end to \fBtovid(1)\fR, a command line (S)VCD/DVD creator. +.PP +It allows one to create a DVD in seven steps: +.PP +.B 1. +Specify the video file to encode. This step can be omitted with the \fBfile\fR option (see below). +.PP +.B 2. +Specify the format (dvd, half-dvd, dvd-vcd, vcd, svcd). +.PP +.B 3. +Specify the video system (ntsc, pal). +.PP +.B 4. +Specify the aspect ratio (full, wide, panavision). +.PP +.B 5. +Specify whether to normalize the audio. +.TP +.P 6. +Specify custom tovid options, if any. +.PP +.B 7. +Specify the output file name (without the .mpg extension). + +.SH OPTIONS +.TP +.B file +The input file name (optional). + +.SH "SEE ALSO" +\fBtovid(1)\fR, \fBtovid-batch(1)\fR + +.SH AUTHOR +For the list of \fBtovid\fR authors, see \fB/usr/share/doc/tovid/copyright\fR. + +This manual page was written by Maia Kozheva for the Ubuntu project (but may be used by others). --- tovid-0.31.orig/debian/man/todraw.1 +++ tovid-0.31/debian/man/todraw.1 @@ -0,0 +1,27 @@ +.TH tovidraw "1" "" "" "User Commands" + +.SH NAME +todraw - Python drawing shell + +.SH SYNOPSIS +.B todraw + +.SH DESCRIPTION +.B todraw +opens a \fBpython\fR shell that can be used to perform drawing operations, +preview the resulting drawings, and save them in the PNG format. +.PP +For detailed help about supported operations and a list of commands, +type \fBhelp(drawing)\fR from within the \fBtodraw\fR shell. + +.SH OPTIONS +.B todraw +has no options. + +.SH "SEE ALSO" +\fBtovid(1)\fR + +.SH AUTHOR +For the list of \fBtovid\fR authors, see \fB/usr/share/doc/tovid/copyright\fR. + +This manual page was written by Maia Kozheva for the Ubuntu project (but may be used by others). --- tovid-0.31.orig/debian/man/tovidgui.1 +++ tovid-0.31/debian/man/tovidgui.1 @@ -0,0 +1,27 @@ +.TH tovidgui "1" "" "" "User Commands" + +.SH NAME +tovidgui - GUI front end to tovid + +.SH SYNOPSIS +.B tovidgui + +.SH DESCRIPTION +.B tovidgui +is a graphical front end to \fBtovid(1)\fR, a command line (S)VCD/DVD creator. +.PP +.B tovidgui +cannot be used from the command line, as it is wxGTK-based software. +Please run it under X. + +.SH OPTIONS +.B tovidgui +has no options. + +.SH "SEE ALSO" +\fBtovid(1)\fR, \fBtodiscgui(1)\fR + +.SH AUTHOR +For the list of \fBtovid\fR authors, see \fB/usr/share/doc/tovid/copyright\fR. + +This manual page was written by Maia Kozheva for the Ubuntu project (but may be used by others). --- tovid-0.31.orig/debian/man/todiscgui.1 +++ tovid-0.31/debian/man/todiscgui.1 @@ -0,0 +1,27 @@ +.TH todiscgui "1" "" "" "User Commands" + +.SH NAME +todiscgui - GUI front end to todisc + +.SH SYNOPSIS +.B todiscgui + +.SH DESCRIPTION +.B todiscgui +is a graphical front end to \fBtodisc(1)\fR, a command line (S)VCD/DVD creator. +.PP +.B todiscgui +cannot be used from the command line, as it is Tk-based software. +Please run it under X. + +.SH OPTIONS +.B todiscgui +has no options. + +.SH "SEE ALSO" +\fBtodisc(1)\fR, \fBtovidgui(1)\fR + +.SH AUTHOR +For the list of \fBtovid\fR authors, see \fB/usr/share/doc/tovid/copyright\fR. + +This manual page was written by Maia Kozheva for the Ubuntu project (but may be used by others). --- tovid-0.31.orig/debian/patches/05_makemenu_man_apostrophes.diff +++ tovid-0.31/debian/patches/05_makemenu_man_apostrophes.diff @@ -0,0 +1,14 @@ +diff -Nur -x '*.orig' -x '*~' tovid-0.31/docs/src/en/makemenu.t2t tovid-0.31.new/docs/src/en/makemenu.t2t +--- tovid-0.31/docs/src/en/makemenu.t2t 2009-05-17 02:08:55.000000000 +0700 ++++ tovid-0.31.new/docs/src/en/makemenu.t2t 2009-05-17 02:09:34.000000000 +0700 +@@ -88,8 +88,8 @@ + Sets the size of the menu title. + + : **-fontdeco** **'**//FONTDECORATION//**'** +- Sets the font decoration method to //FONTDECORATION//. It is used by the +- 'convert' ImageMagick command to draw the menu text. You can add colored ++ Sets the font decoration method to //FONTDECORATION//. It is used by ++ the 'convert' ImageMagick command to draw the menu text. You can add colored + text outlines, gradient fills, and many others. See **Usage notes**. + + : **-align** {**left**|**center**|**middle**|**right**} --- tovid-0.31.orig/debian/patches/04_name_sections.diff +++ tovid-0.31/debian/patches/04_name_sections.diff @@ -0,0 +1,132 @@ +diff -Nur -x '*.orig' -x '*~' tovid-0.31/docs/src/en/idvid.t2t tovid-0.31.new/docs/src/en/idvid.t2t +--- tovid-0.31/docs/src/en/idvid.t2t 2009-05-17 02:05:25.000000000 +0700 ++++ tovid-0.31.new/docs/src/en/idvid.t2t 2009-05-17 02:05:32.000000000 +0700 +@@ -3,7 +3,7 @@ + + ==Name== + +-idvid: Identify videos, their codecs, and compliance with (S)VCD/DVD specs. ++idvid - Identify videos, their codecs, and compliance with (S)VCD/DVD specs. + + + ==Description== +diff -Nur -x '*.orig' -x '*~' tovid-0.31/docs/src/en/makedvd.t2t tovid-0.31.new/docs/src/en/makedvd.t2t +--- tovid-0.31/docs/src/en/makedvd.t2t 2009-05-17 02:05:25.000000000 +0700 ++++ tovid-0.31.new/docs/src/en/makedvd.t2t 2009-05-17 02:05:32.000000000 +0700 +@@ -3,7 +3,7 @@ + + ==Name== + +-makedvd: Create and burn a DVD image from either XML input or a directory. ++makedvd - Create and burn a DVD image from either XML input or a directory. + + + ==Description== +diff -Nur -x '*.orig' -x '*~' tovid-0.31/docs/src/en/makemenu.t2t tovid-0.31.new/docs/src/en/makemenu.t2t +--- tovid-0.31/docs/src/en/makemenu.t2t 2009-05-17 02:05:25.000000000 +0700 ++++ tovid-0.31.new/docs/src/en/makemenu.t2t 2009-05-17 02:05:32.000000000 +0700 +@@ -3,7 +3,7 @@ + + ==Name== + +-makemenu: Create (S)VCD/DVD-compliant text menus ++makemenu - Create (S)VCD/DVD-compliant text menus + + + ==Description== +diff -Nur -x '*.orig' -x '*~' tovid-0.31/docs/src/en/makeslides.t2t tovid-0.31.new/docs/src/en/makeslides.t2t +--- tovid-0.31/docs/src/en/makeslides.t2t 2009-05-17 02:05:25.000000000 +0700 ++++ tovid-0.31.new/docs/src/en/makeslides.t2t 2009-05-17 02:05:32.000000000 +0700 +@@ -3,7 +3,7 @@ + + ==Name== + +-makeslides: Convert images into still-frame MPEG video for (S)VCD ++makeslides - Convert images into still-frame MPEG video for (S)VCD + + + ==Usage== +diff -Nur -x '*.orig' -x '*~' tovid-0.31/docs/src/en/makevcd.t2t tovid-0.31.new/docs/src/en/makevcd.t2t +--- tovid-0.31/docs/src/en/makevcd.t2t 2009-05-17 02:05:25.000000000 +0700 ++++ tovid-0.31.new/docs/src/en/makevcd.t2t 2009-05-17 02:05:32.000000000 +0700 +@@ -3,7 +3,7 @@ + + ==Name== + +-makevcd: Create and burn an (S)VCD image from an XML description file ++makevcd - Create and burn an (S)VCD image from an XML description file + + + ==Description== +diff -Nur -x '*.orig' -x '*~' tovid-0.31/docs/src/en/makexml.t2t tovid-0.31.new/docs/src/en/makexml.t2t +--- tovid-0.31/docs/src/en/makexml.t2t 2009-05-17 02:05:25.000000000 +0700 ++++ tovid-0.31.new/docs/src/en/makexml.t2t 2009-05-17 02:05:32.000000000 +0700 +@@ -3,7 +3,7 @@ + + ==Name== + +-makexml: Generate a video disc structure XML description ++makexml - Generate a video disc structure XML description + + + ==Description== +diff -Nur -x '*.orig' -x '*~' tovid-0.31/docs/src/en/postproc.t2t tovid-0.31.new/docs/src/en/postproc.t2t +--- tovid-0.31/docs/src/en/postproc.t2t 2009-05-17 02:05:25.000000000 +0700 ++++ tovid-0.31.new/docs/src/en/postproc.t2t 2009-05-17 02:05:32.000000000 +0700 +@@ -3,7 +3,7 @@ + + ==Name== + +-postproc: Re-sync or re-quantize an MPEG file ++postproc - Re-sync or re-quantize an MPEG file + + + ==Description== +diff -Nur -x '*.orig' -x '*~' tovid-0.31/docs/src/en/pymakexml.t2t tovid-0.31.new/docs/src/en/pymakexml.t2t +--- tovid-0.31/docs/src/en/pymakexml.t2t 2009-05-17 02:05:25.000000000 +0700 ++++ tovid-0.31.new/docs/src/en/pymakexml.t2t 2009-05-17 02:05:32.000000000 +0700 +@@ -3,7 +3,7 @@ + + ==Name== + +-pymakexml: Generate a video disc structure XML description ++pymakexml - Generate a video disc structure XML description + + + ==Description== +diff -Nur -x '*.orig' -x '*~' tovid-0.31/docs/src/en/todisc.t2t tovid-0.31.new/docs/src/en/todisc.t2t +--- tovid-0.31/docs/src/en/todisc.t2t 2009-05-17 02:05:32.000000000 +0700 ++++ tovid-0.31.new/docs/src/en/todisc.t2t 2009-05-17 02:05:32.000000000 +0700 +@@ -3,7 +3,7 @@ + + == Name == + +-todisc: Create a DVD with animated menus ++todisc - Create a DVD with animated menus + + + == Description == +diff -Nur -x '*.orig' -x '*~' tovid-0.31/docs/src/en/tovid-stats.t2t tovid-0.31.new/docs/src/en/tovid-stats.t2t +--- tovid-0.31/docs/src/en/tovid-stats.t2t 2007-07-15 21:31:47.000000000 +0700 ++++ tovid-0.31.new/docs/src/en/tovid-stats.t2t 2009-05-17 02:06:38.000000000 +0700 +@@ -3,7 +3,7 @@ + + ==Name== + +-tovid-stats: Display summarized statistics of tovid encodings ++tovid-stats - Display summarized statistics of tovid encodings + + + ==Description== +diff -Nur -x '*.orig' -x '*~' tovid-0.31/docs/src/en/tovid.t2t tovid-0.31.new/docs/src/en/tovid.t2t +--- tovid-0.31/docs/src/en/tovid.t2t 2007-08-01 09:47:49.000000000 +0700 ++++ tovid-0.31.new/docs/src/en/tovid.t2t 2009-05-17 02:06:31.000000000 +0700 +@@ -3,7 +3,7 @@ + + ==Name== + +-tovid: Convert video to (S)VCD/DVD format ++tovid - Convert video to (S)VCD/DVD format + + + ==Description== --- tovid-0.31.orig/debian/patches/03_sox_sample_size_fix.diff +++ tovid-0.31/debian/patches/03_sox_sample_size_fix.diff @@ -0,0 +1,12 @@ +--- tovid/src/todisc 2009-05-06 14:20:15.832861943 +0200 ++++ tovid/src/todisc 2009-05-06 13:57:13.719861209 +0200 +@@ -5243,7 +5243,7 @@ + BG_AUDIO_LENGTH="-t $MENU_ATIME" + # create audio background for the main menu + if [[ -z "$BG_AUDIO" || "$BG_AUDIO" = "none" ]]; then # no audio: use silence +- cat /dev/zero 2>/dev/null | nice -n 0 sox -t raw -c 2 -r 48000 -w \ ++ cat /dev/zero 2>/dev/null | nice -n 0 sox -t raw -c 2 -r 48000 -2 \ + -s - $WORK_DIR/intro.wav trim 0 $MENU_ATIME + # Make sure file exists + elif test ! -s "$BG_AUDIO"; then + --- tovid-0.31.orig/debian/patches/03_desktop_files.diff +++ tovid-0.31/debian/patches/03_desktop_files.diff @@ -0,0 +1,49 @@ +diff -ur tovid-0.31~/todiscgui.desktop tovid-0.31/todiscgui.desktop +--- tovid-0.31~/todiscgui.desktop 2007-07-15 21:31:56.000000000 +0700 ++++ tovid-0.31/todiscgui.desktop 2008-02-10 20:42:01.000000000 +0600 +@@ -1,18 +1,12 @@ + [Desktop Entry] + Name=todisc GUI + Type=Application +-Path= + Exec=todiscgui +-Icon=tovid.svg +-Terminal=true ++Icon=tovid ++Terminal=false + GenericName=frontend for todisc + GenericName[en_US]=frontend for todisc + Comment=Author videos to DVD or SVCD + Comment[en_US]=Author videos to DVD or SVCD +-Categories=AudioVideo;Video +-MimeType= ++Categories=AudioVideo;Video; + StartupNotify=true +-TerminalOptions= +-X-DCOP-ServiceType= +-X-KDE-SubstituteUID=false +-X-KDE-Username= +diff -ur tovid-0.31~/tovidgui.desktop tovid-0.31/tovidgui.desktop +--- tovid-0.31~/tovidgui.desktop 2007-07-15 21:31:56.000000000 +0700 ++++ tovid-0.31/tovidgui.desktop 2008-02-10 20:42:07.000000000 +0600 +@@ -2,18 +2,13 @@ + Version=1.0 + Name=tovid GUI + Type=Application +-Path= + Exec=tovidgui +-Icon=tovid.svg ++Icon=tovid + Terminal=false + GenericName=DVD/(S)VCD Maker + GenericName[en_US]=DVD/(S)VCD Maker + Comment=Author videos to DVD or (S)VCD + Comment[en_US]=Author videos to DVD or (S)VCD +-Categories=AudioVideo;Video;DiscBurning +-MimeType= ++Categories=GTK;AudioVideo;Video;DiscBurning; + StartupNotify=true +-TerminalOptions= +-X-DCOP-ServiceType= + X-KDE-SubstituteUID=false +-X-KDE-Username= --- tovid-0.31.orig/debian/patches/02_todisc_manpage.diff +++ tovid-0.31/debian/patches/02_todisc_manpage.diff @@ -0,0 +1,43 @@ +diff -ur tovid-0.31~/docs/src/en/todisc.t2t tovid-0.31/docs/src/en/todisc.t2t +--- tovid-0.31~/docs/src/en/todisc.t2t 2007-08-20 02:20:13.000000000 +0700 ++++ tovid-0.31/docs/src/en/todisc.t2t 2008-01-25 12:51:18.000000000 +0600 +@@ -290,20 +281,21 @@ + chapters. + + Example for passing just number of chapters ( 4 videos ): +-``` ++ + -chapters 5 2 4 8 +-``` + + Example of passing chapter points ( 4 videos ): +-``` +- -chapters 00:00:00,00:05:34.41,00:12:54,00:20:45 00:00:00,00:04:25.623,00:09:12,00:15:51 \ +- 00:00:00,00:05:10,00:13:41,00:18:13.033 00:00:00,00:15:23.342,00:26:42.523 +-``` ++ ++ -chapters 00:00:00,00:05:34.41,00:12:54,00:20:45 \ ++ 00:00:00,00:04:25.623,00:09:12,00:15:51 \ ++ 00:00:00,00:05:10,00:13:41,00:18:13.033 \ ++ 00:00:00,00:15:23.342,00:26:42.523 + + Example of passing grouped chapters using the '+' seperator: +-``` +- -chapters 00:00:00,00:05:34.41,00:12:54,00:20:45+00:04:23,00:09:35 00:00:00...etc +-``` ++ ++ -chapters \ ++ 00:00:00,00:05:34.41,00:12:54,00:20:45+00:04:23,00:09:35 \ ++ 00:00:00...etc + + : **-seek** NUM | "NUM1 NUM2 NUM3 . . ." + Seek to NUM seconds before generating thumbnails (default: 2.0 seconds) +@@ -412,7 +402,7 @@ + GEOMETRY. (default: no wave) + "default" will produce a wave arg of -20x556, which + produces a gentle wave with a small amount of distortion. +- See: http://www.cit.gu.edu.au/~anthony/graphics/imagick6/distorts/#wave if you want ++ See: http://www.imagemagick.org/Usage/distorts/#wave if you want + to try other values + : **-showcase-framestyle** none|glass + For -showcase-* style template only --- tovid-0.31.orig/debian/patches/01_paths.diff +++ tovid-0.31/debian/patches/01_paths.diff @@ -0,0 +1,167 @@ +diff -ur tovid-0.31~/src/idvid tovid-0.31/src/idvid +--- tovid-0.31~/src/idvid 2008-01-25 22:20:12.000000000 +0600 ++++ tovid-0.31/src/idvid 2008-01-28 13:48:36.000000000 +0600 +@@ -1,4 +1,5 @@ + #!/usr/bin/env bash ++PATH=/usr/share/tovid:$PATH + #set -u + + ME="[idvid]:" +diff -ur tovid-0.31~/src/makedvd tovid-0.31/src/makedvd +--- tovid-0.31~/src/makedvd 2008-01-25 22:20:12.000000000 +0600 ++++ tovid-0.31/src/makedvd 2008-01-28 13:48:52.000000000 +0600 +@@ -1,4 +1,5 @@ + #!/usr/bin/env bash ++PATH=/usr/share/tovid:$PATH + ME="[makedvd]:" + . tovid-init + +diff -ur tovid-0.31~/src/makemenu tovid-0.31/src/makemenu +--- tovid-0.31~/src/makemenu 2008-01-25 22:20:12.000000000 +0600 ++++ tovid-0.31/src/makemenu 2008-01-28 13:48:25.000000000 +0600 +@@ -1,4 +1,5 @@ + #!/usr/bin/env bash ++PATH=/usr/share/tovid:$PATH + ME="[makemenu]:" + . tovid-init + +diff -ur tovid-0.31~/src/makeslides tovid-0.31/src/makeslides +--- tovid-0.31~/src/makeslides 2008-01-25 22:20:12.000000000 +0600 ++++ tovid-0.31/src/makeslides 2008-01-28 13:49:01.000000000 +0600 +@@ -1,4 +1,5 @@ + #!/usr/bin/env bash ++PATH=/usr/share/tovid:$PATH + ME="[makeslides]:" + . tovid-init + +diff -ur tovid-0.31~/src/makevcd tovid-0.31/src/makevcd +--- tovid-0.31~/src/makevcd 2008-01-25 22:20:12.000000000 +0600 ++++ tovid-0.31/src/makevcd 2008-01-28 13:49:29.000000000 +0600 +@@ -1,4 +1,5 @@ + #!/usr/bin/env bash ++PATH=/usr/share/tovid:$PATH + ME="[makevcd]:" + . tovid-init + +diff -ur tovid-0.31~/src/makexml tovid-0.31/src/makexml +--- tovid-0.31~/src/makexml 2008-01-25 22:20:12.000000000 +0600 ++++ tovid-0.31/src/makexml 2008-01-28 13:49:44.000000000 +0600 +@@ -1,4 +1,5 @@ + #!/usr/bin/env bash ++PATH=/usr/share/tovid:$PATH + ME="[makexml]:" + . tovid-init + +diff -ur tovid-0.31~/src/postproc tovid-0.31/src/postproc +--- tovid-0.31~/src/postproc 2008-01-25 22:20:12.000000000 +0600 ++++ tovid-0.31/src/postproc 2008-01-28 13:49:54.000000000 +0600 +@@ -1,4 +1,5 @@ + #!/usr/bin/env bash ++PATH=/usr/share/tovid:$PATH + ME="[postproc]:" + . tovid-init + +diff -ur tovid-0.31~/src/previd tovid-0.31/src/previd +--- tovid-0.31~/src/previd 2008-01-25 22:20:12.000000000 +0600 ++++ tovid-0.31/src/previd 2008-01-28 13:50:04.000000000 +0600 +@@ -1,4 +1,5 @@ + #!/usr/bin/env bash ++PATH=/usr/share/tovid:$PATH + ME="[previd]:" + . tovid-init + +diff -ur tovid-0.31~/src/todisc tovid-0.31/src/todisc +--- tovid-0.31~/src/todisc 2008-01-25 22:20:12.000000000 +0600 ++++ tovid-0.31/src/todisc 2008-01-28 13:50:16.000000000 +0600 +@@ -1,4 +1,5 @@ + #!/usr/bin/env bash ++PATH=/usr/share/tovid:$PATH + ME="[todisc]:" + . tovid-init + # todisc +diff -ur tovid-0.31~/src/tovid tovid-0.31/src/tovid +--- tovid-0.31~/src/tovid 2008-01-25 22:20:12.000000000 +0600 ++++ tovid-0.31/src/tovid 2008-01-28 13:50:28.000000000 +0600 +@@ -1,4 +1,5 @@ + #!/usr/bin/env bash ++PATH=/usr/share/tovid:$PATH + ME="[tovid]:" + . tovid-init + +diff -ur tovid-0.31~/src/tovid-batch tovid-0.31/src/tovid-batch +--- tovid-0.31~/src/tovid-batch 2008-01-25 22:20:12.000000000 +0600 ++++ tovid-0.31/src/tovid-batch 2008-01-28 13:50:37.000000000 +0600 +@@ -1,4 +1,5 @@ + #!/usr/bin/env bash ++PATH=/usr/share/tovid:$PATH + ME="[tovid-batch]:" + . tovid-init + +diff -ur tovid-0.31~/src/tovid-init.in tovid-0.31/src/tovid-init.in +--- tovid-0.31~/src/tovid-init.in 2008-01-25 22:20:12.000000000 +0600 ++++ tovid-0.31/src/tovid-init.in 2008-01-28 13:48:11.000000000 +0600 +@@ -425,7 +425,7 @@ + # Only count tovids that are different versions + for tovid in $INSTALLED_TOVIDS; do + tovid_PREFIX=$(dirname $tovid) +- tovid_VERSION=$(grep TOVID_VERSION $tovid_PREFIX/tovid-init | \ ++ tovid_VERSION=$(grep TOVID_VERSION /usr/share/tovid/tovid-init | \ + awk -F '"' '{print $2}') + INSTALLED_VERS="$INSTALLED_VERS $tovid_VERSION" + done +diff -ur tovid-0.31~/src/tovid-interactive tovid-0.31/src/tovid-interactive +--- tovid-0.31~/src/tovid-interactive 2008-01-25 22:20:12.000000000 +0600 ++++ tovid-0.31/src/tovid-interactive 2008-01-28 13:51:06.000000000 +0600 +@@ -1,4 +1,5 @@ + #!/usr/bin/env bash ++PATH=/usr/share/tovid:$PATH + ME="[tovid-interactive]:" + . tovid-init + +diff -ur tovid-0.31~/src/tovid-test tovid-0.31/src/tovid-test +--- tovid-0.31~/src/tovid-test 2008-01-25 22:20:12.000000000 +0600 ++++ tovid-0.31/src/tovid-test 2008-01-28 13:51:15.000000000 +0600 +@@ -1,4 +1,5 @@ + #!/usr/bin/env bash ++PATH=/usr/share/tovid:$PATH + ME="[tovid-test]:" + . tovid-init + +diff -ur tovid-0.31~/libtovid/gui/panels.py tovid-0.31/libtovid/gui/panels.py +--- tovid-0.31~/libtovid/gui/panels.py 2007-07-15 21:31:54.000000000 +0700 ++++ tovid-0.31/libtovid/gui/panels.py 2008-02-04 00:31:00.000000000 +0600 +@@ -464,7 +464,7 @@ + "", "", "*.*", wx.SAVE | wx.OVERWRITE_PROMPT) + if outFileDlg.ShowModal() == wx.ID_OK: + outFile = outFileDlg.GetPath() +- commandList = "#!/usr/bin/env bash\n" ++ commandList = "#!/usr/bin/env bash\nPATH=/usr/share/tovid:$PATH\n" + success = True + + for eachCommand in self.strCmdQueue: +diff -ur tovid-0.31~/src/todiscgui tovid-0.31/src/todiscgui +--- tovid-0.31~/src/todiscgui 2007-08-20 08:27:36.000000000 +0700 ++++ tovid-0.31/src/todiscgui 2008-02-04 00:46:15.000000000 +0600 +@@ -35,6 +35,9 @@ + """ + + import os ++ ++os.putenv('PATH', '/usr/share/tovid:' + os.getenv('PATH')) ++ + def to_title(filename): + basename = os.path.basename(filename) + firstdot = basename.find('.') +diff -ur tovid-0.31~/src/tovidgui tovid-0.31/src/tovidgui +--- tovid-0.31~/src/tovidgui 2007-07-15 21:31:46.000000000 +0700 ++++ tovid-0.31/src/tovidgui 2008-02-04 00:45:36.000000000 +0600 +@@ -20,6 +20,9 @@ + + import sys + import traceback ++import os ++ ++os.putenv('PATH', '/usr/share/tovid:' + os.getenv('PATH')) + + # Try to import wx 2.6; print error if it's unavailable + try: --- tovid-0.31.orig/debian/patches/07_todisc_progress_meter_fix.patch +++ tovid-0.31/debian/patches/07_todisc_progress_meter_fix.patch @@ -0,0 +1,21 @@ +diff -Nur -x '*.orig' -x '*~' tovid-0.31/src/todisc tovid-0.31.new/src/todisc +--- tovid-0.31/src/todisc 2009-10-18 14:17:11.929483765 +0200 ++++ tovid-0.31.new/src/todisc 2009-10-18 14:18:23.237484432 +0200 +@@ -3959,7 +3959,7 @@ + NAV_SEEK[i]="--nav_seek" + NAVSEEK[i]=${IN_FILES[i]}.nav_log + fi +- TRANSCODE_CMD2=(nice transcode --print_status 10 \ ++ TRANSCODE_CMD2=(nice transcode --progress_meter 10 \ + --write_pid $WORK_DIR/tcode$i.pid -q 1 -i "${IN_FILES[i]}" \ + -c ${SEEK_FRAMES[i]}-$((${SEEK_FRAMES[i]} + $FRAMES)) ${NAV_SEEK[i]} "${NAVSEEK[i]}" \ + -o "$WORK_DIR/pics/$i/" -f $FRAME_RATE -Z $THUMB_SIZE $EXPORT) +@@ -4432,7 +4432,7 @@ + yecho "Creating $TOTAL_JPEGS chapter images for "${IN_FILES[i]}"" + yecho + for t in "${cmd[@]}"; do +- TCODE_CMD=(nice transcode --print_status 10 --write_pid $WORK_DIR/tcode$i.pid \ ++ TCODE_CMD=(nice transcode --progress_meter 10 --write_pid $WORK_DIR/tcode$i.pid \ + -q 1 -i "${IN_FILES[i]}" ${NAV_SEEK[i]} "${NAVSEEK[i]}" \ + -o "${PICS_OUT[@]}" -f $FRAME_RATE -Z ${GEO_ARRAY[C]},fast -c $t -y $SM_IMG_FMT,null) + echo "Running ${TCODE_CMD[@]}" | --- tovid-0.31.orig/debian/patches/06_svn-r2494_fix_nav_log_parsing.patch +++ tovid-0.31/debian/patches/06_svn-r2494_fix_nav_log_parsing.patch @@ -0,0 +1,17 @@ +# Fix parsing of nav_log for # of frames +# Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/tovid/+bug/392735 +# Upstream bug: http://code.google.com/p/tovid/issues/detail?id=53 +# Upstream commit: http://code.google.com/p/tovid/source/detail?spec=svn2782&r=2494 + +diff -Nur -x '*.orig' -x '*~' tovid-0.31/src/idvid tovid-0.31.new/src/idvid +--- tovid-0.31/src/idvid 2009-09-04 02:45:01.277240930 +0100 ++++ tovid-0.31.new/src/idvid 2009-09-04 02:45:57.228240512 +0100 +@@ -379,7 +379,7 @@ + fi + $VERBOSE && echo "$MENCODER_STATS" + elif $USE_NAVLOG; then +- ID_VIDEO_FRAMES=$(awk '{ field = $2 }; END{ print field }' < "${INFILE}".nav_log) ++ ID_VIDEO_FRAMES=$(awk 'END{print NR}' "${INFILE}.nav_log") + V_DUR=$(bc <<< "$ID_VIDEO_FRAMES / $ID_VIDEO_FPS") + V_DURATION=${V_DUR%%.*} # final value is integer ( seconds ) + fi