[SCM] liblivemedia/master: Refresh patches.

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

The following commit has been merged in the master branch:
commit 69a0b49188889cdfc87f8f8346b448bb3991b11d
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Nov 30 22:46:10 2010 +0100

    Refresh patches.

diff --git a/debian/patches/021_ip_mreq_source.diff b/debian/patches/021_ip_mreq_source.diff
index fe9f260..5519509 100644
--- a/debian/patches/021_ip_mreq_source.diff
+++ b/debian/patches/021_ip_mreq_source.diff
@@ -1,8 +1,6 @@
-Index: liblivemedia/groupsock/GroupsockHelper.cpp
-===================================================================
---- liblivemedia.orig/groupsock/GroupsockHelper.cpp	2010-04-20 23:23:06.000000000 +0100
-+++ liblivemedia/groupsock/GroupsockHelper.cpp	2010-04-20 23:23:40.000000000 +0100
-@@ -470,12 +470,14 @@
+--- a/groupsock/GroupsockHelper.cpp
++++ b/groupsock/GroupsockHelper.cpp
+@@ -399,12 +399,14 @@
  // commands, and a special structure (ip_mreq_source).  If the include files
  // didn't define these, we do so here:
  #if !defined(IP_ADD_SOURCE_MEMBERSHIP)
diff --git a/debian/patches/022_safe_setlocale.diff b/debian/patches/022_safe_setlocale.diff
index e9acb0e..59a87bd 100644
--- a/debian/patches/022_safe_setlocale.diff
+++ b/debian/patches/022_safe_setlocale.diff
@@ -1,8 +1,7 @@
 Copyright (C) 2008 Rémi Denis-Courmont, adaptation by Felix Kühne (C) 2009.
 Licensed under GNU General Public License version 2 or higher.
-diff -urN live.orig/liveMedia/include/Locale.hh live/liveMedia/include/Locale.hh
---- live.orig/liveMedia/include/Locale.hh	2009-03-23 01:26:16 +0300
-+++ live/liveMedia/include/Locale.hh	2009-03-26 19:17:43 +0300
+--- a/liveMedia/include/Locale.hh
++++ b/liveMedia/include/Locale.hh
 @@ -27,23 +27,26 @@
  
  #ifndef LOCALE_NOT_USED
@@ -37,9 +36,8 @@ diff -urN live.orig/liveMedia/include/Locale.hh live/liveMedia/include/Locale.hh
  };
  
  #endif
-diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
---- live.orig/liveMedia/Locale.cpp	2009-03-23 01:26:16 +0300
-+++ live/liveMedia/Locale.cpp	2009-03-26 19:17:43 +0300
+--- a/liveMedia/Locale.cpp
++++ b/liveMedia/Locale.cpp
 @@ -22,19 +22,18 @@
  #include "Locale.hh"
  #include <strDup.hh>
@@ -66,9 +64,9 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
    }
  #endif
  }
---- live.orig/liveMedia/RTSPClient.cpp	2010-03-16 03:09:46.000000000 +0100
-+++ live/liveMedia/RTSPClient.cpp	2010-08-24 15:04:31.000000000 +0200
-@@ -1019,7 +1019,7 @@
+--- a/liveMedia/RTSPClient.cpp
++++ b/liveMedia/RTSPClient.cpp
+@@ -486,7 +486,7 @@
      // This is the default value; we don't need a "Scale:" header:
      buf[0] = '\0';
    } else {
@@ -77,7 +75,7 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
      sprintf(buf, "Scale: %f\r\n", scale);
    }
  
-@@ -1033,11 +1033,11 @@
+@@ -500,11 +500,11 @@
      buf[0] = '\0';
    } else if (end < 0) {
      // There's no end time:
@@ -91,9 +89,7 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
      sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
    }
  
---- live/liveMedia/RTSPClient.cpp	2010-08-24 17:05:46.000000000 +0200
-+++ live.new/liveMedia/RTSPClient.cpp	2010-08-24 17:04:50.000000000 +0200
-@@ -935,7 +935,7 @@
+@@ -932,7 +932,7 @@
  }
  
  Boolean RTSPClient::parseScaleParam(char const* paramStr, float& scale) {
@@ -102,8 +98,8 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
    return sscanf(paramStr, "%f", &scale) == 1;
  }
  
---- live/liveMedia/RTSPCommon.cpp.orig	2010-08-22 03:25:03.000000000 +0200
-+++ live/liveMedia/RTSPCommon.cpp	2010-08-24 17:06:36.000000000 +0200
+--- a/liveMedia/RTSPCommon.cpp
++++ b/liveMedia/RTSPCommon.cpp
 @@ -136,7 +136,7 @@
  
  Boolean parseRangeParam(char const* paramStr, double& rangeStart, double& rangeEnd) {

-- 
liblivemedia packaging