--- tora-2.0.0.orig/debian/control +++ tora-2.0.0/debian/control @@ -3,14 +3,17 @@ Priority: optional Maintainer: Debian KDE Extras Team Uploaders: Michael Meskes -Build-Depends: debhelper (>= 5), autotools-dev, kdelibs4-dev, docbook-xml (>= 4.2), xsltproc, docbook-xsl, kdebase-bin, libqscintilla-dev, texinfo, dpatch -Standards-Version: 3.7.3 +Build-Depends: debhelper (>= 5), kdelibs5-dev, kdebase-bin, dpatch, libqscintilla2-dev, cdbs, libpq-dev +Standards-Version: 3.8.1 +Homepage: http://sourceforge.net/projects/tora/ +Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/tora.git +Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/tora.git Package: tora Architecture: any -Depends: libqt3-mt-psql|libqt3-mt-odbc|libqt3-mt-mysql, ${shlibs:Depends} +Depends: libqt4-sql, ${shlibs:Depends}, ${misc:Depends} Description: A graphical toolkit for database developers and administrators Tora features a schema browser, SQL worksheet, PL/SQL editor & debugger, storage manager, rollback segment monitor, instance manager, and SQL output - viewer. Via qt3 it can access PostgreSQL and MySQL directly. Any other + viewer. Via qt4 it can access PostgreSQL and MySQL directly. Any other database systems can be accessed via ODBC. --- tora-2.0.0.orig/debian/rules +++ tora-2.0.0/debian/rules @@ -1,91 +1,31 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -include /usr/share/dpatch/dpatch.make - -DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl -XP=xsltproc -''-nonet - - -configure: patch configure-stamp -configure-stamp: - dh_testdir -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include /usr/share/cdbs/1/rules/dpatch.mk + +DEB_KDE_ENABLE_FINAL := yes + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif endif - # Add here commands to configure the package. - ./configure --prefix=/usr --without-oracle --without-rpath --disable-new-check --with-kde --enable-libsuffix= --infodir=/usr/share/info - - touch configure-stamp - -build: build-stamp - -build-stamp: configure - dh_testdir - - # Add here commands to compile the package. - $(MAKE) CFLAGS_GLOB="-O2 -W -g -fPIC -Wall -Wno-unused" libdir=/usr/share/tora - $(XP) $(DB2MAN) debian/tora.xml - - touch build-stamp - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - find . -name "*.qm" -exec rm {} \; - rm -f tora.pro license/tolicenseui.h license/tolicenseui.cpp license/tolicense.moc license/tolicenseui.moc - rm -f tora.1 - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tora. - $(MAKE) install DESTDIR=$(CURDIR)/debian/tora libdir=/usr/share/tora - -install --owner root --group root --mode=644 $(CURDIR)/src/icons/tora.xpm $(CURDIR)/debian/tora/usr/share/icons/hicolor/32x32/apps +install/tora:: + # remove some file we don't want to install + rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/README.OSX + rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/README.LICENSE + rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/README.WINDOWS + rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/INSTALL + rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/COPYING + rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/ChangeLog + rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/changelog + # this file cannot be installed by dh_install because it has to be renamed -install --owner root --group root --mode=644 $(CURDIR)/src/icons/toramini.xpm $(CURDIR)/debian/tora/usr/share/icons/hicolor/16x16/apps/tora.xpm + # we have a desktop file -install --owner root --group root --mode=644 $(CURDIR)/debian/tora.desktop $(CURDIR)/debian/tora/usr/share/applications - -# 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_installdocs - dh_installexamples - dh_installmenu - dh_installman tora.1 - dh_installinfo - dh_installchangelogs dh_desktop - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure --- tora-2.0.0.orig/debian/tora.install +++ tora-2.0.0/debian/tora.install @@ -0,0 +1,4 @@ +doc/help/*.html /usr/share/tora/help +doc/help/images/*.png /usr/share/tora/help/images + +src/icons/tora.xpm /usr/share/icons/hicolor/32x32/apps --- tora-2.0.0.orig/debian/changelog +++ tora-2.0.0/debian/changelog @@ -1,3 +1,48 @@ +tora (2.0.0-4build2) karmic; urgency=low + + * No-change-rebuild to fix crash in QColor::operator (LP: #399903) + Thanks xtknight for the hint. + + -- Andreas Moog Tue, 11 Aug 2009 00:29:54 +0200 + +tora (2.0.0-4build1) karmic; urgency=low + + * No-change rebuild against libqscintilla7. + + -- Steve Langasek Thu, 11 Jun 2009 01:03:37 +0000 + +tora (2.0.0-4) unstable; urgency=low + + * Added patch to add missing include directives, closes: #526166 + + -- Michael Meskes Mon, 04 May 2009 16:12:37 +0200 + +tora (2.0.0-3) unstable; urgency=low + + * Cleaned up packaging a little bit. + * Added homepage information to control file. + * Bumped Standards-Version to 3.8.1. + * Released to unstable. + + -- Michael Meskes Tue, 07 Apr 2009 13:16:05 +0200 + +tora (2.0.0-2) experimental; urgency=low + + * Added build dependency on libpq-dev to get full PostgreSQL support. + + -- Michael Meskes Tue, 06 Jan 2009 08:49:43 +0100 + +tora (2.0.0-1) experimental; urgency=low + + * New upstream version for KDE4/Qt4. + * Added watch file. + * Updated to standards version 3.8.0, no additional changes needed. + * No longer need texinfo to build, the html files are part of the tarball. + * Streamlined build dependencies. + * Updated copyright file. + + -- Michael Meskes Sat, 03 Jan 2009 20:51:13 +0100 + tora (1.3.23-1) unstable; urgency=low * New upstream version --- tora-2.0.0.orig/debian/compat +++ tora-2.0.0/debian/compat @@ -0,0 +1,2 @@ +5 + --- tora-2.0.0.orig/debian/watch +++ tora-2.0.0/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://sf.net/tora tora-([\d\.]*)\.tar\.gz + --- tora-2.0.0.orig/debian/dirs +++ tora-2.0.0/debian/dirs @@ -1,5 +1,2 @@ -usr/bin -usr/lib/tora -usr/share/icons/hicolor/32x32/apps -usr/share/icons/hicolor/16x16/apps -usr/share/applications +/usr/share/icons/hicolor/16x16/apps/ +/usr/share/applications/ --- tora-2.0.0.orig/debian/copyright +++ tora-2.0.0/debian/copyright @@ -3,48 +3,24 @@ It was downloaded from http://tora.sourceforge.net/ -Upstream Author: Henrik Johnson - Nathan Neulinger - -BEGIN_COMMON_COPYRIGHT_HEADER - -TOra - An Oracle Toolkit for DBA's and developers - -Shared/mixed copyright is held throughout files in this product +Upstream Authors: Petr Vaněk + Mike Johnson + Alexey Danilchenko + Ivan Brezina + Oliver Jehle + Raj Thukral + Thomas Porschberg + Volker Götz + Nathan Neulinger + Henrik Johnson +Copyright: Portions Copyright (C) 2000-2001 Underscore AB Portions Copyright (C) 2003-2005 Quest Software, Inc. Portions Copyright (C) 2004-2008 Numerous Other Contributors -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 the Free Software Foundation; only version 2 of -the License is valid for this program. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - As a special exception, you have permission to link this program - with the Oracle Client libraries and distribute executables, as long - as you follow the requirements of the GNU GPL in regard to all of the - software in the executable aside from Oracle client libraries. - - Specifically you are not permitted to link this program with the - Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. - And you are not permitted to distribute binaries compiled against - these libraries. - - You may link this product with any GPL'd Qt library. - -All trademarks belong to their respective owners. - -END_COMMON_COPYRIGHT_HEADER +You may use, distribute and copy Toolkit for Oracle under the terms of +GNU General Public License version 2. On Debian GNU/Linux systems, a copy of the GNU GPL can be found in /usr/share/common-licenses/GPL. --- tora-2.0.0.orig/debian/tora.links +++ tora-2.0.0/debian/tora.links @@ -1,3 +1 @@ -usr/share/tora/help usr/lib/tora/help usr/share/tora/help usr/share/doc/tora/help - --- tora-2.0.0.orig/debian/patches/01_missing_includes.dpatch +++ tora-2.0.0/debian/patches/01_missing_includes.dpatch @@ -0,0 +1,51 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_missing_includes.dpatch by Michael Meskes +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Some missing include directives + +@DPATCH@ + +--- tora-2.0.0/src/toqvalue.cpp~ 2009-04-29 17:02:16.000000000 +0000 ++++ tora-2.0.0/src/toqvalue.cpp 2009-04-29 17:02:23.000000000 +0000 +@@ -47,6 +47,8 @@ + #include + #include + ++#include ++ + static int NumberFormat; + static int NumberDecimals; + +--- tora-2.0.0/src/todebug.cpp~ 2009-04-29 17:04:00.000000000 +0000 ++++ tora-2.0.0/src/todebug.cpp 2009-04-29 17:04:11.000000000 +0000 +@@ -58,6 +58,7 @@ + #include "totool.h" + #include "tocodemodel.h" + ++#include + #include + + #include +--- tora-2.0.0/src/tomodeleditor.cpp~ 2009-04-29 17:09:30.000000000 +0000 ++++ tora-2.0.0/src/tomodeleditor.cpp 2009-04-29 17:09:42.000000000 +0000 +@@ -59,6 +59,8 @@ + #include + #include + ++#include ++ + #include "icons/commit.xpm" + #include "icons/copy.xpm" + #include "icons/cut.xpm" +--- tora-2.0.0/src/toresultview.cpp~ 2009-04-29 17:17:49.000000000 +0000 ++++ tora-2.0.0/src/toresultview.cpp 2009-04-29 17:18:01.000000000 +0000 +@@ -54,6 +54,8 @@ + #include "totool.h" + #include "toresultlistformat.h" + ++#include ++ + #include + #include + #include --- tora-2.0.0.orig/debian/patches/00list +++ tora-2.0.0/debian/patches/00list @@ -1,4 +1,2 @@ -01_maximize -02_cleantarget -03_gcc43_includes - +01_missing_includes +03_README.LAYOUT --- tora-2.0.0.orig/debian/patches/03_README.LAYOUT.dpatch +++ tora-2.0.0/debian/patches/03_README.LAYOUT.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_README.LAYOUT.dpatch by Michael Meskes +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No such file README.LAYOUT + +@DPATCH@ + +diff -ruN tora-2.0.0.orig/CMakeLists.txt tora-2.0.0/CMakeLists.txt +--- tora-2.0.0.orig/CMakeLists.txt 2008-11-03 21:32:20.000000000 +0100 ++++ tora-2.0.0/CMakeLists.txt 2009-01-03 21:29:48.000000000 +0100 +@@ -282,7 +282,6 @@ + README.BINARIES + README.CMAKE + README.CODESTYLE +- README.LAYOUT + README.LICENSE + README.OSX + README.RELEASE