[SCM] tsdecrypt/master: Remove 0002-manpage, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Apr 21 07:30:11 UTC 2012


The following commit has been merged in the master branch:
commit 3306c7cd754c7f9561175c7c0fe047741ae4cec9
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Apr 21 09:25:31 2012 +0200

    Remove 0002-manpage, applied upstream.

diff --git a/debian/patches/0002-manpage.patch b/debian/patches/0002-manpage.patch
deleted file mode 100644
index c8b8749..0000000
--- a/debian/patches/0002-manpage.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Description: Several improvements to the manpage.
- Correct mispellings.
- Escape "-" to be used as minus sign.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: georgi at unixsol.org
----
- tsdecrypt.1 |   26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
---- tsdecrypt.orig/tsdecrypt.1
-+++ tsdecrypt/tsdecrypt.1
-@@ -1,6 +1,6 @@
- .TH TSDECRYPT "1" "April 2012" "tsdecrypt 8.0" "User Commands"
- .SH NAME
--tsdecrypt - Decrypt mpeg transport stream.
-+tsdecrypt \- Decrypt mpeg transport stream.
- .SH SYNOPSIS
- .B tsdecrypt
- [\fIoptions\fR]
-@@ -15,7 +15,7 @@ over tcp) protocol or newcamd protocol.
- .PP
- .TP
- \fB\-i\fR, \fB\-\-ident\fR <ident>
--Set ident that will be used when logging to syslog. The prefered format
-+Set ident that will be used when logging to syslog. The preferred format
- for the ident is PROVIDER/CHANNEL.
- .TP
- \fB\-d\fR, \fB\-\-daemon\fR <pidfile>
-@@ -68,8 +68,8 @@ Show program help.
- .PP
- .TP
- \fB\-I\fR, \fB\-\-input\fR <source>
--Where to read from. tsdecrypt supports input from files (-I file.ts or -I -)
--or multicast (-I 224.0.0.1:5000). By default tsdecrypt reads from \fBstdin\fR.
-+Where to read from. tsdecrypt supports input from files (\-I file.ts or \-I \-)
-+or multicast (\-I 224.0.0.1:5000). By default tsdecrypt reads from \fBstdin\fR.
- .TP
- \fB\-R\fR, \fB\-\-input\-rtp\fR
- When reading from multicast assume the input is RTP stream. NOTE: No RTP
-@@ -91,7 +91,7 @@ Use this option to delay the decoding fo
- allows tsdecrypt to decode services even if OSCAM returns code word too late.
- For example SkyUK sends code words ~700 ms before it starts using them. This
- means that if OSCAM is unable to return code word in less than 700 ms the
--decryption will fail for a small amount of time. Setting --input-buffer 1000
-+decryption will fail for a small amount of time. Setting \-\-input\-buffer 1000
- will solve the problem in this case.
- .TP
- \fB\-W\fR, \fB\-\-input\-dump\fR <filename>
-@@ -99,14 +99,14 @@ Save input stream in <filename>. If the
- the data without RTP headers (pure mpeg transport stream). Easiest way to
- save the input is using command line like the following:
- 
--tsdecrypt -I 239.78.78.78:5000 -O /dev/null -s 0.0.0.0 -W file.ts
-+tsdecrypt \-I 239.78.78.78:5000 \-O /dev/null \-s 0.0.0.0 \-W file.ts
- .TP
- .SH OUTPUT OPTIONS
- .PP
- .TP
- \fB\-O\fR, \fB\-\-output\fR <dest>
- Output decrypted stream to <dest>. Destination can be multicast address
--(-O 239.0.0.1:5000) or a file (-O file.ts). The default output is \fBstdout\fR.
-+(\-O 239.0.0.1:5000) or a file (\-O file.ts). The default output is \fBstdout\fR.
- .TP
- \fB\-o\fR, \fB\-\-output\-intf\fR <addr>
- Set multicast output interface.
-@@ -118,7 +118,7 @@ Set multicast ttl. The default value is
- Set TOS value of output packets. The default is not to set any specific TOS.
- .TP
- \fB\-r\fR, \fB\-\-output\-rtp\fR
--Enable RTP output. The default output is standart MPEG TS over UDP, this
-+Enable RTP output. The default output is standard MPEG TS over UDP, this
- option enables tsdecrypt to output RTP packets.
- .TP
- \fB\-k\fR, \fB\-\-output\-rtp\-ssrc\fR <ssrc>
-@@ -130,13 +130,13 @@ PAT/PMT/SDT and data packets are left in
- mentioned in PMT like NIT, EIT, TDT tables and unknown pids is removed.
- .TP
- \fB\-y\fR, \fB\-\-output\-nit\-pass\fR
--Pass throught NIT packets when output filtering is enabled.
-+Pass through NIT packets when output filtering is enabled.
- .TP
- \fB\-w\fR, \fB\-\-output\-eit\-pass\fR
--Pass throught EIT (EPG) packets when output filtering is enabled.
-+Pass through EIT (EPG) packets when output filtering is enabled.
- .TP
- \fB\-x\fR, \fB\-\-output\-tdt\-pass\fR
--Pass throught TDT/TOT packets when output filtering is enabled.
-+Pass through TDT/TOT packets when output filtering is enabled.
- .TP
- .SH CA OPTIONS
- .PP
-@@ -203,7 +203,7 @@ always chooses the first stream from the
- \fB\-E\fR, \fB\-\-emm\-only\fR <hierarchy>
- Disable ECM processing and stream output. This option is useful if the EMM
- stream has very high rate and is interfering with ECM processing. Using
----emm-only you can run special tsdecrypt dedicated only to card auto update.
-+\-\-emm\-only you can run special tsdecrypt dedicated only to card auto update.
- .TP
- \fB\-f\fR, \fB\-\-emm\-report\-time\fR <seconds>
- Set interval for EMM reports. The default is \fB60\fR seconds. Set to \fB0\fR
-@@ -216,7 +216,7 @@ to disable EMM reports.
- Set ECM pid manually. This option is useful for services that have
- couple of ECM streams from one CA system. Without this option tsdecrypt
- always chooses the first stream from the chosen CA system. Run tsdecrypt
--with --debug 2 and look at CA descriptors in PMT to see what CA streams
-+with \-\-debug 2 and look at CA descriptors in PMT to see what CA streams
- are available.
- .TP
- \fB\-H\fR, \fB\-\-ecm\-report\-time\fR <seconds>

-- 
tsdecrypt packaging



More information about the pkg-multimedia-commits mailing list