[Pkg-octave-commit] [SCM] qtoctave branch, master, updated. 1dfa0c6d8de06026de751df9134d37eb77a84e7b

[Thomas Weber]

The following commit has been merged in the master branch:
commit 3767c58c45e6b91f76928e3570d36cb7f3752e0f
Author: Thomas Weber <tweber at debian.org>
Date:   Sun Jun 6 09:03:25 2010 +0200

    New patch: generate_qm_files, ensures that l10n files are built

diff --git a/debian/changelog b/debian/changelog
index 0b495be..733dd95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ qtoctave (0.9.1-1) UNRELEASED; urgency=low
     - install_easyplot_as_target (applied upstream)
   * Bump Standards-Version to 3.8.4 (no changes needed)
   * debian/docs: removed news.txt and LICENSE_GPL.txt
+  * New patches:
+    + generate_qm_files: ensure that l10n files get built
 
   [ Thomas Weber ]
   * debian/control: Remove Rafael Laboissiere from Uploaders (Closes: #571914)
diff --git a/debian/patches/generate_qm_files b/debian/patches/generate_qm_files
new file mode 100644
index 0000000..d6ed337
--- /dev/null
+++ b/debian/patches/generate_qm_files
@@ -0,0 +1,49 @@
+From: Pedro Luis Lucas Rosado <acisif at mixmail.com>
+Subject: Ensure that l10n files get built
+Origin: upstream, https://forja.rediris.es/plugins/scmsvn/viewcvs.php/trunk/qtoctave/src/CMakeLists.txt?root=csl-qtoctave&r1=251&r2=212&diff_format=h
+--- a/qtoctave/src/CMakeLists.txt
++++ b/qtoctave/src/CMakeLists.txt
+@@ -25,9 +25,23 @@
+ 
+ # run moc on these files:
+ QT4_WRAP_CPP( qtoctave_moc_sources ${qtoctave_moc_headers} )
+- 
++
++# Generate qm files if needed
++file(GLOB lang_files "lang/*.ts" GLOB "lang/*.qph")
++foreach(lang_file ${lang_files})
++  get_filename_component(this_qm ${lang_file} NAME_WE)
++  set(this_qm "${this_qm}.qm")
++  add_custom_command(OUTPUT ${this_qm}
++    COMMAND "lrelease"
++    ARGS ${lang_file} -qm "${this_qm}"
++    DEPENDS ${lang_file}
++    )
++  set(qm "${qm};${this_qm}")
++  set(qm_build "${qm_build};${CMAKE_CURRENT_BINARY_DIR}/${this_qm}")
++endforeach()
++
+ add_executable(qtoctave 
+-	${qtoctave_sources} ${qtoctave_moc_sources} ${qtoctave_ui_headers} ${qtoctave_moc_headers}
++	${qtoctave_sources} ${qtoctave_moc_sources} ${qtoctave_ui_headers} ${qtoctave_moc_headers} ${qm}
+ )
+ 
+ SET_TARGET_PROPERTIES(qtoctave
+@@ -39,11 +53,16 @@
+ TARGET_LINK_LIBRARIES(qtoctave ${Qt4_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY})
+ 
+ install (
+-	DIRECTORY images menus scripts scripts_octave lang
++	DIRECTORY images menus scripts scripts_octave
+ 	DESTINATION share/qtoctave
+ 	PATTERN ".svn" EXCLUDE
+         )
+ 
++install(
++  FILES ${qm_build}
++  DESTINATION share/qtoctave/lang
++)
++
+ install (
+ 	DIRECTORY octave_doc
+ 	DESTINATION share/doc/octave-html
diff --git a/debian/patches/series b/debian/patches/series
index 58ca07d..0551598 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use_octave_htmldoc
 build-out-of-source
+generate_qm_files

-- 
qtoctave