[Pkg-octave-commit] r1777 - in qtoctave/trunk/debian: . patches
Thomas Weber
thomas-guest at alioth.debian.org
Mon Apr 21 20:00:48 UTC 2008
tags 476768 pending
thanks
Author: thomas-guest
Date: 2008-04-21 20:00:48 +0000 (Mon, 21 Apr 2008)
New Revision: 1777
Added:
qtoctave/trunk/debian/patches/build-out-of-source
qtoctave/trunk/debian/patches/move_doc_under_doc
qtoctave/trunk/debian/patches/use_octave3.0-htmldoc
qtoctave/trunk/debian/qtoctave.install
qtoctave/trunk/debian/qtoctave.lintian-overrides
qtoctave/trunk/debian/qtoctave.manpages
Removed:
qtoctave/trunk/debian/patches/compile-with-gcc-4.4.diff
Modified:
qtoctave/trunk/debian/changelog
qtoctave/trunk/debian/control
qtoctave/trunk/debian/copyright
qtoctave/trunk/debian/docs
qtoctave/trunk/debian/patches/series
qtoctave/trunk/debian/rules
Log:
Lots of changes for qtoctave-0.7.4
Upstream switched to cmake, so use CDBS' cmake.mk for package building
- Use qtoctave.manpages for manpage installation
- Add necessary dependencies to debian/control
- Override lintian warnings for empty directories: either they are empty from
upstream or from the DFSG repackaging
- build-out-of-source: enable out-of-source-building with cmake: default of
CDBS and the recommended way of cmake's upstream (and it seems I'm doomed
to rewrite every CMakelists.txt file I come across)
- use_octave3.0-htmldoc: use octave3.0's HTML documentation instead of the stripped upstream one
- move_doc_under_doc: Put documenation under /usr/share/doc/qtoctave
Modified: qtoctave/trunk/debian/changelog
===================================================================
--- qtoctave/trunk/debian/changelog 2008-04-18 16:51:20 UTC (rev 1776)
+++ qtoctave/trunk/debian/changelog 2008-04-21 20:00:48 UTC (rev 1777)
@@ -1,10 +1,31 @@
-qtoctave (0.7.1+dfsg-5) UNRELEASED; urgency=low
+qtoctave (0.7.4+dfsg-1) UNRELEASED; urgency=low
+ [ Rafael Laboissiere ]
* debian/control: Drop the build-dependencies on several lib*-dev
packages introduced in the previous versions. Force the
build-dependency on libqt4-dev to be equal or greater than 4.4.0~rc1-4
in order to have the above working.
+ [ Thomas Weber ]
+ * New upstream version (starts up cleanly, closes: #476768)
+ * debian/rules, debian/control: switch to CMake based system, as upstream
+ switched to CMake. Likewise, use CDBS.
+ * New patches:
+ - build-out-of-source:
+ enables out-of-source builds for CMake, by addinge some include paths to
+ the cmake include directories
+ - use_octave3.0-htmldoc:
+ Use octave3.0's htmldoc, instead of the stripped HTML files from
+ upstream.
+ - move_doc_under_doc:
+ Move the qtoctave_doc/ directory from /usr/share/qtoctave to
+ /usr/share/doc/qtoctave
+ Dropped patch: compile-with-gcc-4.4.diff, now superfluous.
+ * debian/docs: some doc files changed their names to lowercase.
+ * Use debian/qtoctave.manpages for manpage installation.
+ * debian/lintian-overrides: Override empty directory warnings. The
+ directories are either empty from upstream or after the repackaging.
+
-- Rafael Laboissiere <rafael at debian.org> Wed, 16 Apr 2008 13:53:21 +0200
qtoctave (0.7.1+dfsg-4) unstable; urgency=low
Modified: qtoctave/trunk/debian/control
===================================================================
--- qtoctave/trunk/debian/control 2008-04-18 16:51:20 UTC (rev 1776)
+++ qtoctave/trunk/debian/control 2008-04-21 20:00:48 UTC (rev 1777)
@@ -6,7 +6,7 @@
Rafael Laboissiere <rafael at debian.org>,
Thomas Weber <thomas.weber.mail at gmail.com>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5.0.51), autotools-dev, sharutils,
+Build-Depends: debhelper (>= 5.0.51), cdbs, cmake, sharutils,
libqt4-dev (>= 4.4.0~rc1-4), quilt
Standards-Version: 3.7.3
Homepage: http://qtoctave.wordpress.com/about/
Modified: qtoctave/trunk/debian/copyright
===================================================================
--- qtoctave/trunk/debian/copyright 2008-04-18 16:51:20 UTC (rev 1776)
+++ qtoctave/trunk/debian/copyright 2008-04-21 20:00:48 UTC (rev 1777)
@@ -36,6 +36,11 @@
<jordigh at gmail.com> and is licensed under the GPL, see
`/usr/share/common-licenses/GPL'.
+The original tarball was repackaged and the files in the octave_doc/ directory
+removed. These files are generated HTML without the corresponding Texinfo
+source. While repackaging, the erroneous executable bit on most files was
+dropped.
+
On Debian systems, the complete text of the GNU General Public
License, version 2, can be found in /usr/share/common-licenses/GPL-2.
Modified: qtoctave/trunk/debian/docs
===================================================================
--- qtoctave/trunk/debian/docs 2008-04-18 16:51:20 UTC (rev 1776)
+++ qtoctave/trunk/debian/docs 2008-04-21 20:00:48 UTC (rev 1777)
@@ -1,5 +1,4 @@
-LEEME.txt
+leeme.txt
LICENSE_GPL.txt
-NEWS.txt
-README.txt
-README.txt
+news.txt
+readme.txt
Added: qtoctave/trunk/debian/patches/build-out-of-source
===================================================================
--- qtoctave/trunk/debian/patches/build-out-of-source (rev 0)
+++ qtoctave/trunk/debian/patches/build-out-of-source 2008-04-21 20:00:48 UTC (rev 1777)
@@ -0,0 +1,100 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,8 +11,6 @@
+ set(CMAKE_BUILD_TYPE Release)
+ 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 @@
+-
+-#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 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
+@@ -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)
+
+ 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 @@
++#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 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
+@@ -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
+@@ -19,7 +19,7 @@
+ #ifndef __PROJECTS_H__
+ #define __PROJECTS_H__
+
+-#include "../ui_projects.h"
++#include "ui_projects.h"
+ #include "../config.h"
+
+ using namespace Ui;
+--- a/src/projects/projects.cpp
++++ b/src/projects/projects.cpp
+@@ -1,5 +1,5 @@
+ #include "projects.h"
+-#include "../ui_newprojectdialog.h"
++#include "ui_newprojectdialog.h"
+ #include <QXmlStreamReader>
+ #include <QXmlStreamWriter>
+ #include <QDir>
Deleted: qtoctave/trunk/debian/patches/compile-with-gcc-4.4.diff
===================================================================
--- qtoctave/trunk/debian/patches/compile-with-gcc-4.4.diff 2008-04-18 16:51:20 UTC (rev 1776)
+++ qtoctave/trunk/debian/patches/compile-with-gcc-4.4.diff 2008-04-21 20:00:48 UTC (rev 1777)
@@ -1,10 +0,0 @@
---- qtoctave-0.7.1+dfsg.orig/install-tool2/install.cpp
-+++ qtoctave-0.7.1+dfsg/install-tool2/install.cpp
-@@ -2,6 +2,7 @@
- #include <stdio.h>
- #include <QTextStream>
- #include <QProcess>
-+#include <cstdlib>
-
- Install::Install()
- {
Added: qtoctave/trunk/debian/patches/move_doc_under_doc
===================================================================
--- qtoctave/trunk/debian/patches/move_doc_under_doc (rev 0)
+++ qtoctave/trunk/debian/patches/move_doc_under_doc 2008-04-21 20:00:48 UTC (rev 1777)
@@ -0,0 +1,25 @@
+--- a/src/configure.h.in
++++ b/src/configure.h.in
+@@ -3,5 +3,5 @@
+ #define CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave"
+ #define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave3.0-htmldoc/interpreter/index.html"
+ #define ICON_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/images"
+-#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})
+
+ install (
+- DIRECTORY images octave_doc qtoctave_doc menus
++ DIRECTORY images octave_doc menus
+ DESTINATION share/qtoctave
+ )
+
++INSTALL ( DIRECTORY qtoctave_doc DESTINATION share/doc/qtoctave )
++
+ install (
+ TARGETS qtoctave
+ RUNTIME DESTINATION bin
Modified: qtoctave/trunk/debian/patches/series
===================================================================
--- qtoctave/trunk/debian/patches/series 2008-04-18 16:51:20 UTC (rev 1776)
+++ qtoctave/trunk/debian/patches/series 2008-04-21 20:00:48 UTC (rev 1777)
@@ -1 +1,3 @@
-compile-with-gcc-4.4.diff
+build-out-of-source
+use_octave3.0-htmldoc
+move_doc_under_doc
Added: qtoctave/trunk/debian/patches/use_octave3.0-htmldoc
===================================================================
--- qtoctave/trunk/debian/patches/use_octave3.0-htmldoc (rev 0)
+++ qtoctave/trunk/debian/patches/use_octave3.0-htmldoc 2008-04-21 20:00:48 UTC (rev 1777)
@@ -0,0 +1,11 @@
+--- a/src/configure.h.in
++++ b/src/configure.h.in
+@@ -1,7 +1,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/octave.html"
++#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave3.0-htmldoc/interpreter/index.html"
+ #define ICON_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/images"
+ #define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/qtoctave_doc/index.html"
+ #endif
Added: qtoctave/trunk/debian/qtoctave.install
===================================================================
--- qtoctave/trunk/debian/qtoctave.install (rev 0)
+++ qtoctave/trunk/debian/qtoctave.install 2008-04-21 20:00:48 UTC (rev 1777)
@@ -0,0 +1 @@
+debian/qtoctave.desktop usr/share/applications
Added: qtoctave/trunk/debian/qtoctave.lintian-overrides
===================================================================
--- qtoctave/trunk/debian/qtoctave.lintian-overrides (rev 0)
+++ qtoctave/trunk/debian/qtoctave.lintian-overrides 2008-04-21 20:00:48 UTC (rev 1777)
@@ -0,0 +1,8 @@
+# directories are empty in upstream's tarball as of 0.7.4
+qtoctave: package-contains-empty-directory usr/share/qtoctave/menus/Help/
+qtoctave: package-contains-empty-directory usr/share/qtoctave/menus/Matrix/
+qtoctave: package-contains-empty-directory usr/share/qtoctave/menus/Statistics/
+
+# directory is empty after repackaging; I didn't remove the whole directory,
+# because I didn't want to change the CMakelists.txt files further
+qtoctave: package-contains-empty-directory usr/share/qtoctave/octave_doc/
Added: qtoctave/trunk/debian/qtoctave.manpages
===================================================================
--- qtoctave/trunk/debian/qtoctave.manpages (rev 0)
+++ qtoctave/trunk/debian/qtoctave.manpages 2008-04-21 20:00:48 UTC (rev 1777)
@@ -0,0 +1,2 @@
+debian/qtoctave.1
+debian/widgetserver.1
Modified: qtoctave/trunk/debian/rules
===================================================================
--- qtoctave/trunk/debian/rules 2008-04-18 16:51:20 UTC (rev 1776)
+++ qtoctave/trunk/debian/rules 2008-04-21 20:00:48 UTC (rev 1777)
@@ -1,110 +1,20 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/quilt/quilt.make
+# use octave3.0-htmldoc for documenation
+DEB_CMAKE_EXTRA_FLAGS=
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DELFILE = rm -f
-
-PREFIX = /usr
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-config.status: configure
- dh_testdir
- chmod +x configure
- ./configure --prefix=$(PREFIX)
-
-
-build: build-stamp
+# include icons
+build/qtoctave::
uudecode < debian/icons.tar.uu
+ tar -xf icons.tar -C debian
-build-stamp: patch config.status
- dh_testdir
- $(MAKE)
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
-# Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) -n clean
- -[ ! -f clean.sh ] || sh clean.sh
- -$(DELFILE) qtoctave/qtoctave install-tool2/install-tool \
- widgetserver/widgetserver install-tool2/*.o \
- qtoctave/qtoctave.pro
- -$(DELFILE) Makefile
-
+# clean icons
+clean::
rm -f icons.tar
- dh_clean
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/qtoctave.
- $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/qtoctave install
- dh_install debian/qtoctave.desktop usr/share/applications
- dh_desktop
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- tar -xf icons.tar -C debian
- dh_installdocs
-# mv $(CURDIR)/debian/qtoctave/usr/share/qtoctave/qtoctave_doc \
-# $(CURDIR)/debian/qtoctave/usr/share/doc/qtoctave/html
- dh_installexamples
-# dh_install
- dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman debian/qtoctave.1 debian/widgetserver.1
- dh_icons
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install unpatch
+# TODO: qtoctave_doc nach /usr/share/doc/qtoctave
More information about the Pkg-octave-commit
mailing list