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

Thomas Weber tweber at debian.org
Sun Jun 6 13:46:56 UTC 2010


tags 521731 pending
tags 538047 pending
tags 550264 pending
tags 571914 pending
thanks

The following commit has been merged in the master branch:
commit 88b4c939666c62761a51ed89527482c927793f75
Author: Thomas Weber <tweber at debian.org>
Date:   Sat May 22 22:45:50 2010 +0200

    Revert "Some changes to upstream version 0.9.1 and separation of useful binaries from useless ones"
    
    This reverts commit c6cce6b3a338f6ce6917d4596612a7e0e4af1186.
    
    The commit was based on an outdated qtoctave package and is a huge
    patch.

diff --git a/debian/README.Debian b/debian/README.Debian
index d6841ab..ec2c890 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -7,3 +7,12 @@ octave2.9-htmldoc instead, in conformance with Debian policy.
 
  -- Jordi Gutiérrez Hermoso <jordigh at gmail.com>, Sat, 30 Jun 2007 20:17:06 -0500
 
+
+SimpleRcs
+---------
+
+We do not ship the simple rcs found in the original upstream tarball. There are
+plenty of full-blown version control systems in Debian, including rcs itself.
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>, Sun, 04 Oct 2009 09:42:01 +0200
+
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..7b5ba73
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,29 @@
+QtOctave source for Debian
+--------------------------
+
+The layout of the original tarball has been changed in the Debian package.
+First, the simple_rcs directory has been removed, because it relates to
+another project than qtoctave.  Second, the qtoctave/octave_doc directory
+has also been removed, because it contains the HTML files generated from the
+Octave texinfo documentation files.  Since the sources are not distributed,
+it does not comply with the DFSG. 
+
+Note that './debian/rules get-orig-source' creates the Debian "upstream"
+tarball.
+
+
+Patches
+-------
+
+This package uses quilt to manage all modifications to the 'dfsg-ed' source.
+Changes are stored in the source package as diffs in debian/patches and applied
+during the build.  Please see:
+
+    /usr/share/doc/quilt/README.source
+
+for more information on how to apply the patches, modify patches, or remove a
+patch.
+
+
+
+
diff --git a/debian/changelog b/debian/changelog
index 3d238e3..61a462c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,33 +1,55 @@
-qtoctave (0.9.1-1) unstable; urgency=low
+qtoctave (0.8.2+dfsg-3) UNRELEASED; urgency=low
 
-  * New upstream release
-  * debian/watch: Update regexp to allow notification for bz2 archives
-  * Rebuild against Qt 4.6 with patches from upstream (closes: #565197)
-  * Removed +dfsg from version; upstream has stopped distributing
-    GPL-questionable docs.
-  * Modified old patches, which are now mostly integrated upstream
-  * debian/control: 
-     + bump standards version 
-     + depend on Octave 3.2 and its docs
-     + Remove Rafael Laboissiere from uploaders and perform
-       an upload to keep myself there (closes: #572437, #571914) 
-     + Update Vcs fields to point to git repositories
-     + Split into two binary packages: main qtoctave and qtoctave-utils
-       and make qtoctave Suggests: qtoctave-utils
-  * New patches: 
-     + generate_qm_files: 
-       ensure that l10n files get built
-     + install-supplementary-docs: 
-       install more docs, mostly for qtoctave-utils
-     + build-widgetserver
-       widgetserver wasn't included in newer CMake build, this fixes this
-  * New stub manpages, mostly for qtoctave-utils
-  * debian/README.source: No longer necessary to repackage upstream source
-    tarball, remove this file
-  * debian/rules: Remove get-orig-source rule
-  * debian/docs: removed news.txt and LICENSE_GPL.txt
-
- -- Jordi Gutiérrez Hermoso <jordigh at gmail.com>  Sat, 08 May 2010 22:16:33 -0500
+  * debian/control: Remove Rafael Laboissiere from Uploaders (Closes: #571914)
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 23:01:38 +0100
+
+qtoctave (0.8.2+dfsg-2) unstable; urgency=low
+
+  * Fix build failure for GCC 4.4 via use_cstdio_header (closes: #550264)
+    Thanks to Martin Michlmayr for both the report and the patch.
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 11 Oct 2009 16:29:55 +0200
+
+qtoctave (0.8.2+dfsg-1) unstable; urgency=low
+
+  * New upstream version (closes: #538047)
+  * Change packaging of dfsg-tarball and adapt patches to it.
+    + We no longer move files around in the tarball for creating the
+      dfsg-version.
+    + Adapt patches and paths for Octave 3.2.
+      - build-out-of-source is much shorter now
+      - move_doc_under_doc adapted for new directories
+    + Rename use_octave3.0-htmldoc to the more generic use_octave_htmldoc
+    + New patches: 
+      - dont_include_simple_rcs: We don't ship SimpleRCS in the dfsg tarball,
+        so remove it from the build system as well.
+      - install_easyplot_as_target: change signature of INSTALL command for
+        out-out-source-builds
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 04 Oct 2009 10:08:00 +0200
+
+qtoctave (0.8.1+dfsg-3) unstable; urgency=low
+
+  * debian/patche/font-option-in-png-export: When exporting a figure in
+    png format, give the correct font option to the print command,
+    prepending -F to Helvetica:12 (closes: #521731)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 01 Apr 2009 22:15:59 +0200
+
+qtoctave (0.8.1+dfsg-2) unstable; urgency=low
+
+  * debian/control:
+    + Fix Lintian warning debhelper-but-no-misc-depends
+    + Bump Standards-Version to 3.8.1 (no changes needed)
+  * debian/copyright: Use © instead of (C) in copyright notices (Lintian
+    warning)
+  * debian/patches/add_missing_includes: Add description (Lintian warning)
+  * debian/patches/build-out-of-source: Ditto
+  * debian/patches/move_doc_under_doc: Ditto
+  * debian/patches/use_octave3.0-htmldoc: Ditto
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sun, 22 Mar 2009 20:57:17 +0100
 
 qtoctave (0.8.1+dfsg-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 8b5f6a4..8cad2bf 100644
--- a/debian/control
+++ b/debian/control
@@ -7,14 +7,14 @@ Uploaders: Jordi Gutiérrez Hermoso <jordigh at gmail.com>,
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.0), cdbs, cmake, sharutils,
  libqt4-dev (>= 4.4.0~rc1-4), quilt
-Standards-Version: 3.8.4
+Standards-Version: 3.8.1
 Homepage: http://qtoctave.wordpress.com/about/
-Vcs-Git: git://git.debian.org/pkg-octave/qtoctave.git
-Vcs-Browser: http://git.debian.org/?p=pkg-octave/qtoctave.git;a=summary
+Vcs-Git: git://git.debian.org/git/pkg-octave/qtoctave.git
+Vcs-Browser: http://git.debian.org/?p=pkg-octave/qtoctave.git
 
 Package: qtoctave
 Architecture: any
-Depends: octave3.2, ${shlibs:Depends}
+Depends: octave3.2, ${shlibs:Depends}, ${misc:Depends}
 Recommends: octave3.2-htmldoc
 Description: A Qt front-end to Octave
  Besides offering an attractive front-end to GNU Octave, an
@@ -23,17 +23,3 @@ Description: A Qt front-end to Octave
  some GUI shortcuts to frequently used Octave functions. It also
  offers access in place to Octave's HTML documentation with
  octave3.0-htmldoc.
-
-Package: qtoctave-utils
-Architecture: any
-Depends: ${shlibs:Depends}
-Recommends: qtoctave
-Description: Qt utilities for QtOctave
- This package contains some utilities that can be helpful for
- extending or supplementing QtOctave's functionality:
- . 
-  *widgetserver -- Cross-language GUI window builder
-  *xmlwidget    -- Window building with XML
-  *simple_rcs   -- Simple VCS similar to RCS
-  *qtjs         -- Extend QtOctave with javascript
-  *qtinfo       -- Qt texinfo browser
diff --git a/debian/copyright b/debian/copyright
index 872d755..9a8b17a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ Upstream author:
 
 Copyright and license terms:
 
-     Copyright (C) 2006 P.L. Lucas
+     Copyright © 2006 P.L. Lucas
 
      This program is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
@@ -28,11 +28,11 @@ Copyright and license terms:
      Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
      02110-1301, USA.
 
-The icons are (C) Ross Burton <ross at burtonini.com> Niran Babalola, Sebasitan
+The icons are © Ross Burton <ross at burtonini.com> Niran Babalola, Sebasitan
 Heinlein <sebastian.heinlein at web.de>, Michael Vogt <michael.vogt at ubuntu.com>
 and is licensed under the GNU GPL.
 
-The Debian packaging is (C) 2007, Jordi Gutiérrez Hermoso
+The Debian packaging is © 2007, Jordi Gutiérrez Hermoso
 <jordigh at gmail.com> and is licensed under the GPL, see
 `/usr/share/common-licenses/GPL'.
 
diff --git a/debian/docs b/debian/docs
index 9d18bad..4491393 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,4 @@
 leeme.txt
+LICENSE_GPL.txt
+qtoctave/news.txt
 readme.txt
diff --git a/debian/easy_plot.1 b/debian/easy_plot.1
deleted file mode 100644
index fa699d5..0000000
--- a/debian/easy_plot.1
+++ /dev/null
@@ -1,24 +0,0 @@
-.TH QTOCTAVE 1 "May 9, 2010"
-.SH NAME
-easy_plot \- A Qt front-end for Octave plotting
-.SH SYNOPSIS
-.B easy_plot
-.RI [ options ]
-.SH DESCRIPTION
-\fBQtOctave\fP is a Qt front-end to GNU Octave. \fBGNU Octave\fP is a
-high-level language, primarily intended for numerical computations,
-and highly compatible with MATLAB. It provides a convenient command
-line interface for solving linear and nonlinear problems numerically.
-.BR 
-easy_plot is an alternative plotting interface for Octave that is
-called internally by \fqtoctave\f.
-.SH SEE ALSO
-.BR qtoctave (1)
-.BR octave (1)
-.br
-.br
-.SH AUTHOR
-QtOctave was written by Pedro Luis Lucas Rosado <acisif at mixmail.com>.
-.PP
-This manual page was written by Jordi Gutiérrez Hermoso <jordigh at gmail.com>,
-for the Debian project (but may be used by others).
diff --git a/debian/qtoctave.menu b/debian/menu
similarity index 100%
rename from debian/qtoctave.menu
rename to debian/menu
diff --git a/debian/patches/add_missing_includes b/debian/patches/add_missing_includes
index eb36dd1..0a38fc4 100644
--- a/debian/patches/add_missing_includes
+++ b/debian/patches/add_missing_includes
@@ -1,7 +1,11 @@
-Index: qtoctave-0.9.1/qtoctave/src/octave_connection.cpp
+Add missing stdio.h include directives.
+
+ -- Jordi Gutiérrez Hermoso <jordigh at gmail.com>  Sun, 30 Nov 2008 15:40:20 +0000
+
+Index: qtoctave-0.8.1+dfsg/src/octave_connection.cpp
 ===================================================================
---- qtoctave-0.9.1.orig/qtoctave/src/octave_connection.cpp	2010-05-08 17:39:04.000000000 -0500
-+++ qtoctave-0.9.1/qtoctave/src/octave_connection.cpp	2010-05-08 17:41:07.000000000 -0500
+--- qtoctave-0.8.1+dfsg.orig/qtoctave/src/octave_connection.cpp	2008-11-27 02:23:46.000000000 -0600
++++ qtoctave-0.8.1+dfsg/qtoctave/src/octave_connection.cpp	2008-11-27 02:23:53.000000000 -0600
 @@ -23,6 +23,7 @@
  #include <QMessageBox>
  #include <QFile>
@@ -10,40 +14,13 @@ Index: qtoctave-0.9.1/qtoctave/src/octave_connection.cpp
  
  void Sleep::micro_sleep(unsigned long u_seconds)
  {
-Index: qtoctave-0.9.1/widgetserver/widgetserver/main.cpp
+Index: qtoctave-0.8.1+dfsg/src/search_dialog.cpp
 ===================================================================
---- qtoctave-0.9.1.orig/widgetserver/widgetserver/main.cpp	2010-05-08 22:47:59.000000000 -0500
-+++ qtoctave-0.9.1/widgetserver/widgetserver/main.cpp	2010-05-08 22:48:12.000000000 -0500
-@@ -21,6 +21,7 @@
- #include "process.h"
- #include "input.h"
- #include <string.h>
+--- qtoctave-0.8.1+dfsg.orig/qtoctave/src/search_dialog.cpp	2008-11-27 02:23:46.000000000 -0600
++++ qtoctave-0.8.1+dfsg/src/qtoctave/search_dialog.cpp	2008-11-27 02:23:50.000000000 -0600
+@@ -1,4 +1,5 @@
+ #include "search_dialog.h"
 +#include <stdio.h>
  
- int main(int argn, char *argv[])
+ SearchDialog::SearchDialog(QWidget *parent): QDialog(parent)
  {
-Index: qtoctave-0.9.1/widgetserver/widgetserver/process.cpp
-===================================================================
---- qtoctave-0.9.1.orig/widgetserver/widgetserver/process.cpp	2010-05-08 22:48:51.000000000 -0500
-+++ qtoctave-0.9.1/widgetserver/widgetserver/process.cpp	2010-05-08 22:49:05.000000000 -0500
-@@ -17,6 +17,8 @@
- #include "menubar.h"
- #include "window.h"
- 
-+#include <stdio.h>
-+
- ExternProcess::ExternProcess(QString command, Process *process):QProcess(0)
- {
- 	QObject::connect(this, SIGNAL(readyReadStandardOutput()), this, SLOT(read_stdout()));
-Index: qtoctave-0.9.1/widgetserver/widgetserver/input.cpp
-===================================================================
---- qtoctave-0.9.1.orig/widgetserver/widgetserver/input.cpp	2010-05-08 22:49:56.000000000 -0500
-+++ qtoctave-0.9.1/widgetserver/widgetserver/input.cpp	2010-05-08 22:50:47.000000000 -0500
-@@ -1,5 +1,7 @@
- #include "input.h"
- 
-+#include <stdio.h>
-+
- Input::Input(FILE *in, FILE *out, Process *process, QObject * parent):QThread(parent)
- {
- 	this->process=process;
diff --git a/debian/patches/build-out-of-source b/debian/patches/build-out-of-source
index c3d3c14..9f3279e 100644
--- a/debian/patches/build-out-of-source
+++ b/debian/patches/build-out-of-source
@@ -1,31 +1,51 @@
-Index: qtoctave-0.9.1/qtoctave/src/CMakeLists.txt
-===================================================================
---- qtoctave-0.9.1.orig/qtoctave/src/CMakeLists.txt	2010-05-08 11:19:08.000000000 -0500
-+++ qtoctave-0.9.1/qtoctave/src/CMakeLists.txt	2010-05-08 11:20:00.000000000 -0500
-@@ -1,3 +1,10 @@
-+
-+CONFIGURE_FILE(configure.h.in ${CMAKE_CURRENT_BINARY_DIR}/configure.h)
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/projects)
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/projects)
-+
- FIND_PACKAGE(Qt4 REQUIRED)
+Enable out-of-source builds for CMake, by addinge some include paths
+to the cmake include directories.
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 22 Apr 2008 09:03:38 +0200
+
+This patch was forwarded upstream. 
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com> Sun, 04 Oct 2009 15:13:35 +0200
+
+--- a/easy_plot/src/CMakeLists.txt
++++ b/easy_plot/src/CMakeLists.txt
+@@ -7,6 +7,7 @@
  
- MESSAGE (STATUS "Use file: ${QT_USE_FILE}")
-Index: qtoctave-0.9.1/qtoctave/src/configure.h
-===================================================================
---- qtoctave-0.9.1.orig/qtoctave/src/configure.h	2010-05-08 11:20:02.000000000 -0500
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+ include(UseQt4)
+ 
++INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
+ include_directories(${QT_INCLUDE_DIR})
+ include_directories(${QT_QT_INCLUDE_DIR})
+ include_directories(${QT_QTCORE_INCLUDE_DIR})
+@@ -45,4 +46,4 @@
+ 		TARGETS easy_plot
+ 		RUNTIME
+ 		DESTINATION bin
+-	)
+\ No newline at end of file
++	)
+--- a/qtoctave/src/CMakeLists.txt
++++ b/qtoctave/src/CMakeLists.txt
+@@ -6,6 +6,8 @@
+ 
+ include(UseQt4)
+ 
++INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
++INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/projects )
+ include_directories(${QT_INCLUDE_DIR})
+ include_directories(${QT_QT_INCLUDE_DIR})
+ include_directories(${QT_QTCORE_INCLUDE_DIR})
+--- a/qtoctave/src/configure.h
++++ /dev/null
 @@ -1,11 +0,0 @@
 -
 -#ifndef __CONFIGURE_H__
 -#define __CONFIGURE_H__
--#define CONFIG_PATH "/opt/qtoctave-0.8.2/share/qtoctave"
--#define HELP_PATH "/opt/qtoctave-0.8.2/share/doc/octave-html/octave_doc/index.html"
--#define ICON_PATH "/opt/qtoctave-0.8.2/share/qtoctave/images"
--#define LANG_PATH "/opt/qtoctave-0.8.2/share/qtoctave/lang"
--#define QTOCTAVE_HELP_PATH "/opt/qtoctave-0.8.2/share/doc/qtoctave/qtoctave_doc/index.html"
+-#define CONFIG_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave"
+-#define HELP_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/octave_doc/index.html"
+-#define ICON_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/images"
+-#define LANG_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/lang"
+-#define QTOCTAVE_HELP_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/qtoctave_doc/index.html"
 -
--#define PKG_CMD_PATH "/opt/qtoctave-0.8.2/share/qtoctave/pkg-commands.list"
+-#define PKG_CMD_PATH "/usr/local/opt/binaries/qtoctave-0.8.1/share/qtoctave/pkg-commands.list"
 -#endif
diff --git a/debian/patches/build-widgetserver b/debian/patches/build-widgetserver
deleted file mode 100644
index 7397995..0000000
--- a/debian/patches/build-widgetserver
+++ /dev/null
@@ -1,81 +0,0 @@
-Index: qtoctave-0.9.1/CMakeLists.txt
-===================================================================
---- qtoctave-0.9.1.orig/CMakeLists.txt	2010-05-08 23:06:13.000000000 -0500
-+++ qtoctave-0.9.1/CMakeLists.txt	2010-05-08 23:06:26.000000000 -0500
-@@ -38,6 +38,7 @@
- 
- add_subdirectory (qtoctave_pkg/src)
- add_subdirectory (xmlwidget)
-+add_subdirectory (widgetserver)
- add_subdirectory (easy_plot)
- add_subdirectory (simple_rcs)
- add_subdirectory (qtjs)
-Index: qtoctave-0.9.1/widgetserver/CMakeLists.txt
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ qtoctave-0.9.1/widgetserver/CMakeLists.txt	2010-05-08 23:09:43.000000000 -0500
-@@ -0,0 +1,11 @@
-+add_subdirectory(widgetserver)
-+
-+install(
-+  DIRECTORY doc
-+  DESTINATION share/doc/qtoctave-utils/widgetserver
-+)
-+
-+install(
-+  FILES "leeme.txt" "readme.txt"
-+  DESTINATION share/doc/qtoctave-utils/widgetserver
-+)
-Index: qtoctave-0.9.1/widgetserver/widgetserver/CMakeLists.txt
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ qtoctave-0.9.1/widgetserver/widgetserver/CMakeLists.txt	2010-05-08 23:06:26.000000000 -0500
-@@ -0,0 +1,47 @@
-+FIND_PACKAGE(Qt4 REQUIRED)
-+
-+MESSAGE (STATUS "Use file: ${QT_USE_FILE}")
-+
-+SET(QT_USE_QTXML 1)
-+
-+include(UseQt4)
-+
-+include_directories(${QT_INCLUDE_DIR})
-+include_directories(${QT_QT_INCLUDE_DIR})
-+include_directories(${QT_QTCORE_INCLUDE_DIR})
-+include_directories(${QT_QTGUI_INCLUDE_DIR})
-+include_directories(${QT_QTXML_INCLUDE_DIR})
-+include_directories(${CMAKE_CURRENT_BINARY_DIR})
-+include_directories(${QT_QTSCRIPT_INCLUDE_DIR})
-+include_directories(${QT_QTUITOOLS_INCLUDE_DIR})
-+
-+FILE(GLOB widgetserver_moc_headers *.h  )
-+FILE(GLOB widgetserver_sources *.cpp )
-+
-+# run moc on these files:
-+QT4_WRAP_CPP( widgetserver_moc_sources ${widgetserver_moc_headers} )
-+
-+add_executable(widgetserver
-+	${widgetserver_sources}  ${widgetserver_moc_sources} ${widgetserver_moc_headers}
-+)
-+
-+SET_TARGET_PROPERTIES(widgetserver
-+	PROPERTIES INSTALL_RPATH ":usr/lib"
-+	BUILD_WITH_INSTALL_RPATH true
-+	INSTALL_RPATH_USE_LINK_PATH true
-+)
-+
-+TARGET_LINK_LIBRARIES(widgetserver
-+	${Qt4_LIBRARIES}
-+	${QT_QTCORE_LIBRARY}
-+	${QT_QTGUI_LIBRARY}
-+	${QT_QTXML_LIBRARY}
-+	${QT_QTSCRIPT_LIBRARY}
-+	${QT_QTUITOOLS_LIBRARY}
-+)
-+
-+
-+install	(
-+	TARGETS widgetserver
-+	RUNTIME DESTINATION bin
-+	)
-\ No newline at end of file
diff --git a/debian/patches/dont_include_simple_rcs b/debian/patches/dont_include_simple_rcs
new file mode 100644
index 0000000..50e333f
--- /dev/null
+++ b/debian/patches/dont_include_simple_rcs
@@ -0,0 +1,15 @@
+We strip the simple_rcs directory from the upstream tarball (see
+README.sources), so remove it from the build system as well.
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat, 03 Oct 2009 13:20:57 +0200
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,7 +41,6 @@
+ add_subdirectory (qtoctave_pkg/src)
+ add_subdirectory (xmlwidget/qt4)
+ add_subdirectory (easy_plot)
+-add_subdirectory (simple_rcs)
+ add_subdirectory (qtjs)
+ add_subdirectory (qtoctave)
+ 
diff --git a/debian/patches/font-option-in-png-export b/debian/patches/font-option-in-png-export
new file mode 100644
index 0000000..28dbe85
--- /dev/null
+++ b/debian/patches/font-option-in-png-export
@@ -0,0 +1,20 @@
+When exporting a figure in png format, give the correct font option to
+the print command, prepending -F to Helvetica:12 (fixes Bug#521731).
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 01 Apr 2009 22:15:59 +0200
+
+This patch is in upstream's trunk, but not in the 0.8.2 release.
+ 
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 29 Sep 2009 21:54:05 +0200
+
+--- a/qtoctave/src/menus/Plot/Export/png.menu
++++ b/qtoctave/src/menus/Plot/Export/png.menu
+@@ -12,7 +12,7 @@
+ end{output_list}
+ 
+ begin{command}
+-print ("%o1%", "%o2%", "Helvetica:12", "-dpng")
++print ("%o1%", "%o2%", "-FHelvetica:12", "-dpng")
+ end{command}
+ 
+ begin{help}
diff --git a/debian/patches/generate_qm_files b/debian/patches/generate_qm_files
deleted file mode 100644
index 6b618d6..0000000
--- a/debian/patches/generate_qm_files
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: qtoctave-0.9.1/qtoctave/src/CMakeLists.txt
-===================================================================
---- qtoctave-0.9.1.orig/qtoctave/src/CMakeLists.txt	2010-05-08 17:12:17.000000000 -0500
-+++ qtoctave-0.9.1/qtoctave/src/CMakeLists.txt	2010-05-08 17:37:21.000000000 -0500
-@@ -32,9 +32,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
-@@ -46,11 +60,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 qtoctave_doc
- 	DESTINATION share/doc/qtoctave
diff --git a/debian/patches/install-supplementary-docs b/debian/patches/install-supplementary-docs
deleted file mode 100644
index 24a76a4..0000000
--- a/debian/patches/install-supplementary-docs
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: qtoctave-0.9.1/qtjs/CMakeLists.txt
-===================================================================
---- qtoctave-0.9.1.orig/qtjs/CMakeLists.txt	2010-05-08 22:49:41.000000000 -0500
-+++ qtoctave-0.9.1/qtjs/CMakeLists.txt	2010-05-08 23:10:00.000000000 -0500
-@@ -1,2 +1,11 @@
- add_subdirectory (src)
- 
-+install(
-+  DIRECTORY doc
-+  DESTINATION share/doc/qtoctave-utils/qtjs
-+)
-+
-+install(
-+  FILES "instalar.txt" "install.txt"
-+  DESTINATION share/doc/qtoctave-utils/qtjs
-+)
-\ No newline at end of file
-Index: qtoctave-0.9.1/simple_rcs/CMakeLists.txt
-===================================================================
---- qtoctave-0.9.1.orig/simple_rcs/CMakeLists.txt	2010-05-08 22:49:41.000000000 -0500
-+++ qtoctave-0.9.1/simple_rcs/CMakeLists.txt	2010-05-08 22:50:54.000000000 -0500
-@@ -14,3 +14,9 @@
- #ADD_DEFINITIONS(-DUSER_CONFIG)
- 
- add_subdirectory (src)
-+
-+install(
-+  DIRECTORY design
-+  DESTINATION share/doc/qtoctave-utils/simple_rcs
-+  PATTERN ".svn" EXCLUDE
-+)
-\ No newline at end of file
-Index: qtoctave-0.9.1/xmlwidget/CMakeLists.txt
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ qtoctave-0.9.1/xmlwidget/CMakeLists.txt	2010-05-08 22:50:54.000000000 -0500
-@@ -0,0 +1,11 @@
-+add_subdirectory(qt4)
-+
-+install(
-+  DIRECTORY doc
-+  DESTINATION share/doc/qtoctave-utils/xmlwidget
-+)
-+
-+install(
-+  DIRECTORY examples
-+  DESTINATION share/doc/qtoctave-utils/xmlwidget
-+)
-\ No newline at end of file
diff --git a/debian/patches/install_easyplot_as_target b/debian/patches/install_easyplot_as_target
new file mode 100644
index 0000000..0205dd1
--- /dev/null
+++ b/debian/patches/install_easyplot_as_target
@@ -0,0 +1,19 @@
+Use a different signature of the INSTALL command, so installation works also
+for an out-out-source build
+
+This patch was forwarded upstream.
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com> Sun, 04 Oct 2009 15:13:35 +0200
+
+--- a/easy_plot/src/CMakeLists.txt
++++ b/easy_plot/src/CMakeLists.txt
+@@ -42,6 +42,7 @@
+ TARGET_LINK_LIBRARIES(easy_plot ${Qt4_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTSVG_LIBRARY})
+ 
+ install	(
+-		PROGRAMS easy_plot
++		TARGETS easy_plot
++		RUNTIME
+ 		DESTINATION bin
+ 	)
+\ No newline at end of file
diff --git a/debian/patches/move_doc_under_doc b/debian/patches/move_doc_under_doc
index 3e6586e..017409b 100644
--- a/debian/patches/move_doc_under_doc
+++ b/debian/patches/move_doc_under_doc
@@ -1,17 +1,33 @@
-Index: qtoctave-0.9.1/qtoctave/src/CMakeLists.txt
-===================================================================
---- qtoctave-0.9.1.orig/qtoctave/src/CMakeLists.txt	2010-05-08 11:26:00.000000000 -0500
-+++ qtoctave-0.9.1/qtoctave/src/CMakeLists.txt	2010-05-08 11:32:49.000000000 -0500
-@@ -52,12 +52,6 @@
-         )
+Move the qtoctave_doc/ directory from /usr/share/qtoctave to
+/usr/share/doc/qtoctave
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 22 Apr 2008 09:03:38 +0200
+
+--- a/qtoctave/configure.h
++++ b/qtoctave/configure.h
+@@ -5,7 +5,7 @@
+ #define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave3.2-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"
+ 
+ #define PKG_CMD_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/pkg-commands.list"
+ #endif
+--- a/qtoctave/src/CMakeLists.txt
++++ b/qtoctave/src/CMakeLists.txt
+@@ -37,11 +37,13 @@
+ TARGET_LINK_LIBRARIES(qtoctave ${Qt4_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY})
  
  install (
--	DIRECTORY octave_doc
--	DESTINATION share/doc/octave-html
--	PATTERN ".svn" EXCLUDE
--	)
--
--install (
- 	DIRECTORY qtoctave_doc
- 	DESTINATION share/doc/qtoctave
+-	DIRECTORY images octave_doc qtoctave_doc menus scripts scripts_octave lang
++	DIRECTORY images menus scripts scripts_octave lang
+ 	DESTINATION share/qtoctave
  	PATTERN ".svn" EXCLUDE
+         )
+ 
++INSTALL ( DIRECTORY qtoctave_doc DESTINATION share/doc/qtoctave )
++
+ install	(
+ 	TARGETS qtoctave
+ 	RUNTIME DESTINATION bin
diff --git a/debian/patches/remove-sql-dep-from-easyplot b/debian/patches/remove-sql-dep-from-easyplot
deleted file mode 100644
index f89bc58..0000000
--- a/debian/patches/remove-sql-dep-from-easyplot
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qtoctave-0.9.1/easy_plot/src/CMakeLists.txt
-===================================================================
---- qtoctave-0.9.1.orig/easy_plot/src/CMakeLists.txt	2010-05-08 16:55:25.000000000 -0500
-+++ qtoctave-0.9.1/easy_plot/src/CMakeLists.txt	2010-05-08 16:55:34.000000000 -0500
-@@ -40,7 +40,7 @@
- 	moc_gnuplot_connection.cxx moc_input.cxx moc_main_window.cxx
- )
- 
--TARGET_LINK_LIBRARIES(easy_plot ${Qt4_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTSVG_LIBRARY})
-+TARGET_LINK_LIBRARIES(easy_plot ${Qt4_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSVG_LIBRARY})
- 
- SET_TARGET_PROPERTIES(easy_plot
-         PROPERTIES INSTALL_RPATH ":usr/lib"
diff --git a/debian/patches/series b/debian/patches/series
index 6e465f1..ece85af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,8 @@
-build-out-of-source
-use_octave3.0-htmldoc
-move_doc_under_doc
+dont_include_simple_rcs
 add_missing_includes
-
-generate_qm_files
-remove-sql-dep-from-easyplot
-install-supplementary-docs
-build-widgetserver
+font-option-in-png-export
+use_octave_htmldoc
+move_doc_under_doc
+install_easyplot_as_target
+build-out-of-source
+use_cstdio_header
diff --git a/debian/patches/use_cstdio_header b/debian/patches/use_cstdio_header
new file mode 100644
index 0000000..3a3f76a
--- /dev/null
+++ b/debian/patches/use_cstdio_header
@@ -0,0 +1,11 @@
+Include necessary headers for gcc-4.4, bug fix for 550264
+--- a/easy_plot/src/gnuplot_connection.cpp
++++ b/easy_plot/src/gnuplot_connection.cpp
+@@ -2,6 +2,7 @@
+ #include <QXmlStreamReader>
+ #include <QXmlStreamWriter>
+ #include <QHash>
++#include <cstdio>
+ 
+ GnuplotConnection::GnuplotConnection(QObject *parent):QProcess(parent)
+ {
diff --git a/debian/patches/use_octave3.0-htmldoc b/debian/patches/use_octave3.0-htmldoc
deleted file mode 100644
index f77af09..0000000
--- a/debian/patches/use_octave3.0-htmldoc
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qtoctave-0.9.1/qtoctave/src/configure.h.in
-===================================================================
---- qtoctave-0.9.1.orig/qtoctave/src/configure.h.in	2010-05-08 11:35:29.000000000 -0500
-+++ qtoctave-0.9.1/qtoctave/src/configure.h.in	2010-05-08 11:37:09.000000000 -0500
-@@ -2,7 +2,7 @@
- #ifndef __CONFIGURE_H__
- #define __CONFIGURE_H__
- #define CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave"
--#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave-html/octave_doc/index.html"
-+#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave3.2-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/doc/qtoctave/qtoctave_doc/index.html"
diff --git a/debian/patches/use_octave_htmldoc b/debian/patches/use_octave_htmldoc
new file mode 100644
index 0000000..66aa8fb
--- /dev/null
+++ b/debian/patches/use_octave_htmldoc
@@ -0,0 +1,16 @@
+Use octave3.2's htmldoc, instead of the stripped HTML files from
+upstream.
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat, 03 Oct 2009 15:32:16 +0200
+
+--- a/qtoctave/configure.h
++++ b/qtoctave/configure.h
+@@ -2,7 +2,7 @@
+ #ifndef __CONFIGURE_H__
+ #define __CONFIGURE_H__
+ #define CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave"
+-#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/octave_doc/index.html"
++#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave3.2-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"
diff --git a/debian/qtinfo.1 b/debian/qtinfo.1
deleted file mode 100644
index 9d90671..0000000
--- a/debian/qtinfo.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.TH QTOCTAVE 1 "May 9, 2010"
-.SH NAME
-qtinfo \- A simple texinfo browser in Qt
-.SH SYNOPSIS
-.B qtinfo
-.RI [ options ]
-.SH DESCRIPTION
-\fqtinfo\fP is a minimalistic Qt GNU texinfo browser.
-.SH SEE ALSO
-.BR qtoctave (1)
-.BR octave (1)
-.br
-.br
-.SH AUTHOR
-qtinfo was written by Pedro Luis Lucas Rosado
-<acisif at mixmail.com>.
-.PP
-This manual page was written by Jordi Gutiérrez Hermoso <jordigh at gmail.com>,
-for the Debian project (but may be used by others).
diff --git a/debian/qtjs.1 b/debian/qtjs.1
deleted file mode 100644
index d742304..0000000
--- a/debian/qtjs.1
+++ /dev/null
@@ -1,23 +0,0 @@
-.TH QTOCTAVE 1 "May 9, 2010"
-.SH NAME
-qtjs \- Implement QtOctave interfaces in Javascript
-.SH SYNOPSIS
-.B qtjs
-.RI [ options ]
-.SH DESCRIPTION
-\fqtjs\fP is a utility to create QtOctave interfaces in Qt and Javascript.
-.SH SEE ALSO
-.BR xmlwidget (1)
-.BR widgetserver (1)
-.BR qtoctave (1)
-.BR octave (1)
-.br
-.br
-\fqtjs\f's current documentation is under
-/usr/share/doc/qtoctave-utils/qtjs
-.SH AUTHOR
-qtjs was written by Pedro Luis Lucas Rosado
-<acisif at mixmail.com>.
-.PP
-This manual page was written by Jordi Gutiérrez Hermoso <jordigh at gmail.com>,
-for the Debian project (but may be used by others).
diff --git a/debian/qtoctave-utils.install b/debian/qtoctave-utils.install
deleted file mode 100644
index 3e37313..0000000
--- a/debian/qtoctave-utils.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/widgetserver usr/bin
-usr/bin/xmlwidget usr/bin
-usr/bin/simplercs usr/bin
-usr/bin/qtjs usr/bin
-usr/bin/qtinfo usr/bin
-usr/share/doc/qtoctave-utils usr/share/doc
diff --git a/debian/qtoctave-utils.manpages b/debian/qtoctave-utils.manpages
deleted file mode 100644
index 7be5d7c..0000000
--- a/debian/qtoctave-utils.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/widgetserver.1
-debian/xmlwidget.1
-debian/simplercs.1
-debian/qtjs.1
-debian/qtinfo.1
diff --git a/debian/qtoctave.1 b/debian/qtoctave.1
index dc53e68..3238b65 100644
--- a/debian/qtoctave.1
+++ b/debian/qtoctave.1
@@ -1,4 +1,4 @@
-.TH QTOCTAVE 1 "May 9, 2010"
+.TH QTOCTAVE 1 "June 17, 2007"
 .SH NAME
 QtOctave \- A Qt front-end for Octave
 .SH SYNOPSIS
@@ -11,8 +11,7 @@ and highly compatible with MATLAB. It provides a convenient command
 line interface for solving linear and nonlinear problems numerically.
 .SH SEE ALSO
 .BR octave (1)
-.BR easy_plot (1)
-.BR qtoctave_pkg (1)
+.BR widgetserver (1)
 .br
 .br
 .SH AUTHOR
diff --git a/debian/qtoctave.install b/debian/qtoctave.install
index ac7a0e4..977fde2 100644
--- a/debian/qtoctave.install
+++ b/debian/qtoctave.install
@@ -1,6 +1 @@
 debian/qtoctave.desktop usr/share/applications
-usr/bin/qtoctave usr/bin
-usr/bin/qtoctave_pkg usr/bin
-usr/bin/easy_plot usr/bin
-usr/share/qtoctave usr/share
-usr/share/doc/qtoctave/ usr/share/doc
diff --git a/debian/qtoctave.manpages b/debian/qtoctave.manpages
index be043ac..9d6f2ad 100644
--- a/debian/qtoctave.manpages
+++ b/debian/qtoctave.manpages
@@ -1,4 +1,2 @@
 debian/qtoctave.1
-debian/easy_plot.1
-debian/qtoctave_pkg.1
-
+debian/widgetserver.1
diff --git a/debian/qtoctave_pkg.1 b/debian/qtoctave_pkg.1
deleted file mode 100644
index e138e0b..0000000
--- a/debian/qtoctave_pkg.1
+++ /dev/null
@@ -1,25 +0,0 @@
-.TH QTOCTAVE 1 "May 9, 2010"
-.SH NAME
-qtoctave_pkg \- A Qt front-end for Octave's user-contributed packages
-.SH SYNOPSIS
-.B qtoctave_pkg
-.RI [ options ]
-.SH DESCRIPTION
-\fBQtOctave\fP is a Qt front-end to GNU Octave. \fBGNU Octave\fP is a
-high-level language, primarily intended for numerical computations,
-and highly compatible with MATLAB. It provides a convenient command
-line interface for solving linear and nonlinear problems numerically.
-.BR
-octave_pkg is a tool for handling the user installation of
-user-contributed Octave packages, the so called Octave-Forge
-repository from SourceForge. It is called internally by \fqtoctave\f.
-.SH SEE ALSO
-.BR qtoctave (1)
-.BR octave (1)
-.br
-.br
-.SH AUTHOR
-QtOctave was written by Pedro Luis Lucas Rosado <acisif at mixmail.com>.
-.PP
-This manual page was written by Jordi Gutiérrez Hermoso <jordigh at gmail.com>,
-for the Debian project (but may be used by others).
diff --git a/debian/rules b/debian/rules
index 7120d41..d73b712 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,8 +25,6 @@ get-orig-source:
 	wget $(URL) -O $(TARBALL)
 	tar xfz $(TARBALL)
 	( cd $(PACKVER) ; 				\
-	  rm -rf simple_rcs qtoctave/src/octave_doc ;	\
-	  mv qtoctave/* . ;				\
-	  rm -rf  qtoctave )
+	  rm -rf simple_rcs qtoctave/src/octave_doc )
 	tar cfz $(PACKAGE)_$(VERSION)+dfsg.orig.tar.gz $(PACKVER)
 	rm -rf $(PACKVER) $(TARBALL)
diff --git a/debian/simplercs.1 b/debian/simplercs.1
deleted file mode 100644
index 6b56ff0..0000000
--- a/debian/simplercs.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.TH QTOCTAVE 1 "May 9, 2010"
-.SH NAME
-simplercs \- A simple VCS in the spirit of RCS
-.SH SYNOPSIS
-.B simplercs
-.RI [ options ]
-.SH DESCRIPTION
-\fsimplercs\fP is a what it says on the tin: a simple VCS in the
-spirit of RCS with a Qt interface.
-.SH SEE ALSO
-.BR qtoctave (1)
-.BR octave (1)
-.br
-.br
-\fsimplerc\f's current documentation is under
-/usr/share/doc/qtoctave-utils/simple_rcs
-.SH AUTHOR
-simplercs was written by Pedro Luis Lucas Rosado
-<acisif at mixmail.com>.
-.PP
-This manual page was written by Jordi Gutiérrez Hermoso <jordigh at gmail.com>,
-for the Debian project (but may be used by others).
diff --git a/debian/widgetserver.1 b/debian/widgetserver.1
index 24a3bda..856db28 100644
--- a/debian/widgetserver.1
+++ b/debian/widgetserver.1
@@ -1,4 +1,4 @@
-.TH QTOCTAVE 1 "May 9, 2010"
+.TH QTOCTAVE 1 "June 17, 2007"
 .SH NAME
 widgetserver \- A tool for adding custom widgets to QtOctave
 .SH SYNOPSIS
@@ -12,14 +12,12 @@ intended for numerical computations.  \fBGNU Octave\fP provides a
 convenient command line interface for solving linear and nonlinear
 problems numerically.
 .SH SEE ALSO
-.BR qtjs (1)
-.BR xmlwidget (1)
 .BR qtoctave (1)
 .BR octave (1)
 .br
 .br
 widgetserver's current documentation is under
-/usr/share/doc/qtoctave-utils/widgetserver in HTML format.
+/usr/share/doc/qtoctave/html in HTML format.
 .SH AUTHOR
 widgetserver was written by Pedro Luis Lucas Rosado
 <acisif at mixmail.com>.
diff --git a/debian/xmlwidget.1 b/debian/xmlwidget.1
deleted file mode 100644
index b997e81..0000000
--- a/debian/xmlwidget.1
+++ /dev/null
@@ -1,23 +0,0 @@
-.TH QTOCTAVE 1 "May 9, 2010"
-.SH NAME
-xmlwidget \- Implement QtOctave interfaces in XML
-.SH SYNOPSIS
-.B xmlwidget
-.RI [ options ]
-.SH DESCRIPTION
-\fxmlwidget\fP is a utility to create QtOctave interfaces in Qt and XML.
-.SH SEE ALSO
-.BR qtjs (1)
-.BR widgetserver (1)
-.BR qtoctave (1)
-.BR octave (1)
-.br
-.br
-\fxmlwidget\f's current documentation is under
-/usr/share/doc/qtoctave-utils/xmlwidget
-.SH AUTHOR
-xmlwidget was written by Pedro Luis Lucas Rosado
-<acisif at mixmail.com>.
-.PP
-This manual page was written by Jordi Gutiérrez Hermoso <jordigh at gmail.com>,
-for the Debian project (but may be used by others).

-- 
qtoctave



More information about the Pkg-octave-commit mailing list