[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=ff49b11

The following commit has been merged in the master branch:
commit ff49b116b3c0540ec30a374433c86c1a4f89a124
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Dec 3 14:39:08 2006 +0000

    Enclosed i18n initialisation in #ifdef block
---
 src/exiv2.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index 8224d58..b188829 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -110,10 +110,11 @@ namespace {
 // Main
 int main(int argc, char* const argv[])
 {
-    // NLS support.
+#ifdef EXV_ENABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(EXV_PACKAGE, EXV_LOCALEDIR);
     textdomain(EXV_PACKAGE);
+#endif
 
     // Handle command line arguments
     Params& params = Params::instance();

-- 
exiv2 packaging