[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=34f58e9

The following commit has been merged in the master branch:
commit 34f58e9ed4c1d52068498f32c124bd33cffacb7b
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Apr 22 07:33:52 2010 +0000

    manage update translation file command
---
 config/FindMSGFMT.cmake | 40 +++++++++++++++++++++++++++++++++++++---
 po/CMakeLists.txt       |  1 +
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/config/FindMSGFMT.cmake b/config/FindMSGFMT.cmake
index ee9ea08..40c6634 100644
--- a/config/FindMSGFMT.cmake
+++ b/config/FindMSGFMT.cmake
@@ -1,12 +1,14 @@
 # - FindMSGFMT.cmake for Hugin 0.7
 # file taken from rosegarden
 #
-# Find the gnu gettext msgfmt program and define
+# Find the gnu gettext msgfmt and msgmerge programs and define
 # a macro that calls it to add message translations
 #
 # Defined variables:
 #  MSGFMT_FOUND
 #  MSGFMT_EXECUTABLE
+#  MSGMERGE_FOUND
+#  MSGMERGE_EXECUTABLE
 #
 # Macro:
 #  ADD_TRANSLATIONS
@@ -33,6 +35,38 @@ ELSE(MSGFMT_EXECUTABLE)
     MARK_AS_ADVANCED(MSGFMT_EXECUTABLE)
 ENDIF (MSGFMT_EXECUTABLE)
 
+IF(MSGMERGE_EXECUTABLE)
+    SET(MSGMERGE_FOUND TRUE)
+ELSE(MSGMERGE_EXECUTABLE)
+    FIND_PROGRAM(MSGMERGE_EXECUTABLE NAMES msgmerge gmsgmerge msgmerge.exe
+                                     PATHS /bin /usr/bin /usr/local/bin c:/MinGW/bin ${SOURCE_BASE_DIR}/gettext/bin)
+    IF(MSGMERGE_EXECUTABLE)
+        SET(MSGMERGE_FOUND TRUE)
+    ELSE(MSGMERGE_EXECUTABLE)
+        IF(NOT MSGMERGE_FIND_QUIETLY)
+            IF(MSGMERGE_FIND_REQUIRED)
+                MESSAGE(FATAL_ERROR "msgmerge program couldn't be found")
+            ENDIF(MSGMERGE_FIND_REQUIRED)
+        ENDIF(NOT MSGMERGE_FIND_QUIETLY)
+    ENDIF(MSGMERGE_EXECUTABLE)
+    MARK_AS_ADVANCED(MSGMERGE_EXECUTABLE)
+ENDIF (MSGMERGE_EXECUTABLE)
+
+MACRO(UPDATE_TRANSLATIONS _baseName)
+    SET(_outputs)
+    FOREACH(_file ${ARGN})
+        GET_FILENAME_COMPONENT(_file_we ${_file} NAME_WE)
+        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}
+                           DEPENDS ${_ref})
+        SET(_outputs ${_outputs} ${_out})
+    ENDFOREACH(_file)
+    SET(MSGMERGE_TARGET update_translations_${_baseName})
+    ADD_CUSTOM_TARGET(${MSGMERGE_TARGET} ALL DEPENDS ${_outputs})
+ENDMACRO(UPDATE_TRANSLATIONS)
+
 MACRO(ADD_TRANSLATIONS _baseName)
     SET(_outputs)
     FOREACH(_file ${ARGN})
@@ -40,13 +74,13 @@ MACRO(ADD_TRANSLATIONS _baseName)
         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} -o ${_out} ${_in}
+                           COMMAND ${MSGFMT_EXECUTABLE} --verbose ${_out} ${_in}
                            DEPENDS ${_in})
         INSTALL(FILES ${_out}
                 DESTINATION ${LOCALEDIR}/${_file_we}/LC_MESSAGES/
                 RENAME ${_baseName}.mo)
         SET(_outputs ${_outputs} ${_out})
     ENDFOREACH(_file)
-    SET(MSGFMT_TARGET translations${_baseName})
+    SET(MSGFMT_TARGET add_translations_${_baseName})
     ADD_CUSTOM_TARGET(${MSGFMT_TARGET} ALL DEPENDS ${_outputs})
 ENDMACRO(ADD_TRANSLATIONS)
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index dad0ffa..1ca8b71 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -32,6 +32,7 @@
 # automatically include all po files in the directory
 FILE(GLOB PO_FILES *.po)
 
+UPDATE_TRANSLATIONS(exiv2 ${PO_FILES})
 ADD_TRANSLATIONS(exiv2 ${PO_FILES})
 
 ADD_CUSTOM_TARGET( pot-update

-- 
exiv2 packaging