[Pkg-octave-commit] r2283 - in qtoctave/trunk/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2008-07-16 17:54:31 +0000 (Wed, 16 Jul 2008)
New Revision: 2283

Modified:
   qtoctave/trunk/debian/changelog
   qtoctave/trunk/debian/patches/add_path_for_cmake26
Log:
Change patch such that it works with both cmake 2.4 and 2.6


Modified: qtoctave/trunk/debian/changelog
===================================================================
--- qtoctave/trunk/debian/changelog	2008-07-15 23:09:56 UTC (rev 2282)
+++ qtoctave/trunk/debian/changelog	2008-07-16 17:54:31 UTC (rev 2283)
@@ -2,8 +2,11 @@
 
   * debian/watch: Remove "+dfsg" from the upstream version before number
     comparison
+  * debian/patches/add_path_for_cmake26: Change patch, such that it works
+    with both cmake 2.4 and 2.6 (this should make the pacakge into
+    testing, since hppa has only cmake 2.4)
 
- -- Rafael Laboissiere <rafael at debian.org>  Mon, 30 Jun 2008 16:37:30 +0200
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 16 Jul 2008 19:52:14 +0200
 
 qtoctave (0.7.4+dfsg-2) unstable; urgency=low
 

Modified: qtoctave/trunk/debian/patches/add_path_for_cmake26
===================================================================
--- qtoctave/trunk/debian/patches/add_path_for_cmake26	2008-07-15 23:09:56 UTC (rev 2282)
+++ qtoctave/trunk/debian/patches/add_path_for_cmake26	2008-07-16 17:54:31 UTC (rev 2283)
@@ -1,28 +1,48 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -64,7 +64,7 @@
+Index: qtoctave-0.7.4+dfsg/src/CMakeLists.txt
+===================================================================
+--- qtoctave-0.7.4+dfsg.orig/src/CMakeLists.txt	2008-07-16 19:19:31.000000000 +0200
++++ qtoctave-0.7.4+dfsg/src/CMakeLists.txt	2008-07-16 19:42:08.000000000 +0200
+@@ -53,6 +53,20 @@
+ QT4_WRAP_CPP(moc_variables_list variables_list.h)
+ QT4_WRAP_CPP(moc_window_list window_list.h)
+ 
++IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
++	SET(DISPLACED_FILES
++        	dynamic_help/moc_dynamic_help.cxx
++		operations/moc_general_menu.cxx
++		operations/moc_table_plot.cxx
++		projects/moc_projects.cxx)
++ELSE (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
++	SET(DISPLACED_FILES
++        	moc_dynamic_help.cxx
++		moc_general_menu.cxx
++		moc_table_plot.cxx
++		moc_projects.cxx)
++ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
++
+ add_executable(qtoctave 
+ 	autocomplete.h
+ 	moc_autocomplete.cxx
+@@ -64,7 +78,7 @@
  	moc_command_list.cxx
  	config.h
  	dynamic_help/dynamic_help.h
 -	moc_dynamic_help.cxx
-+	dynamic_help/moc_dynamic_help.cxx
++	${DISPLACED_FILES}
  	editor.h
  	moc_editor.cxx
  	generate_menu.h
-@@ -82,13 +82,13 @@
+@@ -82,13 +96,10 @@
  	octave_connection.h
  	moc_octave_connection.cxx
  	operations/general_menu.h
 -	moc_general_menu.cxx
-+	operations/moc_general_menu.cxx
  	operations/table_plot.h
 -	moc_table_plot.cxx
-+	operations/moc_table_plot.cxx
  	operations.h
  	moc_operations.cxx
  	projects/projects.h
 -	moc_projects.cxx
-+	projects/moc_projects.cxx
  	search_dialog.h
  	moc_search_dialog.cxx
  	session.h