[SCM] multicat packaging branch, master, updated. debian/1.0-1-3-g4c116f9

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

The following commit has been merged in the master branch:
commit 3483eddef6cab261afb607f554ea9afdeeeb62cd
Author: Rémi Duraffort <ivoire at videolan.org>
Date:   Tue Aug 24 19:17:08 2010 +0200

    Some patches to add a missing license and fix some typos.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 8e96d07..1ee58fc 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,4 @@
 [git-buildpackage]
 pristine-tar = True
 compression = bzip2
+ignore-new = True
diff --git a/debian/patches/01_add_misssing_license.diff b/debian/patches/01_add_misssing_license.diff
new file mode 100644
index 0000000..40a67e4
--- /dev/null
+++ b/debian/patches/01_add_misssing_license.diff
@@ -0,0 +1,25 @@
+Add missing license.
+
+--- multicat-1.0.orig/desaggregartp.c	2010-08-24 18:58:23.996665425 +0200
++++ multicat-1.0/desaggregartp.c	2010-08-24 19:07:48.944603901 +0200
+@@ -5,6 +5,20 @@
+  * $Id: desaggregartp.c 48 2007-11-30 14:08:21Z cmassiot $
+  *
+  * Authors: Christophe Massiot <massiot at via.ecp.fr>
++ *
++ * 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.
+  *****************************************************************************/
+ 
+ #include <stdlib.h>
diff --git a/debian/patches/02_add_missing_option.diff b/debian/patches/02_add_missing_option.diff
new file mode 100644
index 0000000..a62ee45
--- /dev/null
+++ b/debian/patches/02_add_missing_option.diff
@@ -0,0 +1,13 @@
+Add a missing option to the usage message.
+
+--- multicat-1.0.orig/desaggregartp.c	2010-08-24 19:10:57.627577724 +0200
++++ multicat-1.0/desaggregartp.c	2010-08-24 19:09:20.735564978 +0200
+@@ -81,7 +81,7 @@
+ 
+ static void usage(void)
+ {
+-    msg_Raw( NULL, "Usage: desaggregartp [-i <RT priority>] [-b <buffer length>] [-U] [-m <mtu>] <src host 1> ... [<src host N>] <dest host>" );
++    msg_Raw( NULL, "Usage: desaggregartp [-i <RT priority>] [-t <ttl>] [-b <buffer length>] [-U] [-m <mtu>] <src host 1> ... [<src host N>] <dest host>" );
+     msg_Raw( NULL, "    host format: [<connect addr>[:<connect port>]][@[<bind addr][:<bind port>]]" );
+     msg_Raw( NULL, "    -U: strip RTP header" );
+     msg_Raw( NULL, "    -b: buffer length in ms" );
diff --git a/debian/patches/03_fix_typo.diff b/debian/patches/03_fix_typo.diff
new file mode 100644
index 0000000..a36d6c1
--- /dev/null
+++ b/debian/patches/03_fix_typo.diff
@@ -0,0 +1,17 @@
+Fix a typo in the usage message.
+
+--- multicat-1.0.orig/aggregartp.c	2010-08-24 18:58:23.992567278 +0200
++++ multicat-1.0/aggregartp.c	2010-08-23 20:24:38.297002502 +0200
+@@ -59,10 +59,10 @@
+ 
+ static void usage(void)
+ {
+-    msg_Raw( NULL, "Usage: aggregartp [-i <RT priority>] [-t <ttl>] [-w] [-s <SSRC IP>] [-U] [-m <mtu>] @<src host> <dest host 1>[,<weight 1>] ... [<dest host N>,<weight N>]" );
++    msg_Raw( NULL, "Usage: aggregartp [-i <RT priority>] [-t <ttl>] [-w] [-o <SSRC IP>] [-U] [-m <mtu>] @<src host> <dest host 1>[,<weight 1>] ... [<dest host N>,<weight N>]" );
+     msg_Raw( NULL, "    host format: [<connect addr>[:<connect port>]][@[<bind addr][:<bind port>]]" );
+     msg_Raw( NULL, "    -w: overwrite RTP timestamps" );
+-    msg_Raw( NULL, "    -S: overwrite RTP SSRC" );
++    msg_Raw( NULL, "    -o: overwrite RTP SSRC" );
+     msg_Raw( NULL, "    -U: prepend RTP header" );
+     exit(EXIT_FAILURE);
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ff153b2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_add_misssing_license.diff
+02_add_missing_option.diff
+03_fix_typo.diff

-- 
multicat packaging