[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=964b9e7

The following commit has been merged in the master branch:
commit 964b9e77060c5ff1b4398502b07a77308b347e0e
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Nov 3 17:37:22 2012 +0000

    Issue: #865.  Thank you Mario for the patch.
---
 src/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index fab7ca7..cbbd957 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -201,7 +201,7 @@ $(EXIV2OBJ): %.o: %.cpp
 
 %.ii: %.cpp
 	set -e; \
-	$(CXXCPP) $(CPPFLAGS) -DEXV_BUILDING_LIB=1 $< | sed '/^[ 	]*$$/d' > $@
+	$(CXXCPP) $(CPPFLAGS) -DEXV_BUILDING_LIB=1 $< | LC_ALL=C sed '/^[ 	]*$$/d' > $@
 
 # ******************************************************************************
 # Targets
@@ -219,7 +219,7 @@ endif
 $(SRC): exv_conf.h
 
 exv_conf.h: $(top_srcdir)/config/config.h
-	sed 's/#define \([A-Z]\)/#define EXV_
/; s/#undef \([A-Z]\)/#undef EXV_
/' < $< > $@
+	LC_ALL=C sed 's/#define \([A-Z]\)/#define EXV_
/; s/#undef \([A-Z]\)/#undef EXV_
/' < $< > $@
 
 $(LIBTOOL): $(LIBTOOL_DEPS)
 	$(SHELL) $(top_srcdir)/config.status --recheck

-- 
exiv2 packaging