rev 8043 - in kde-extras/tora/trunk: . debian debian/patches
Michael Meskes
meskes at alioth.debian.org
Thu Nov 22 09:59:09 UTC 2007
Author: meskes
Date: 2007-11-22 09:59:09 +0000 (Thu, 22 Nov 2007)
New Revision: 8043
Added:
kde-extras/tora/trunk/debian/
kde-extras/tora/trunk/debian/changelog
kde-extras/tora/trunk/debian/control
kde-extras/tora/trunk/debian/dirs
kde-extras/tora/trunk/debian/docs
kde-extras/tora/trunk/debian/patches/
kde-extras/tora/trunk/debian/patches/00list
kde-extras/tora/trunk/debian/patches/01_maximize.dpatch
kde-extras/tora/trunk/debian/patches/02_cleantarget.dpatch
kde-extras/tora/trunk/debian/rules
kde-extras/tora/trunk/debian/tora.desktop
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: kde-extras/tora/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: kde-extras/tora/trunk/debian/changelog
===================================================================
--- kde-extras/tora/trunk/debian/changelog (rev 0)
+++ kde-extras/tora/trunk/debian/changelog 2007-11-22 09:59:09 UTC (rev 8043)
@@ -0,0 +1,300 @@
+tora (1.3.22-2) unstable; urgency=low
+
+ * Fixed help system
+ * Moved translations to /usr/share, closes: #448950
+ * Remove deprecated debian.patch file.
+
+ -- Michael Meskes <meskes at debian.org> Tue, 20 Nov 2007 13:05:47 +0100
+
+tora (1.3.22-1) unstable; urgency=low
+
+ * New upstream version.
+ * Added texinfo to Build-Depends, closes: #443296
+ * Build process now uses dpatch.
+
+ -- Michael Meskes <meskes at debian.org> Fri, 21 Sep 2007 13:48:45 +0200
+
+tora (1.3.21pre22-3) unstable; urgency=low
+
+ * Do not remove files from the orig tarball in our clean target, closes: #442749
+ * Resynced with svn to prepare for upcoming 1.3.22 release.
+
+ -- Michael Meskes <meskes at debian.org> Tue, 18 Sep 2007 11:15:46 +0200
+
+tora (1.3.21pre22-2) unstable; urgency=low
+
+ * Fixed incorrect display of UTF-8 characters, closes: #418524
+
+ -- Michael Meskes <meskes at debian.org> Fri, 08 Jun 2007 14:44:29 +0200
+
+tora (1.3.21pre22-1) unstable; urgency=low
+
+ * Applied latest upstream pre1.3.22 patch.
+ * Moved to qscintilla 1.7.
+
+ -- Michael Meskes <meskes at debian.org> Tue, 22 May 2007 15:35:55 +0200
+
+tora (1.3.21-3) unstable; urgency=low
+
+ * Added XDG menu support, closes: #354166
+
+ -- Michael Meskes <meskes at debian.org> Mon, 17 Apr 2006 13:41:02 +0200
+
+tora (1.3.21-2) unstable; urgency=low
+
+ * Added patch by Martin Michlmayr to make tora compile with G++ 4.1,
+ closes: #357810
+ * Fixed URL in copyright file, closes: #358394
+
+ -- Michael Meskes <meskes at debian.org> Fri, 24 Mar 2006 13:30:31 +0100
+
+tora (1.3.21-1) unstable; urgency=low
+
+ * New upstream version, fixing the bug that urged me to call autogen.sh and
+ thus making the package build again without build-depending on automake et
+ al., closes: #352513
+ * Added most of the debian specific patch to upstream sources.
+
+ -- Michael Meskes <meskes at debian.org> Mon, 13 Feb 2006 15:02:29 +0100
+
+tora (1.3.20-1) unstable; urgency=low
+
+ * New upstream version.
+ * Use the 16x16 icon that is provided by upstream.
+
+ -- Michael Meskes <meskes at debian.org> Sat, 11 Feb 2006 10:24:33 +0100
+
+tora (1.3.18-4) unstable; urgency=low
+
+ * Changed QODBC to QODBC3 one more time, closes: #347373
+
+ -- Michael Meskes <meskes at debian.org> Thu, 12 Jan 2006 13:32:24 +0100
+
+tora (1.3.18-3) unstable; urgency=low
+
+ * Updated libtool so hopefully Debian GNU/k*BSD is supported now
+ closes: #342702
+ * Added 16x16 menu icon
+ * Updated debhelper to version 4
+
+ -- Michael Meskes <meskes at debian.org> Sun, 11 Dec 2005 19:03:49 +0100
+
+tora (1.3.18-2) unstable; urgency=low
+
+ * Added --enable-libsuffix= to make sure kdelibs are found even on sparc,
+ closes: #328124
+
+ -- Michael Meskes <meskes at debian.org> Fri, 16 Sep 2005 08:48:14 +0200
+
+tora (1.3.18-1) unstable; urgency=low
+
+ * New upstream version
+ * Compiled against KDE 3.4.2, closes: #312432
+
+ -- Michael Meskes <meskes at debian.org> Tue, 6 Sep 2005 13:32:17 +0200
+
+tora (1.3.16-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Michael Meskes <meskes at debian.org> Sun, 6 Mar 2005 11:08:40 +0100
+
+tora (1.3.15-1) unstable; urgency=low
+
+ * New upstream version
+ * Changed QODBC to QODBC3, closes: #285510
+
+ -- Michael Meskes <meskes at debian.org> Fri, 4 Mar 2005 11:26:34 +0100
+
+tora (1.3.14.1-3) unstable; urgency=low
+
+ * This time really add the build-depend on kdebase-bin
+
+ -- Michael Meskes <meskes at debian.org> Mon, 5 Jul 2004 20:26:14 +0200
+
+tora (1.3.14.1-2) unstable; urgency=low
+
+ * Build-depend on kdebase-bin (closes: #253765)
+ * Changed configure.pl to check for kdcop instead of kwin.
+
+ -- Michael Meskes <meskes at debian.org> Mon, 5 Jul 2004 12:47:34 +0200
+
+tora (1.3.14.1-1) unstable; urgency=low
+
+ * New upstream version.
+ * Made sure KDE files are installed (closes: #253765)
+
+ -- Michael Meskes <meskes at debian.org> Sun, 4 Jul 2004 17:12:34 +0200
+
+tora (1.3.13-3) unstable; urgency=low
+
+ * Updated standards version.
+ * Added man page.
+ * Added symlink from /usr/share/doc/tora to help files.
+ * Make sure all built files are cleaned.
+ * Compile without "new check".
+ * Added kderemove="y" to menu entry. Use icons already installed in
+ KDE structure; don't install twice. Improved menu text.
+ * Updated copyright.
+
+ -- Michael Meskes <meskes at debian.org> Wed, 24 Mar 2004 19:27:28 +0100
+
+tora (1.3.13-2) unstable; urgency=low
+
+ * Added icon, improved capitalization of menu entry.
+
+ -- Michael Meskes <meskes at debian.org> Mon, 01 Mar 2004 11:30:15 +0100
+
+tora (1.3.13-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Michael Meskes <meskes at debian.org> Sun, 15 Feb 2004 10:47:47 +0100
+
+tora (1.3.12-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Michael Meskes <meskes at debian.org> Tue, 21 Oct 2003 19:13:32 +0200
+
+tora (1.3.11-1) unstable; urgency=low
+
+ * New upstream version
+ * Moved help files from /usr/lib to /usr/share
+
+ -- Michael Meskes <meskes at debian.org> Sun, 31 Aug 2003 12:15:51 +0200
+
+tora (1.3.9.2-3) unstable; urgency=low
+
+ * Removed full screen opening (closes: #167590)
+ * Added patch from CVS so changed values are saved.
+ * Added my patches to doc/
+
+ -- Michael Meskes <meskes at debian.org> Sun, 15 Jun 2003 14:31:11 +0200
+
+tora (1.3.9.2-2) unstable; urgency=low
+
+ * Include qobjectlist.h instead of qobjcoll.h (closes: #181522)
+ * Include qt3-compat-headers in Build-Depends until kdelibs4-dev is fixed
+ * Made sure qt3-mt is used (closes: #183063)
+
+ -- Michael Meskes <meskes at debian.org> Mon, 24 Feb 2003 14:31:50 +0100
+
+tora (1.3.9.2-1) unstable; urgency=low
+
+ * New upstream version
+ * Compiled against new libqt3 (closes: #181091)
+
+ -- Michael Meskes <meskes at debian.org> Mon, 17 Feb 2003 00:56:12 +0100
+
+tora (1.3.8-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Michael Meskes <meskes at debian.org> Fri, 11 Oct 2002 09:09:50 +0200
+
+tora (1.3.7-4) unstable; urgency=low
+
+ * Fixed dependancy to list -mt qt3 modules (closes: #154259)
+ * Added several fixes to compiler warnings from CVS.
+
+ -- Michael Meskes <meskes at debian.org> Sun, 1 Sep 2002 11:44:46 +0200
+
+tora (1.3.7-3) unstable; urgency=low
+
+ * Added compiler optimization (closes: #159036).
+
+ -- Michael Meskes <meskes at debian.org> Sun, 1 Sep 2002 11:44:46 +0200
+tora (1.3.7-2) unstable; urgency=low
+
+ * Fixed Built-Depends to note that qt 3.0.5 or greater is needed
+ (closes: #156420).
+
+ -- Michael Meskes <meskes at debian.org> Mon, 12 Aug 2002 18:07:51 +0200
+
+tora (1.3.7-1) unstable; urgency=low
+
+ * New upstream version.
+ * Compiled against libqt3 3.0.5 which should fix missing connection provider
+ problem (closes: #154259).
+
+ -- Michael Meskes <meskes at debian.org> Mon, 12 Aug 2002 13:57:08 +0200
+tora (1.3.6.1-2) unstable; urgency=low
+
+ * Changed Suggests to Depends as tora won't work without a database
+ connector. (closes: #152251)
+
+ -- Michael Meskes <meskes at debian.org> Sun, 14 Jul 2002 09:54:07 +0200
+
+tora (1.3.6.1-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Michael Meskes <meskes at debian.org> Fri, 5 Jul 2002 12:29:52 +0200
+
+tora (1.3.6-1) unstable; urgency=low
+
+ * New upstream version.
+ * Added some more patches from CVS to fix several minor bugs.
+
+ -- Michael Meskes <meskes at debian.org> Wed, 3 Jul 2002 10:37:51 +0200
+
+tora (1.3.5.1-1) unstable; urgency=low
+
+ * New upstream version with several minor bugfixes
+
+ -- Michael Meskes <meskes at debian.org> Fri, 19 Apr 2002 10:32:16 +0200
+
+tora (1.3.5-1) unstable; urgency=low
+
+ * New upstream version with new style selection code and other improvements.
+ * Fixed spelling bug in help file (closes: 143344).
+
+ -- Michael Meskes <meskes at debian.org> Wed, 17 Apr 2002 19:54:18 +0200
+tora (1.3.4-3) unstable; urgency=low
+
+ * Deactivated style selection stuff (ENABLE_STYLE) to make tora compile
+ again (closes: 141919, 142128).
+
+ -- Michael Meskes <meskes at debian.org> Sun, 14 Apr 2002 14:54:47 +0200
+
+tora (1.3.4-2) unstable; urgency=low
+
+ * Added upstream fixes.
+ * Added menu entry.
+
+ -- Michael Meskes <meskes at debian.org> Sat, 9 Mar 2002 20:23:02 +0100
+
+tora (1.3.4-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Michael Meskes <meskes at debian.org> Thu, 7 Mar 2002 12:42:50 +0100
+
+
+tora (1.3.3-4) unstable; urgency=low
+
+ * Added more upstream fixes (closes: 133777)
+
+ -- Michael Meskes <meskes at debian.org> Sun, 3 Mar 2002 11:26:44 +0100
+
+tora (1.3.3-3) unstable; urgency=low
+
+ * Added some upstream fixes (closes: 134133)
+
+ -- Michael Meskes <meskes at debian.org> Sun, 17 Feb 2002 18:42:01 +0100
+
+tora (1.3.3-2) unstable; urgency=low
+
+ * Added Suggests for database modules (closes: 132724)
+ * Added some upstream fixes
+ * Added missing images (closes: 132791)
+
+ -- Michael Meskes <meskes at debian.org> Wed, 13 Feb 2002 20:13:34 +0100
+
+tora (1.3.3-1) unstable; urgency=low
+
+ * Initial Release (closes: 130650)
+
+ -- Michael Meskes <meskes at debian.org> Fri, 25 Jan 2002 09:37:32 +0100
+
Added: kde-extras/tora/trunk/debian/control
===================================================================
--- kde-extras/tora/trunk/debian/control (rev 0)
+++ kde-extras/tora/trunk/debian/control 2007-11-22 09:59:09 UTC (rev 8043)
@@ -0,0 +1,15 @@
+Source: tora
+Section: misc
+Priority: optional
+Maintainer: Michael Meskes <meskes at debian.org>
+Build-Depends: debhelper (>> 4.0.0), g++, libqt3-mt-dev (>= 3.1.1-1), libqt3-compat-headers, kdelibs4-dev, docbook-xml (>= 4.2), xsltproc, docbook-xsl, kdebase-bin, libqscintilla-dev, texinfo, dpatch
+Standards-Version: 3.7.2
+
+Package: tora
+Architecture: any
+Depends: libqt3-mt-psql|libqt3-mt-odbc|libqt3-mt-mysql, ${shlibs: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
+ database systems can be accessed via ODBC.
Added: kde-extras/tora/trunk/debian/dirs
===================================================================
--- kde-extras/tora/trunk/debian/dirs (rev 0)
+++ kde-extras/tora/trunk/debian/dirs 2007-11-22 09:59:09 UTC (rev 8043)
@@ -0,0 +1,5 @@
+usr/bin
+usr/lib/tora
+usr/share/icons/hicolor/32x32/apps
+usr/share/icons/hicolor/16x16/apps
+usr/share/applications
Added: kde-extras/tora/trunk/debian/docs
===================================================================
--- kde-extras/tora/trunk/debian/docs (rev 0)
+++ kde-extras/tora/trunk/debian/docs 2007-11-22 09:59:09 UTC (rev 8043)
@@ -0,0 +1,4 @@
+BUGS
+NEWS
+README
+TODO
Added: kde-extras/tora/trunk/debian/patches/00list
===================================================================
--- kde-extras/tora/trunk/debian/patches/00list (rev 0)
+++ kde-extras/tora/trunk/debian/patches/00list 2007-11-22 09:59:09 UTC (rev 8043)
@@ -0,0 +1,3 @@
+01_maximize
+02_cleantarget
+
Added: kde-extras/tora/trunk/debian/patches/01_maximize.dpatch
===================================================================
--- kde-extras/tora/trunk/debian/patches/01_maximize.dpatch (rev 0)
+++ kde-extras/tora/trunk/debian/patches/01_maximize.dpatch 2007-11-22 09:59:09 UTC (rev 8043)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_maximize.patch <meskes at debian.org>
+##
+## DP: Change default configuration to NOT start maximized.
+--- tora-1.3.21pre22.orig/src/tomain.cpp
++++ tora-1.3.21pre22/src/tomain.cpp
+@@ -454,7 +454,7 @@
+ TOCATCH
+ }
+
+- if (!toConfigurationSingle::Instance().globalConfig(CONF_MAXIMIZE_MAIN, "Yes").isEmpty() && Connections.empty() )
++ if (!toConfigurationSingle::Instance().globalConfig(CONF_MAXIMIZE_MAIN, "").isEmpty() && Connections.empty() )
+ showMaximized();
+ else
+ show();
+--- tora-1.3.21pre22.orig/src/toglobalsetting.cpp
++++ tora-1.3.21pre22/src/toglobalsetting.cpp
+@@ -84,7 +84,7 @@
+ HistorySize->setValue(toConfigurationSingle::Instance().globalConfig(CONF_STATUS_SAVE,
+ DEFAULT_STATUS_SAVE).toInt());
+ IncludeDB->setChecked(!toConfigurationSingle::Instance().globalConfig(CONF_DB_TITLE, "Yes").isEmpty());
+- MaximizeMain->setChecked(!toConfigurationSingle::Instance().globalConfig(CONF_MAXIMIZE_MAIN, "Yes").isEmpty());
++ MaximizeMain->setChecked(!toConfigurationSingle::Instance().globalConfig(CONF_MAXIMIZE_MAIN, "").isEmpty());
+ Statusbar->setChecked(!toConfigurationSingle::Instance().globalConfig(CONF_MESSAGE_STATUSBAR, "").isEmpty());
+ RestoreSession->setChecked(!toConfigurationSingle::Instance().globalConfig(CONF_RESTORE_SESSION, "").isEmpty());
+ HelpDirectory->setText(toHelpPath());
Property changes on: kde-extras/tora/trunk/debian/patches/01_maximize.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: kde-extras/tora/trunk/debian/patches/02_cleantarget.dpatch
===================================================================
--- kde-extras/tora/trunk/debian/patches/02_cleantarget.dpatch (rev 0)
+++ kde-extras/tora/trunk/debian/patches/02_cleantarget.dpatch 2007-11-22 09:59:09 UTC (rev 8043)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_cleantarget by <meskes at debian.org>
+##
+## DP: Do not remove files that are part of the orig tarball,
+## DP: even if this files can be regenerated.
+--- tora-1.3.22/src/Makefile.in.orig 2007-09-21 13:58:19.000000000 +0200
++++ tora-1.3.22/src/Makefile.in 2007-09-21 13:59:30.000000000 +0200
+@@ -4220,10 +4220,6 @@
+
+ clean-local:
+ rm -f *.moc
+- for file in `ls *.ui`; do \
+- rm -f `echo $$file | sed 's/\.ui/\.cpp/g'`; \
+- rm -f `echo $$file | sed 's/\.ui/\.h/g'`; \
+- done
+
+ tora_toad.h: i18n/tora_toad.qm
+ $(top_builddir)/utils/chex/chex $< > $@
+--- tora-1.3.22/src/Makefile.am.orig 2007-09-21 13:59:11.000000000 +0200
++++ tora-1.3.22/src/Makefile.am 2007-09-21 13:59:37.000000000 +0200
+@@ -724,10 +724,6 @@
+
+ clean-local:
+ rm -f *.moc
+- for file in `ls *.ui`; do \
+- rm -f `echo $$file | sed 's/\.ui/\.cpp/g'`; \
+- rm -f `echo $$file | sed 's/\.ui/\.h/g'`; \
+- done
+
+ tora_toad.h: i18n/tora_toad.qm
+ $(top_builddir)/utils/chex/chex $< > $@
Property changes on: kde-extras/tora/trunk/debian/patches/02_cleantarget.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: kde-extras/tora/trunk/debian/rules
===================================================================
--- kde-extras/tora/trunk/debian/rules (rev 0)
+++ kde-extras/tora/trunk/debian/rules 2007-11-22 09:59:09 UTC (rev 8043)
@@ -0,0 +1,90 @@
+#!/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
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=4
+
+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
+ # Add here commands to configure the package.
+ ./configure --prefix=/usr --without-oracle --without-rpath --disable-new-check --with-kde --enable-libsuffix=
+
+ 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.
+ -$(MAKE) distclean
+ rm -f *.qm 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)/doc/help/* $(CURDIR)/debian/tora/usr/share/tora/help
+ -install --owner root --group root --mode=644 $(CURDIR)/doc/help/images/* $(CURDIR)/debian/tora/usr/share/tora/help/images
+ -mv $(CURDIR)/debian/tora/usr/lib/tora/help $(CURDIR)/debian/tora/usr/share/tora
+ dh_link usr/share/tora/help usr/lib/tora/help
+ dh_link usr/share/tora/help usr/share/doc/tora/help
+ -install --owner root --group root --mode=644 $(CURDIR)/src/icons/tora.xpm $(CURDIR)/debian/tora/usr/share/icons/hicolor/32x32/apps
+ -install --owner root --group root --mode=644 $(CURDIR)/src/icons/toramini.xpm $(CURDIR)/debian/tora/usr/share/icons/hicolor/16x16/apps/tora.xpm
+ -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_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
Property changes on: kde-extras/tora/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: kde-extras/tora/trunk/debian/tora.desktop
===================================================================
--- kde-extras/tora/trunk/debian/tora.desktop (rev 0)
+++ kde-extras/tora/trunk/debian/tora.desktop 2007-11-22 09:59:09 UTC (rev 8043)
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=TOra
+Exec=tora
+Icon=tora
+Type=Application
+MimeType=application/x-tora
+Comment=A graphical toolkit for database administration and development
+Comment[fr]=Une boite à outil graphique pour l'administration et le développement de base de données
+Comment[de]=Grafisches Toolkit zur Administration und Entwicklung von Datenbanken
+X-KDE-StartupNotify=true
+Terminal=false
+Categories=Database;Office;Development;KDE;Qt
+
More information about the pkg-kde-commits
mailing list