[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=555943b

The following commit has been merged in the master branch:
commit 555943bce9a5fe3a1a9f7097c353432b84e7df50
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Apr 22 09:41:33 2010 +0000

    update
---
 config/FindMSGFMT.cmake | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/config/FindMSGFMT.cmake b/config/FindMSGFMT.cmake
index 40c6634..0c06bfe 100644
--- a/config/FindMSGFMT.cmake
+++ b/config/FindMSGFMT.cmake
@@ -59,7 +59,7 @@ MACRO(UPDATE_TRANSLATIONS _baseName)
         SET(_out  "${CMAKE_CURRENT_SOURCE_DIR}/${_file_we}.po")
         SET(_ref "${CMAKE_CURRENT_SOURCE_DIR}/${_baseName}.pot")
         ADD_CUSTOM_COMMAND(OUTPUT ${_out}
-                           COMMAND ${MSGMERGE_EXECUTABLE} -o ${_out} ${_ref}
+                           COMMAND ${MSGMERGE_EXECUTABLE} ${_out} ${_ref}
                            DEPENDS ${_ref})
         SET(_outputs ${_outputs} ${_out})
     ENDFOREACH(_file)
@@ -73,14 +73,15 @@ MACRO(ADD_TRANSLATIONS _baseName)
         GET_FILENAME_COMPONENT(_file_we ${_file} NAME_WE)
         SET(_out "${CMAKE_CURRENT_BINARY_DIR}/${_file_we}.gmo")
         SET(_in  "${CMAKE_CURRENT_SOURCE_DIR}/${_file_we}.po")
-        ADD_CUSTOM_COMMAND(OUTPUT ${_out}
-                           COMMAND ${MSGFMT_EXECUTABLE} --verbose ${_out} ${_in}
-                           DEPENDS ${_in})
+        ADD_CUSTOM_COMMAND(
+            OUTPUT ${_out}
+            COMMAND ${MSGFMT_EXECUTABLE} -o ${_out} ${_in}
+            DEPENDS ${_in} )
         INSTALL(FILES ${_out}
-                DESTINATION ${LOCALEDIR}/${_file_we}/LC_MESSAGES/
-                RENAME ${_baseName}.mo)
+            DESTINATION ${LOCALEDIR}/${_file_we}/LC_MESSAGES/
+            RENAME ${_baseName}.mo )
         SET(_outputs ${_outputs} ${_out})
     ENDFOREACH(_file)
-    SET(MSGFMT_TARGET add_translations_${_baseName})
+    SET(MSGFMT_TARGET translations${_baseName})
     ADD_CUSTOM_TARGET(${MSGFMT_TARGET} ALL DEPENDS ${_outputs})
 ENDMACRO(ADD_TRANSLATIONS)

-- 
exiv2 packaging