[SCM] transcode packaging branch, master, updated. debian/1.1.3-0.0ubuntu1-17-g31e15d3

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 55e8db92f25498b8ebfc75234623046ac1dc1c4f
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Fri Aug 28 13:00:26 2009 +0200

    Revert splitting out of transcode-utils, it saves neither pulled in Depends nor disc space (only around 700kB).

diff --git a/debian/control b/debian/control
index 657ff6f..b4ae43b 100644
--- a/debian/control
+++ b/debian/control
@@ -49,6 +49,7 @@ Recommends: sox,
             twolame,
             transcode-doc
 Suggests: xvid4conf
+Replaces: transcode-utils
 Description: Text console video-stream processing tool
  Transcode is a text console video-stream processing tool. It supports
  elementary video and audio frame transformations. Some example modules are
@@ -58,22 +59,6 @@ Description: Text console video-stream processing tool
  A set of tools is available to extract and decode the sources into raw
  video/audio streams for import and to enable post-processing of AVI files.
 
-Package: transcode-utils
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Replaces: transcode (<= 3:1.1.2-0.0)
-Description: Text console video-stream processing tool (additional utilities)
- Transcode is a text console video-stream processing tool. It supports
- elementary video and audio frame transformations. Some example modules are
- included to enable import of MPEG-1/2, Digital Video, and other formats. It
- also includes export modules for writing to AVI files with DivX, OpenDivX,
- XviD, Digital Video or other codecs. Direct DVD transcoding is also supported.
- A set of tools is available to extract and decode the sources into raw
- video/audio streams for import and to enable post-processing of AVI files.
- .
- This package contains additional utilities.
-
 Package: transcode-doc
 Section: doc
 Architecture: all
diff --git a/debian/transcode-utils.install b/debian/transcode-utils.install
deleted file mode 100644
index ad0ba89..0000000
--- a/debian/transcode-utils.install
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/bin/avisync
-usr/share/man/man1/avisync.1
-usr/bin/avisplit
-usr/share/man/man1/avisplit.1
-usr/bin/avimerge
-usr/share/man/man1/avimerge.1
-usr/bin/aviindex
-usr/share/man/man1/aviindex.1
-usr/bin/avifix
-usr/share/man/man1/avifix.1

-- 
transcode packaging