[Pkg-voip-commits] [janus] 13/37: Drop patches 0002 0003: Adopted upstream.

Jonas Smedegaard dr at jones.dk
Mon Mar 13 19:14:32 UTC 2017 

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository janus.

commit 1ff37d177f490647baa4d29ffc4565913735f669
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Mar 12 14:24:28 2017 +0100

    Drop patches 0002 0003: Adopted upstream.
---
 debian/patches/0002-fix-typo.patch |  16 ---
 debian/patches/0003-manpages.patch | 207 -------------------------------------
 debian/patches/series              |   2 -
 3 files changed, 225 deletions(-)

diff --git a/debian/patches/0002-fix-typo.patch b/debian/patches/0002-fix-typo.patch
deleted file mode 100644
index 5b97b71..0000000
--- a/debian/patches/0002-fix-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix typo thanks to lintian: Recieved → Received
-Author: Victor Seva <linuxmaniac at torreviejawireless.org>
-Forwarded: no
-Last-Update: 2017-02-05
-
---- a/ice.c
-+++ b/ice.c
-@@ -1955,7 +1955,7 @@
- 					for (;;) {
- 						last_seqs_len++;
- 						if(cur_seq->seq == new_seqn) {
--							JANUS_LOG(LOG_HUGE, "[%"SCNu64"] Recieved missed sequence number %"SCNu16"\n", handle->handle_id, cur_seq->seq);
-+							JANUS_LOG(LOG_HUGE, "[%"SCNu64"] Received missed sequence number %"SCNu16"\n", handle->handle_id, cur_seq->seq);
- 							cur_seq->state = SEQ_RECVED;
- 						} else if(cur_seq->state == SEQ_MISSING && now - cur_seq->ts > SEQ_MISSING_WAIT) {
- 							JANUS_LOG(LOG_HUGE, "[%"SCNu64"] Missed sequence number %"SCNu16", sending 1st NACK\n", handle->handle_id, cur_seq->seq);
diff --git a/debian/patches/0003-manpages.patch b/debian/patches/0003-manpages.patch
deleted file mode 100644
index 90df027..0000000
--- a/debian/patches/0003-manpages.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-Description: Add manpages for janus and janus-pp-rec
-Origin: upstream, https://github.com/meetecho/janus-gateway/commit/9c27f40
-Author: Lorenzo Miniero <lminiero at gmail.com>
-Forwarded: yes
-Bug: https://github.com/meetecho/janus-gateway/issues/723
-Last-Update: 2017-02-05
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -128,6 +128,8 @@
- 	$(JANUS_MANUAL_LIBS) \
- 	$(NULL)
- 
-+man1_MANS = janus.1
-+
- BUILT_SOURCES = cmdline.c cmdline.h
- 
- cmdline.c: janus.ggo
-@@ -325,6 +327,7 @@
- 
- if ENABLE_POST_PROCESSING
- bin_PROGRAMS += janus-pp-rec
-+man1_MANS += postprocessing/janus-pp-rec.1
- 
- janus_pp_rec_SOURCES = \
- 	postprocessing/pp-g711.c \
---- /dev/null
-+++ b/janus.1
-@@ -0,0 +1,129 @@
-+.TH JANUS 1
-+.SH NAME
-+janus \- WebRTC server/gateway
-+.SH SYNOPSIS
-+.B janus
-+[options]
-+.SH DESCRIPTION
-+.B janus
-+is a WebRTC server/gateway developed by Meetecho conceived to be a general purpose one. As such, it doesn't provide any functionality per se other than implementing the means to set up a WebRTC media communication with a browser or application, exchanging JSON messages with it over different transports, and relaying RTP/RTCP and messages between clients and the server-side application logic they're attached to. Any specific feature/application is provided by server side plugins, that br [...]
-+.TP
-+The reason for this is simple: we wanted something that would have a small footprint (hence a C implementation) and that we could only equip with what was really needed (hence pluggable modules). That is, something that would allow us to deploy either a full-fledged WebRTC server on the cloud, or a small nettop/box to handle a specific use case.
-+.SH OPTIONS
-+.TP
-+.BR \-h ", " \-\-help
-+Print help and exit
-+.TP
-+.BR \-V ", " \-\-version
-+Print version and exit
-+.TP
-+.BR \-b ", " \-\-daemon
-+Launch Janus in background as a daemon (default=off)
-+.TP
-+.BR \-p ", " \-\-pid-file=\fIpath\fR
-+Open the specified PID file when starting Janus (default=none)
-+.TP
-+.BR \-N ", " \-\-disable-stdout
-+Disable stdout based logging (default=off)
-+.TP
-+.BR \-L ", " \-\-log-file=\fIpath\fR
-+Log to the specified file (default=stdout only)
-+.TP
-+.BR \-i ", " \-\-interface=\fIipaddress\fR
-+Interface to use (will be the public IP)
-+.TP
-+.BR \-P ", " \-\-plugins-folder=\fIpath\fR
-+Plugins folder (default=./plugins)
-+.TP
-+.BR \-C ", " \-\-config=\fIfilename\fR
-+Configuration file to use
-+.TP
-+.BR \-F ", " \-\-configs-folder=\fIpath\fR
-+Configuration files folder (default=./conf)
-+.TP
-+.BR \-c ", " \-\-cert-pem=\fIfilename\fR
-+DTLS certificate
-+.TP
-+.BR \-k ", " \-\-cert-key=\fIfilename\fR
-+DTLS certificate key
-+.TP
-+.BR \-S ", " \-\-stun-server=\fIip:port\fR
-+STUN server(:port) to use, if needed (e.g., gateway behind NAT, default=none)
-+.TP
-+.BR \-1 ", " \-\-nat-1-1=\fIip\fR
-+Public IP to put in all host candidates, assuming a 1:1 NAT is in place (e.g., Amazon EC2 instances, default=none)
-+.TP
-+.BR \-E ", " \-\-ice-enforce-list=\fIlist\fR
-+Comma-separated list of the only interfaces to use for ICE gathering; partial strings are supported (e.g., eth0 or eno1,wlan0, default=none)
-+.TP
-+.BR \-X ", " \-\-ice-ignore-list=\fIlist\fR
-+Comma-separated list of interfaces or IP addresses to ignore for ICE gathering; partial strings are supported (e.g., vmnet8,192.168.0.1,10.0.0.1 or vmnet,192.168., default=vmnet)
-+.TP
-+.BR \-6 ", " \-\-ipv6-candidates
-+Whether to enable IPv6 candidates or not (experimental) (default=off)
-+.TP
-+.BR \-l ", " \-\-libnice-debug
-+Whether to enable libnice debugging or not (default=off)
-+.TP
-+.BR \-I ", " \-\-ice-lite
-+Whether to enable the ICE Lite mode or not (default=off)
-+.TP
-+.BR \-T ", " \-\-ice-tcp
-+Whether to enable ICE-TCP or not (warning: only works with ICE Lite) (default=off)
-+.TP
-+.BR \-U ", " \-\-force-bundle
-+Whether to force BUNDLE or not (whether audio, video and data will always be bundled) (default=off)
-+.TP
-+.BR \-u ", " \-\-force-rtcp-mux
-+Whether to force rtcp-mux or not (whether RTP and RTCP will always be muxed) (default=off)
-+.TP
-+.BR \-q ", " \-\-max-nack-queue=\fInumber\fR
-+Maximum size of the NACK queue per user for retransmissions
-+.TP
-+.BR \-r ", " \-\-rtp-port-range=\fImin\-max\fR
-+Port range to use for RTP/RTCP
-+.TP
-+.BR \-n ", " \-\-server-name=\fIname\fR
-+Public name of this Janus instance (default=MyJanusInstance)
-+.TP
-+.BR \-d ", " \-\-debug-level=\fI1\-7\fR
-+Debug/logging level (0=disable debugging, 7=maximum debug level; default=4)
-+.TP
-+.BR \-D ", " \-\-debug-timestamps
-+Enable debug/logging timestamps (default=off)
-+.TP
-+.BR \-o ", " \-\-disable-colors
-+Disable color in the logging (default=off)
-+.TP
-+.BR \-a ", " \-\-apisecret=\fIrandomstring\fR
-+API secret all requests need to pass in order to be accepted by Janus (useful when wrapping Janus API requests in a server, none by default)
-+.TP
-+.BR \-A ", " \-\-token-auth
-+Enable token-based authentication for all requests (default=off)
-+.TP
-+.BR \-e ", " \-\-event-handlers
-+Enable event handlers (default=off)
-+.SH EXAMPLES
-+\fBjanus\fR \- Launch Janus with all options from configurations files
-+.TP
-+\fBjanus \-b \-L /tmp/januslog\fR \- Launch Janus as a daemon and log to the specified file
-+.TP
-+\fBjanus \-6\fR \- Launch Janus with IPv6 support enabled
-+.TP
-+\fBjanus \-u \-U\fR \- Launch Janus with rtcpmux and BUNDLE always forced on
-+.SH BUGS
-+.TP
-+If you think you found a bug or want to contribute a feature, you can issue or a pull request on https://github.com/meetecho/janus-gateway/issues.
-+.TP
-+Anyway, before doing that make sure you read the documentation at http://janus.conf.meetecho.com/docs/ and that it has not been discussed already at https://groups.google.com/forum/#!forum/meetecho-janus. We only use Github for code issues, and \fBNOT\fR for configuration or usage issues: use the group for that.
-+.SH SEE ALSO
-+.TP
-+https://github.com/meetecho/janus-gateway \- Official repository
-+.TP
-+http://janus.conf.meetecho.com \- Demos and documentation
-+.TP
-+https://groups.google.com/forum/#!forum/meetecho-janus \- Community
-+.TP
-+http://www.meetecho.com/blog/ \- Tutorials and blog posts on Janus
-+.SH AUTHORS
-+Lorenzo Miniero (lorenzo at meetecho.com)
---- /dev/null
-+++ b/postprocessing/janus-pp-rec.1
-@@ -0,0 +1,46 @@
-+.TH JANUS-PP-REC 1
-+.SH NAME
-+janus-pp-rec \- Janus recordings post-processing utility.
-+.SH SYNOPSIS
-+.B janus-pp-rec
-+[\fB\-\-header\fR \fIsource.mjr\fR]
-+[\fB\-\-parse\fR \fIsource.mjr\fR]
-+.IR source.mjr
-+.IR destination.[opus|wav|webm|mp4|srt]
-+.SH DESCRIPTION
-+.B janus-pp-rec
-+is a simple utility that allows you to post-process recordings generated by Janus plugins (e.g., VideoRoom or others). More specifically, since Janus recordings (.mjr files) are basically a structured dump of RTP packets, this utility reorders them all and extracts the frames in order to stick them together and save them to a playable media file. No transcoding is done.
-+.TP
-+The target file depends on the codec used in the recording: for instance, VP8 and VP9 frames can only be converted to a .webm file, while H.264 frames can only be converted to a .mp4 file. Right now, you can convert VP8/VP9 recordings to .webm, H.264 recordings to .mp4, G.711 recordings to .wav, Opus recordings to .opus and Data Channel recordings to .srt.
-+.SH OPTIONS
-+.TP
-+.BR \-h ", " \-\-help
-+Print help and exit
-+.TP
-+.BR \-\-header\ \fIsource.mjr\fR
-+Only parse the recording header and then exit
-+.TP
-+.BR \-\-parse\ \fIsource.mjr\fR
-+Only parse the recording header and reorder the packets, and then exit
-+.SH EXAMPLES
-+\fBjanus-pp-rec \-\-header rec1234.mjr\fR \- Parse the recordings header (shows metadata info)
-+.TP
-+\fBjanus-pp-rec \-\-parse rec1234.mjr\fR \- Parse the recordings packets without processing them
-+.TP
-+\fBjanus-pp-rec rec1234.mjr rec1234.webm\fR \- Convert a VP8 .mjr recording to a .webm file
-+.SH BUGS
-+.TP
-+If you think you found a bug or want to contribute a feature, you can issue or a pull request on https://github.com/meetecho/janus-gateway/issues.
-+.TP
-+Anyway, before doing that make sure you read the documentation at http://janus.conf.meetecho.com/docs/ and that it has not been discussed already at https://groups.google.com/forum/#!forum/meetecho-janus. We only use Github for code issues, and \fBNOT\fR for configuration or usage issues: use the group for that.
-+.SH SEE ALSO
-+.TP
-+https://github.com/meetecho/janus-gateway \- Official repository
-+.TP
-+http://janus.conf.meetecho.com \- Demos and documentation
-+.TP
-+https://groups.google.com/forum/#!forum/meetecho-janus \- Community
-+.TP
-+http://www.meetecho.com/blog/ \- Tutorials and blog posts on Janus
-+.SH AUTHORS
-+Lorenzo Miniero (lorenzo at meetecho.com)
diff --git a/debian/patches/series b/debian/patches/series
index cf725dd..005bc02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-disable-demos.patch
-0002-fix-typo.patch
-0003-manpages.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git

More information about the Pkg-voip-commits mailing list