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

[Thomas Weber]

The following commit has been merged in the master branch:
commit e5e3db1083f1006844274be88295941a3a483371
Author: Thomas Weber <tweber at debian.org>
Date:   Sat Jun 12 23:37:39 2010 +0200

    Drop patch: generate_qm_files

diff --git a/debian/changelog b/debian/changelog
index 9c5e0ac..4987f9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtoctave (0.9.2+svn255-1) UNRELEASED; urgency=low
 
   * Package upstream SVN snapshot which contains rename qtinfo =>
     qtoctave-info-reader (closes: #584858)
+  * Dropped patches (applied upstream)
+    - generate_qm_files
 
  -- Thomas Weber <tweber at debian.org>  Sat, 12 Jun 2010 22:16:49 +0200
 
diff --git a/debian/patches/generate_qm_files b/debian/patches/generate_qm_files
deleted file mode 100644
index d6ed337..0000000
--- a/debian/patches/generate_qm_files
+++ /dev/null
@@ -1,49 +0,0 @@
-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 8637f16..a635829 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 use_octave_htmldoc
 build-out-of-source
-generate_qm_files
 install-supplementary-docs
 build-widgetserver

-- 
qtoctave