[Pkg-octave-commit] r2463 - in qtoctave/trunk/debian: . patches
Jordi Gutiérrez Hermoso
jordigh-guest at alioth.debian.org
Thu Nov 27 18:31:25 UTC 2008
tags 505334 pending
thanks
Author: jordigh-guest
Date: 2008-11-27 18:31:25 +0000 (Thu, 27 Nov 2008)
New Revision: 2463
Added:
qtoctave/trunk/debian/patches/add_missing_includes
Removed:
qtoctave/trunk/debian/patches/add_path_for_cmake26
Modified:
qtoctave/trunk/debian/changelog
qtoctave/trunk/debian/patches/build-out-of-source
qtoctave/trunk/debian/patches/move_doc_under_doc
qtoctave/trunk/debian/patches/series
Log:
Update to upstream release 0.8.1
Modified: qtoctave/trunk/debian/changelog
===================================================================
--- qtoctave/trunk/debian/changelog 2008-11-25 11:41:22 UTC (rev 2462)
+++ qtoctave/trunk/debian/changelog 2008-11-27 18:31:25 UTC (rev 2463)
@@ -1,3 +1,14 @@
+qtoctave (0.8.1+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * Removed patch: add_path_for_cmake26, now builds without it.
+ * Added missing includes (closes: #505334)
+ + New patch: add_missing_includes
+ + src/search_dialog.cpp: added "#include <stdio.h>"
+ + src/octave_connection.cpp: added "#include <stdio.h>"
+
+ -- Jordi Gutiérrez Hermoso <jordigh at gmail.com> Thu, 27 Nov 2008 02:28:56 -0600
+
qtoctave (0.7.4+dfsg-3) unstable; urgency=low
* debian/watch: Remove "+dfsg" from the upstream version before number
Added: qtoctave/trunk/debian/patches/add_missing_includes
===================================================================
--- qtoctave/trunk/debian/patches/add_missing_includes (rev 0)
+++ qtoctave/trunk/debian/patches/add_missing_includes 2008-11-27 18:31:25 UTC (rev 2463)
@@ -0,0 +1,22 @@
+Index: qtoctave-0.8.1+dfsg/src/octave_connection.cpp
+===================================================================
+--- qtoctave-0.8.1+dfsg.orig/src/octave_connection.cpp 2008-11-27 02:23:46.000000000 -0600
++++ qtoctave-0.8.1+dfsg/src/octave_connection.cpp 2008-11-27 02:23:53.000000000 -0600
+@@ -23,6 +23,7 @@
+ #include <QMessageBox>
+ #include <QFile>
+ #include <QDir>
++#include <stdio.h>
+
+ void Sleep::micro_sleep(unsigned long u_seconds)
+ {
+Index: qtoctave-0.8.1+dfsg/src/search_dialog.cpp
+===================================================================
+--- qtoctave-0.8.1+dfsg.orig/src/search_dialog.cpp 2008-11-27 02:23:46.000000000 -0600
++++ qtoctave-0.8.1+dfsg/src/search_dialog.cpp 2008-11-27 02:23:50.000000000 -0600
+@@ -1,4 +1,5 @@
+ #include "search_dialog.h"
++#include <stdio.h>
+
+ SearchDialog::SearchDialog(QWidget *parent): QDialog(parent)
+ {
Deleted: qtoctave/trunk/debian/patches/add_path_for_cmake26
===================================================================
--- qtoctave/trunk/debian/patches/add_path_for_cmake26 2008-11-25 11:41:22 UTC (rev 2462)
+++ qtoctave/trunk/debian/patches/add_path_for_cmake26 2008-11-27 18:31:25 UTC (rev 2463)
@@ -1,48 +0,0 @@
-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
-+ ${DISPLACED_FILES}
- editor.h
- moc_editor.cxx
- generate_menu.h
-@@ -82,13 +96,10 @@
- octave_connection.h
- moc_octave_connection.cxx
- operations/general_menu.h
-- moc_general_menu.cxx
- operations/table_plot.h
-- moc_table_plot.cxx
- operations.h
- moc_operations.cxx
- projects/projects.h
-- moc_projects.cxx
- search_dialog.h
- moc_search_dialog.cxx
- session.h
Modified: qtoctave/trunk/debian/patches/build-out-of-source
===================================================================
--- qtoctave/trunk/debian/patches/build-out-of-source 2008-11-25 11:41:22 UTC (rev 2462)
+++ qtoctave/trunk/debian/patches/build-out-of-source 2008-11-27 18:31:25 UTC (rev 2463)
@@ -1,30 +1,35 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,8 +11,6 @@
- set(CMAKE_BUILD_TYPE Release)
- set(CMAKE_VERBOSE_MAKEFILE TRUE)
+Index: qtoctave-0.8.1+dfsg/CMakeLists.txt
+===================================================================
+--- qtoctave-0.8.1+dfsg.orig/CMakeLists.txt 2008-09-21 04:00:30.000000000 -0500
++++ qtoctave-0.8.1+dfsg/CMakeLists.txt 2008-11-27 00:21:38.000000000 -0600
+@@ -15,8 +15,6 @@
+ #Uncoment to Verbose mode
+ #set(CMAKE_VERBOSE_MAKEFILE TRUE)
-configure_file ( configure.h src/configure.h )
-
ADD_DEFINITIONS(-DUSER_CONFIG)
--add_subdirectory (src)
-\ No newline at end of file
-+add_subdirectory (src)
---- a/configure.h
-+++ /dev/null
-@@ -1,8 +0,0 @@
+ add_subdirectory (src)
+Index: qtoctave-0.8.1+dfsg/configure.h
+===================================================================
+--- qtoctave-0.8.1+dfsg.orig/configure.h 2008-09-21 04:00:30.000000000 -0500
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,9 +0,0 @@
-
-#ifndef __CONFIGURE_H__
-#define __CONFIGURE_H__
-#define CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave"
-#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/octave_doc/octave.html"
-#define ICON_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/images"
+-#define LANG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/lang"
-#define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/qtoctave_doc/index.html"
-#endif
\ No newline at end of file
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
+Index: qtoctave-0.8.1+dfsg/src/CMakeLists.txt
+===================================================================
+--- qtoctave-0.8.1+dfsg.orig/src/CMakeLists.txt 2008-09-21 04:00:30.000000000 -0500
++++ qtoctave-0.8.1+dfsg/src/CMakeLists.txt 2008-11-27 00:12:03.000000000 -0600
@@ -1,3 +1,10 @@
+
+CONFIGURE_FILE(configure.h.in ${CMAKE_CURRENT_BINARY_DIR}/configure.h)
@@ -36,50 +41,34 @@
FIND_PACKAGE(Qt4 REQUIRED)
MESSAGE (STATUS "Use file: ${QT_USE_FILE}")
-@@ -46,7 +53,6 @@
- QT4_WRAP_CPP(moc_variables_list variables_list.h)
- QT4_WRAP_CPP(moc_window_list window_list.h)
-
--
- add_executable(qtoctave
- autocomplete.h
- moc_autocomplete.cxx
-@@ -144,11 +150,11 @@
- )
-
- install (
-- PROGRAMS qtoctave
-- DESTINATION bin
-+ TARGETS qtoctave
-+ RUNTIME DESTINATION bin
- )
-
- install (
- FILES config.rc octave.xml
- DESTINATION share/qtoctave
-- )
-\ No newline at end of file
-+ )
---- /dev/null
-+++ b/src/configure.h.in
-@@ -0,0 +1,7 @@
+Index: qtoctave-0.8.1+dfsg/src/configure.h.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ qtoctave-0.8.1+dfsg/src/configure.h.in 2008-11-27 00:16:56.000000000 -0600
+@@ -0,0 +1,9 @@
++
+#ifndef __CONFIGURE_H__
+#define __CONFIGURE_H__
+#define CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave"
+#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/octave_doc/octave.html"
+#define ICON_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/images"
++#define LANG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/lang"
+#define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/qtoctave_doc/index.html"
+#endif
---- a/src/operations/general_menu.h
-+++ b/src/operations/general_menu.h
+Index: qtoctave-0.8.1+dfsg/src/operations/general_menu.h
+===================================================================
+--- qtoctave-0.8.1+dfsg.orig/src/operations/general_menu.h 2008-09-21 04:00:30.000000000 -0500
++++ qtoctave-0.8.1+dfsg/src/operations/general_menu.h 2008-11-27 00:12:03.000000000 -0600
@@ -1,4 +1,4 @@
-#include "../ui_general_menu.h"
+#include "ui_general_menu.h"
#include "../config.h"
#include <QFont>
---- a/src/projects/projects.h
-+++ b/src/projects/projects.h
+Index: qtoctave-0.8.1+dfsg/src/projects/projects.h
+===================================================================
+--- qtoctave-0.8.1+dfsg.orig/src/projects/projects.h 2008-09-21 04:00:29.000000000 -0500
++++ qtoctave-0.8.1+dfsg/src/projects/projects.h 2008-11-27 00:12:03.000000000 -0600
@@ -19,7 +19,7 @@
#ifndef __PROJECTS_H__
#define __PROJECTS_H__
@@ -89,8 +78,10 @@
#include "../config.h"
using namespace Ui;
---- a/src/projects/projects.cpp
-+++ b/src/projects/projects.cpp
+Index: qtoctave-0.8.1+dfsg/src/projects/projects.cpp
+===================================================================
+--- qtoctave-0.8.1+dfsg.orig/src/projects/projects.cpp 2008-09-21 04:00:29.000000000 -0500
++++ qtoctave-0.8.1+dfsg/src/projects/projects.cpp 2008-11-27 00:12:03.000000000 -0600
@@ -1,5 +1,5 @@
#include "projects.h"
-#include "../ui_newprojectdialog.h"
Modified: qtoctave/trunk/debian/patches/move_doc_under_doc
===================================================================
--- qtoctave/trunk/debian/patches/move_doc_under_doc 2008-11-25 11:41:22 UTC (rev 2462)
+++ qtoctave/trunk/debian/patches/move_doc_under_doc 2008-11-27 18:31:25 UTC (rev 2463)
@@ -1,25 +1,30 @@
---- a/src/configure.h.in
-+++ b/src/configure.h.in
-@@ -3,5 +3,5 @@
- #define CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave"
+Index: qtoctave-0.8.1+dfsg/src/configure.h.in
+===================================================================
+--- qtoctave-0.8.1+dfsg.orig/src/configure.h.in 2008-11-27 00:44:58.000000000 -0600
++++ qtoctave-0.8.1+dfsg/src/configure.h.in 2008-11-27 00:47:40.000000000 -0600
+@@ -5,5 +5,5 @@
#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave3.0-htmldoc/interpreter/index.html"
#define ICON_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/images"
+ #define LANG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/lang"
-#define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/qtoctave_doc/index.html"
+#define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/qtoctave/qtoctave_doc/index.html"
#endif
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -145,10 +145,12 @@
- TARGET_LINK_LIBRARIES(qtoctave ${Qt4_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY})
+Index: qtoctave-0.8.1+dfsg/src/CMakeLists.txt
+===================================================================
+--- qtoctave-0.8.1+dfsg.orig/src/CMakeLists.txt 2008-11-27 00:44:35.000000000 -0600
++++ qtoctave-0.8.1+dfsg/src/CMakeLists.txt 2008-11-27 00:48:32.000000000 -0600
+@@ -44,11 +44,13 @@
+ TARGET_LINK_LIBRARIES(qtoctave ${Qt4_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY})
install (
-- DIRECTORY images octave_doc qtoctave_doc menus
-+ DIRECTORY images octave_doc menus
- DESTINATION share/qtoctave
- )
+- DIRECTORY images octave_doc qtoctave_doc menus scripts lang
++ DIRECTORY images menus scripts lang
+ DESTINATION share/qtoctave
+ PATTERN ".svn" EXCLUDE
+ )
+INSTALL ( DIRECTORY qtoctave_doc DESTINATION share/doc/qtoctave )
+
install (
- TARGETS qtoctave
- RUNTIME DESTINATION bin
+ TARGETS qtoctave
+ RUNTIME DESTINATION bin
Modified: qtoctave/trunk/debian/patches/series
===================================================================
--- qtoctave/trunk/debian/patches/series 2008-11-25 11:41:22 UTC (rev 2462)
+++ qtoctave/trunk/debian/patches/series 2008-11-27 18:31:25 UTC (rev 2463)
@@ -1,4 +1,4 @@
build-out-of-source
use_octave3.0-htmldoc
move_doc_under_doc
-add_path_for_cmake26
+add_missing_includes
More information about the Pkg-octave-commit
mailing list