From: <me...@us...> - 2006-03-24 13:22:37
|
Revision: 2009 Author: meskes Date: 2006-03-24 05:22:19 -0800 (Fri, 24 Mar 2006) ViewCVS: http://svn.sourceforge.net/tora/?rev=2009&view=rev Log Message: ----------- Brought Debian files up-to-date for version 1.3.21-2 Modified Paths: -------------- trunk/tora/debian/changelog trunk/tora/debian/copyright Modified: trunk/tora/debian/changelog =================================================================== --- trunk/tora/debian/changelog 2006-03-21 20:20:50 UTC (rev 2008) +++ trunk/tora/debian/changelog 2006-03-24 13:22:19 UTC (rev 2009) @@ -1,3 +1,11 @@ +tora (1.3.21-2) unstable; urgency=low + + * Added patch by Martin Michlmayer to make tora compile with G++ 4.1, + closes #357810 + * Fixed URL in copyright file, closes #358394 + + -- Michael Meskes <me...@de...> 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 Modified: trunk/tora/debian/copyright =================================================================== --- trunk/tora/debian/copyright 2006-03-21 20:20:50 UTC (rev 2008) +++ trunk/tora/debian/copyright 2006-03-24 13:22:19 UTC (rev 2009) @@ -1,13 +1,14 @@ This package was debianized by Michael Meskes <me...@de...> on Fri, 25 Jan 2002 09:37:32 +0100. -It was downloaded from http://www.globecom.net/tora/ +It was downloaded from http://tora.sourceforge.net/ Upstream Author: Henrik Johnson <to...@un...> + Nathan Neulinger <nn...@um...> Copyright: Toolkit for Oracle is Copyright (C) 2000-2001,2001 Underscore AB -Toolkit for Oracle is Copyright (C) 2003 Quest Software, Inc. +Toolkit for Oracle is Copyright (C) 2003-2005 Quest Software, Inc. You may use, distribute and copy Toolkit for Oracle under the terms of GNU General Public License version 2. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <me...@us...> - 2007-09-22 14:14:04
|
Revision: 2159 http://tora.svn.sourceforge.net/tora/?rev=2159&view=rev Author: meskes Date: 2007-09-22 07:14:04 -0700 (Sat, 22 Sep 2007) Log Message: ----------- Updated debian dir to latest version. Modified Paths: -------------- trunk/tora/debian/changelog trunk/tora/debian/control trunk/tora/debian/dirs trunk/tora/debian/rules Added Paths: ----------- trunk/tora/debian/patches/ trunk/tora/debian/patches/00list trunk/tora/debian/patches/01_maximize.dpatch trunk/tora/debian/patches/02_cleantarget.dpatch trunk/tora/debian/tora.desktop Modified: trunk/tora/debian/changelog =================================================================== --- trunk/tora/debian/changelog 2007-09-21 13:12:18 UTC (rev 2158) +++ trunk/tora/debian/changelog 2007-09-22 14:14:04 UTC (rev 2159) @@ -1,3 +1,24 @@ +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 <me...@de...> 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 <me...@de...> 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 <me...@de...> Fri, 08 Jun 2007 14:44:29 +0200 + tora (1.3.21pre22-1) unstable; urgency=low * Applied latest upstream pre1.3.22 patch. @@ -2,3 +23,2 @@ * Moved to qscintilla 1.7. - * Made tora work correctly with UTF8, closes: 418524 @@ -74,7 +94,7 @@ tora (1.3.15-1) unstable; urgency=low * New upstream version - * Changed QODBC to QODBC3, closes #285510 + * Changed QODBC to QODBC3, closes: #285510 -- Michael Meskes <me...@de...> Fri, 4 Mar 2005 11:26:34 +0100 Modified: trunk/tora/debian/control =================================================================== --- trunk/tora/debian/control 2007-09-21 13:12:18 UTC (rev 2158) +++ trunk/tora/debian/control 2007-09-22 14:14:04 UTC (rev 2159) @@ -2,8 +2,8 @@ Section: misc Priority: optional Maintainer: Michael Meskes <me...@de...> -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 -Standards-Version: 3.6.2 +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 Modified: trunk/tora/debian/dirs =================================================================== --- trunk/tora/debian/dirs 2007-09-21 13:12:18 UTC (rev 2158) +++ trunk/tora/debian/dirs 2007-09-22 14:14:04 UTC (rev 2159) @@ -1,5 +1,4 @@ usr/bin -usr/share/tora/help/images usr/lib/tora usr/share/icons/hicolor/32x32/apps usr/share/icons/hicolor/16x16/apps Added: trunk/tora/debian/patches/00list =================================================================== --- trunk/tora/debian/patches/00list (rev 0) +++ trunk/tora/debian/patches/00list 2007-09-22 14:14:04 UTC (rev 2159) @@ -0,0 +1,3 @@ +01_maximize +02_cleantarget + Added: trunk/tora/debian/patches/01_maximize.dpatch =================================================================== --- trunk/tora/debian/patches/01_maximize.dpatch (rev 0) +++ trunk/tora/debian/patches/01_maximize.dpatch 2007-09-22 14:14:04 UTC (rev 2159) @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_maximize.patch <me...@de...> +## +## 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()); Added: trunk/tora/debian/patches/02_cleantarget.dpatch =================================================================== --- trunk/tora/debian/patches/02_cleantarget.dpatch (rev 0) +++ trunk/tora/debian/patches/02_cleantarget.dpatch 2007-09-22 14:14:04 UTC (rev 2159) @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_cleantarget by <me...@de...> +## +## 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 $< > $@ Modified: trunk/tora/debian/rules =================================================================== --- trunk/tora/debian/rules 2007-09-21 13:12:18 UTC (rev 2158) +++ trunk/tora/debian/rules 2007-09-22 14:14:04 UTC (rev 2159) @@ -8,12 +8,13 @@ # 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: configure-stamp +configure: patch configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. @@ -23,7 +24,7 @@ build: build-stamp -build-stamp: configure-stamp +build-stamp: configure dh_testdir # Add here commands to compile the package. @@ -32,7 +33,7 @@ touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp configure-stamp @@ -52,13 +53,13 @@ # Add here commands to install the package into debian/tora. $(MAKE) install DESTDIR=$(CURDIR)/debian/tora libdir=/usr/lib/tora - -install --owner root --group root --mode=644 $(CURDIR)/help/* $(CURDIR)/debian/tora/usr/share/tora/help - -install --owner root --group root --mode=644 $(CURDIR)/help/images/* $(CURDIR)/debian/tora/usr/share/tora/help/images + -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)/icons/tora.xpm $(CURDIR)/debian/tora/usr/share/icons/hicolor/32x32/apps - -install --owner root --group root --mode=644 $(CURDIR)/icons/toramini.xpm $(CURDIR)/debian/tora/usr/share/icons/hicolor/16x16/apps/tora.xpm + -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. @@ -77,7 +78,6 @@ dh_installchangelogs dh_link dh_strip - chmod 644 `pwd`/debian/tora/usr/lib/tora/libto* dh_compress dh_fixperms dh_installdeb Added: trunk/tora/debian/tora.desktop =================================================================== --- trunk/tora/debian/tora.desktop (rev 0) +++ trunk/tora/debian/tora.desktop 2007-09-22 14:14:04 UTC (rev 2159) @@ -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 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <me...@us...> - 2008-02-11 11:33:59
|
Revision: 2574 http://tora.svn.sourceforge.net/tora/?rev=2574&view=rev Author: meskes Date: 2008-02-11 03:34:02 -0800 (Mon, 11 Feb 2008) Log Message: ----------- Updated Debian files. Modified Paths: -------------- trunk/tora/debian/changelog trunk/tora/debian/control trunk/tora/debian/rules Added Paths: ----------- trunk/tora/debian/tora.desktop trunk/tora/debian/tora.links Modified: trunk/tora/debian/changelog =================================================================== --- trunk/tora/debian/changelog 2008-02-11 11:23:01 UTC (rev 2573) +++ trunk/tora/debian/changelog 2008-02-11 11:34:02 UTC (rev 2574) @@ -1,3 +1,17 @@ +tora (1.3.22-7) unstable; urgency=low + + * Removed build dependency on libqt3-compat-headers, closes: #464914 + * Added include directives needed by gcc-4.3, closes: #462239 + + -- Michael Meskes <me...@de...> Mon, 11 Feb 2008 10:57:12 +0100 + +tora (1.3.22-6) unstable; urgency=low + + * Fixed clean target yet again so building twice in a row is possible. + * Bumped up build dependency on debhelper to correct version. + + -- Michael Meskes <me...@de...> Thu, 10 Jan 2008 11:55:07 +0100 + tora (1.3.22-5) unstable; urgency=low * Bumped standards version to 3.7.3. Modified: trunk/tora/debian/control =================================================================== --- trunk/tora/debian/control 2008-02-11 11:23:01 UTC (rev 2573) +++ trunk/tora/debian/control 2008-02-11 11:34:02 UTC (rev 2574) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian KDE Extras Team <pkg...@li...> Uploaders: Michael Meskes <me...@de...> -Build-Depends: debhelper (>> 4.0.0), autotools-dev, libqt3-compat-headers, kdelibs4-dev, docbook-xml (>= 4.2), xsltproc, docbook-xsl, kdebase-bin, libqscintilla-dev, texinfo, dpatch +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 Package: tora Modified: trunk/tora/debian/rules =================================================================== --- trunk/tora/debian/rules 2008-02-11 11:23:01 UTC (rev 2573) +++ trunk/tora/debian/rules 2008-02-11 11:34:02 UTC (rev 2574) @@ -37,7 +37,8 @@ # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean - rm -f *.qm tora.pro license/tolicenseui.h license/tolicenseui.cpp license/tolicense.moc license/tolicenseui.moc + 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 ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub Added: trunk/tora/debian/tora.desktop =================================================================== --- trunk/tora/debian/tora.desktop (rev 0) +++ trunk/tora/debian/tora.desktop 2008-02-11 11:34:02 UTC (rev 2574) @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +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 + Added: trunk/tora/debian/tora.links =================================================================== --- trunk/tora/debian/tora.links (rev 0) +++ trunk/tora/debian/tora.links 2008-02-11 11:34:02 UTC (rev 2574) @@ -0,0 +1,3 @@ +usr/share/tora/help usr/lib/tora/help +usr/share/tora/help usr/share/doc/tora/help + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |