[Pkg-voip-commits] [janus] 04/37: Unfuzz patches with shortening quilt options. Tidy patch headers.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository janus.

commit 03c671e22564a1b9c1c84147d9177d237ae13fd6
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Feb 6 13:46:39 2017 +0100

    Unfuzz patches with shortening quilt options. Tidy patch headers.
---
 debian/patches/0001-disable-demos.patch | 20 ++++++--------------
 debian/patches/0002-fix-typo.patch      | 20 +++++---------------
 debian/patches/0003-manpages.patch      | 24 +++++++++---------------
 3 files changed, 20 insertions(+), 44 deletions(-)

diff --git a/debian/patches/0001-disable-demos.patch b/debian/patches/0001-disable-demos.patch
index 513b423..a4a8140 100644
--- a/debian/patches/0001-disable-demos.patch
+++ b/debian/patches/0001-disable-demos.patch
@@ -1,17 +1,11 @@
-From: Victor Seva <vseva at sipwise.com>
-Date: Thu, 29 Dec 2016 11:13:10 +0100
-Subject: disable demos
+Description: Disable demos
+Author: Victor Seva <vseva at sipwise.com>
+Forwarded: no
+Last-Update: 2017-02-05
 
----
- Makefile.am  | 2 +-
- configure.ac | 1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index d4cd0e5..3ec5db1 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -44,7 +44,7 @@ plugin_LTLIBRARIES = $(NULL)
+@@ -44,7 +44,7 @@
  transportdir = $(libdir)/janus/transports
  transport_LTLIBRARIES = $(NULL)
  
@@ -20,11 +14,9 @@ index d4cd0e5..3ec5db1 100644
  html_DATA = README.md
  
  streamdir = $(datadir)/janus/streams
-diff --git a/configure.ac b/configure.ac
-index 3a1771b..3e14dc4 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -486,7 +486,6 @@ AM_CONDITIONAL([ENABLE_POST_PROCESSING], [test "x$enable_post_processing" = "xye
+@@ -486,7 +486,6 @@
  
  AC_CONFIG_FILES([
    Makefile
diff --git a/debian/patches/0002-fix-typo.patch b/debian/patches/0002-fix-typo.patch
index ffacbe8..5b97b71 100644
--- a/debian/patches/0002-fix-typo.patch
+++ b/debian/patches/0002-fix-typo.patch
@@ -1,18 +1,11 @@
-From f121d8723503def9e80d8e8650b481bf1f8d3794 Mon Sep 17 00:00:00 2001
-From: Victor Seva <linuxmaniac at torreviejawireless.org>
-Date: Thu, 29 Dec 2016 11:26:50 +0100
-Subject: [PATCH] fix typo thanks to lintian
+Description: Fix typo thanks to lintian: Recieved → Received
+Author: Victor Seva <linuxmaniac at torreviejawireless.org>
+Forwarded: no
+Last-Update: 2017-02-05
 
-> I: janus: spelling-error-in-binary usr/bin/janus Recieved Received
----
- ice.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ice.c b/ice.c
-index e4f3e1f..36b809b 100644
 --- a/ice.c
 +++ b/ice.c
-@@ -2002,7 +2002,7 @@ void janus_ice_cb_nice_recv(NiceAgent *agent, guint stream_id, guint component_i
+@@ -1955,7 +1955,7 @@
  					for (;;) {
  						last_seqs_len++;
  						if(cur_seq->seq == new_seqn) {
@@ -21,6 +14,3 @@ index e4f3e1f..36b809b 100644
  							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);
--- 
-2.11.0
-
diff --git a/debian/patches/0003-manpages.patch b/debian/patches/0003-manpages.patch
index 3d0ad5f..90df027 100644
--- a/debian/patches/0003-manpages.patch
+++ b/debian/patches/0003-manpages.patch
@@ -1,20 +1,14 @@
-From 8485d0956bd7f383a1ab5c91a8877e3857eeeb8c Mon Sep 17 00:00:00 2001
-From: Lorenzo Miniero <lminiero at gmail.com>
-Date: Mon, 2 Jan 2017 14:38:10 +0100
-Subject: [PATCH] Added manpages for janus and janus-pp-rec (addresses #723)
-
----
- Makefile.am                   |   3 +
- janus.1                       | 129 ++++++++++++++++++++++++++++++++++++++++++
- postprocessing/janus-pp-rec.1 |  46 +++++++++++++++
- 3 files changed, 178 insertions(+)
- create mode 100644 janus.1
- create mode 100644 postprocessing/janus-pp-rec.1
+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
-@@ -129,6 +129,8 @@ janus_LDADD = \
- 	-lsrtp \
+@@ -128,6 +128,8 @@
+ 	$(JANUS_MANUAL_LIBS) \
  	$(NULL)
  
 +man1_MANS = janus.1
@@ -22,7 +16,7 @@ Subject: [PATCH] Added manpages for janus and janus-pp-rec (addresses #723)
  BUILT_SOURCES = cmdline.c cmdline.h
  
  cmdline.c: janus.ggo
-@@ -326,6 +328,7 @@ endif
+@@ -325,6 +327,7 @@
  
  if ENABLE_POST_PROCESSING
  bin_PROGRAMS += janus-pp-rec

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