[ovito] 02/09: 0.9.5-3

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository ovito.

commit 219740e0871000f3c2681e30cdc97b024ff7ac7c
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Mar 2 21:48:22 2014 +0100

    0.9.5-3
---
 debian/changelog                   |  9 ++++
 debian/patches/rcc_config_fix.diff | 90 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 100 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 25c0204..f5bf66a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ovito (0.9.5-3) unstable; urgency=low
+
+  * QA upload.
+  * Add debian/patches/rcc_config_fix.diff (Closes: #730890)
+    - Cherrypick of upstream git version of cmake/CompileQtResource.cmake to
+      fix FTBFS with current Qt4
+
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 19 Feb 2014 09:53:47 -0500
+
 ovito (0.9.5-2) unstable; urgency=low
 
   * QA upload.
diff --git a/debian/patches/rcc_config_fix.diff b/debian/patches/rcc_config_fix.diff
new file mode 100644
index 0000000..595c197
--- /dev/null
+++ b/debian/patches/rcc_config_fix.diff
@@ -0,0 +1,90 @@
+Description: Fix cmake/CompileQtResource.cmake to work with current Qt
+Cherrypick of upstream git version cmake/CompileQtResource.cmake to fix
+FTBFS with current Qt4
+Author: Scott Kitterman <scott at kitterman.com>
+
+Origin: upstream
+Bug-Debian: http://bugs.debian.org/730890
+Forwarded: not-needed
+Last-Update: 2014-02-19
+
+Index: ovito-0.9.5/cmake/CompileQtResource.cmake
+===================================================================
+--- ovito-0.9.5.orig/cmake/CompileQtResource.cmake	2014-02-19 09:03:35.000000000 -0500
++++ ovito-0.9.5/cmake/CompileQtResource.cmake	2014-02-19 09:03:35.000000000 -0500
+@@ -1,28 +1,25 @@
+ 
+ # Compiles a .qrc file to a .rcc file using the Qt Resource Compiler
+ 
+-# The following macro is part of CMake 2.6 and later. If we have an earlier version then we need to define it here.
+-IF(NOT ${CMAKE_MAJOR_VERSION} GREATER 2 AND NOT ${CMAKE_MINOR_VERSION} GREATER 4)
+-	MACRO (QT4_EXTRACT_OPTIONS _qt4_files _qt4_options)
+-		SET(${_qt4_files})
+-		SET(${_qt4_options})
+-		SET(_QT4_DOING_OPTIONS FALSE)
+-		FOREACH(_currentArg ${ARGN})
+-		  IF ("${_currentArg}" STREQUAL "OPTIONS")
+-		    SET(_QT4_DOING_OPTIONS TRUE)
+-		  ELSE ("${_currentArg}" STREQUAL "OPTIONS")
+-		    IF(_QT4_DOING_OPTIONS) 
+-		      LIST(APPEND ${_qt4_options} "${_currentArg}")
+-		    ELSE(_QT4_DOING_OPTIONS)
+-		      LIST(APPEND ${_qt4_files} "${_currentArg}")
+-		    ENDIF(_QT4_DOING_OPTIONS)
+-		  ENDIF ("${_currentArg}" STREQUAL "OPTIONS")
+-		ENDFOREACH(_currentArg) 
+-	ENDMACRO (QT4_EXTRACT_OPTIONS)
+-ENDIF(NOT ${CMAKE_MAJOR_VERSION} GREATER 2 AND NOT ${CMAKE_MINOR_VERSION} GREATER 4)
++MACRO (QT_EXTRACT_OPTIONS _qt_files _qt_options)
++	SET(${_qt_files})
++	SET(${_qt_options})
++	SET(_QT_DOING_OPTIONS FALSE)
++	FOREACH(_currentArg ${ARGN})
++	  IF ("${_currentArg}" STREQUAL "OPTIONS")
++	    SET(_QT_DOING_OPTIONS TRUE)
++	  ELSE ("${_currentArg}" STREQUAL "OPTIONS")
++	    IF(_QT_DOING_OPTIONS) 
++	      LIST(APPEND ${_qt_options} "${_currentArg}")
++	    ELSE(_QT_DOING_OPTIONS)
++	      LIST(APPEND ${_qt_files} "${_currentArg}")
++	    ENDIF(_QT_DOING_OPTIONS)
++	  ENDIF ("${_currentArg}" STREQUAL "OPTIONS")
++	ENDFOREACH(_currentArg) 
++ENDMACRO(QT_EXTRACT_OPTIONS)
+ 
+-MACRO (QT4_COMPILE_RESOURCES target outfile)
+-    QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
++MACRO (QT_COMPILE_RESOURCES target outfile)
++    QT_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
+ 
+     SET(_RC_DEPENDS ${rcc_files})
+     FOREACH (it ${rcc_files})
+@@ -53,5 +50,5 @@
+ 	ADD_CUSTOM_TARGET("${target}_Resources" DEPENDS ${outfile})
+ 	ADD_DEPENDENCIES(${target} "${target}_Resources")
+ 
+-ENDMACRO (QT4_COMPILE_RESOURCES)
++ENDMACRO(QT_COMPILE_RESOURCES)
+ 
+Index: ovito-0.9.5/cmake/Plugins.cmake
+===================================================================
+--- ovito-0.9.5.orig/cmake/Plugins.cmake	2011-11-17 18:56:43.000000000 -0500
++++ ovito-0.9.5/cmake/Plugins.cmake	2014-02-19 09:18:54.153890626 -0500
+@@ -126,7 +126,7 @@
+ 	
+ 		# Build optional resource file for this plugin which is not linked into the shared library.
+ 		IF(resource_output)
+-			QT4_COMPILE_RESOURCES(${target_name} "${OVITO_PLUGINS_DIRECTORY}/${resource_output}" ${resource_input})
++			QT_COMPILE_RESOURCES(${target_name} "${OVITO_PLUGINS_DIRECTORY}/${resource_output}" ${resource_input})
+ 			# The resource file will be part of the installation package.
+ 			INSTALL(FILES "${OVITO_PLUGINS_DIRECTORY}/${resource_output}" DESTINATION "${OVITO_RELATIVE_PLUGINS_DIRECTORY}")
+ 		ENDIF()
+@@ -141,7 +141,7 @@
+ 	
+ 		# Build optional resource file for this plugin which is not linked into the shared library.
+ 		IF(resource_output)
+-			QT4_COMPILE_RESOURCES(${target_name} "${OVITO_PLUGINS_DIRECTORY}/${resource_output}" ${resource_input})
++			QT_COMPILE_RESOURCES(${target_name} "${OVITO_PLUGINS_DIRECTORY}/${resource_output}" ${resource_input})
+ 		ENDIF()
+ 	
+ 	ENDIF(NOT IS_THIRD_PARTY_PLUGIN)
diff --git a/debian/patches/series b/debian/patches/series
index 2372f56..ed55850 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 30-fix-typos.patch
 40-use-libmuparser.patch
 50-use-libtachyon.patch
+rcc_config_fix.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ovito.git