[SCM] liblivemedia/master: Refresh 022_safe_setlocale.diff patch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dd41a9812f61fb908f3ee794d6ed5ebfb81534c6
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Apr 16 11:07:38 2011 +0200

    Refresh 022_safe_setlocale.diff patch.

diff --git a/debian/patches/022_safe_setlocale.diff b/debian/patches/022_safe_setlocale.diff
index 59a87bd..37a98db 100644
--- a/debian/patches/022_safe_setlocale.diff
+++ b/debian/patches/022_safe_setlocale.diff
@@ -1,8 +1,15 @@
 Copyright (C) 2008 Rémi Denis-Courmont, adaptation by Felix Kühne (C) 2009.
 Licensed under GNU General Public License version 2 or higher.
---- a/liveMedia/include/Locale.hh
-+++ b/liveMedia/include/Locale.hh
-@@ -27,23 +27,26 @@
+---
+ liveMedia/Locale.cpp        |   13 ++++++-------
+ liveMedia/RTSPClient.cpp    |    8 ++++----
+ liveMedia/RTSPCommon.cpp    |    2 +-
+ liveMedia/include/Locale.hh |   17 ++++++++++-------
+ 4 files changed, 21 insertions(+), 19 deletions(-)
+
+--- liblivemedia.orig/liveMedia/include/Locale.hh
++++ liblivemedia/liveMedia/include/Locale.hh
+@@ -27,23 +27,26 @@ along with this library; if not, write t
  
  #ifndef LOCALE_NOT_USED
  #include <locale.h>
@@ -36,9 +43,9 @@ Licensed under GNU General Public License version 2 or higher.
  };
  
  #endif
---- a/liveMedia/Locale.cpp
-+++ b/liveMedia/Locale.cpp
-@@ -22,19 +22,18 @@
+--- liblivemedia.orig/liveMedia/Locale.cpp
++++ liblivemedia/liveMedia/Locale.cpp
+@@ -22,19 +22,18 @@ along with this library; if not, write t
  #include "Locale.hh"
  #include <strDup.hh>
  
@@ -64,9 +71,9 @@ Licensed under GNU General Public License version 2 or higher.
    }
  #endif
  }
---- a/liveMedia/RTSPClient.cpp
-+++ b/liveMedia/RTSPClient.cpp
-@@ -486,7 +486,7 @@
+--- liblivemedia.orig/liveMedia/RTSPClient.cpp
++++ liblivemedia/liveMedia/RTSPClient.cpp
+@@ -469,7 +469,7 @@ static char* createScaleString(float sca
      // This is the default value; we don't need a "Scale:" header:
      buf[0] = '\0';
    } else {
@@ -75,7 +82,7 @@ Licensed under GNU General Public License version 2 or higher.
      sprintf(buf, "Scale: %f\r\n", scale);
    }
  
-@@ -500,11 +500,11 @@
+@@ -483,11 +483,11 @@ static char* createRangeString(double st
      buf[0] = '\0';
    } else if (end < 0) {
      // There's no end time:
@@ -89,7 +96,7 @@ Licensed under GNU General Public License version 2 or higher.
      sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
    }
  
-@@ -932,7 +932,7 @@
+@@ -919,7 +919,7 @@ Boolean RTSPClient::parseTransportParams
  }
  
  Boolean RTSPClient::parseScaleParam(char const* paramStr, float& scale) {
@@ -98,12 +105,12 @@ Licensed under GNU General Public License version 2 or higher.
    return sscanf(paramStr, "%f", &scale) == 1;
  }
  
---- a/liveMedia/RTSPCommon.cpp
-+++ b/liveMedia/RTSPCommon.cpp
-@@ -136,7 +136,7 @@
- 
+--- liblivemedia.orig/liveMedia/RTSPCommon.cpp
++++ liblivemedia/liveMedia/RTSPCommon.cpp
+@@ -137,7 +137,7 @@ Boolean parseRTSPRequestString(char cons
  Boolean parseRangeParam(char const* paramStr, double& rangeStart, double& rangeEnd) {
    double start, end;
+   int numCharsMatched = 0;
 -  Locale l("C", LC_NUMERIC);
 +  Locale l("C", LC_NUMERIC_MASK);
    if (sscanf(paramStr, "npt = %lf - %lf", &start, &end) == 2) {

-- 
liblivemedia packaging