Menu
▾
▴
[Tora-cvs] SF.net SVN: tora: [2320]
|
From: <me...@us...> - 2007-12-11 11:55:13
|
Revision: 2320
http://tora.svn.sourceforge.net/tora/?rev=2320&view=rev
Author: meskes
Date: 2007-12-11 03:55:16 -0800 (Tue, 11 Dec 2007)
Log Message:
-----------
Updated to latest Debian version.
Modified Paths:
--------------
branches/tora-1.4/tora/debian/changelog
branches/tora-1.4/tora/debian/control
branches/tora-1.4/tora/debian/dirs
branches/tora-1.4/tora/debian/docs
branches/tora-1.4/tora/debian/menu
branches/tora-1.4/tora/debian/rules
trunk/tora/debian/changelog
trunk/tora/debian/control
trunk/tora/debian/rules
trunk/tora/debian/tora.desktop
Removed Paths:
-------------
branches/tora-1.4/tora/debian/debian.patch
Modified: branches/tora-1.4/tora/debian/changelog
===================================================================
--- branches/tora-1.4/tora/debian/changelog 2007-12-11 10:09:18 UTC (rev 2319)
+++ branches/tora-1.4/tora/debian/changelog 2007-12-11 11:55:16 UTC (rev 2320)
@@ -1,3 +1,58 @@
+tora (1.3.22-5) unstable; urgency=low
+
+ * Bumped standards version to 3.7.3.
+ * Bumped tora.dekstop to version 1.0, closes: #455588
+ * Added call to dh_desktop.
+ * Bumbed debhelper version to 5.
+
+ -- Michael Meskes <me...@de...> Tue, 11 Dec 2007 10:32:06 +0100
+
+tora (1.3.22-4) unstable; urgency=low
+
+ * Removed build dependency on g++, closes: #452976
+ * Also removed build dependency on libqt3-mt-dev because kdelibs4-dev
+ depends on it.
+ * Made menu file adhere new standard.
+ * Do not install sources for help files.
+
+ -- Michael Meskes <me...@de...> Thu, 06 Dec 2007 10:13:24 +0100
+
+tora (1.3.22-3) unstable; urgency=low
+
+ * Moved to team maintenance:
+ Debian KDE Extras Team <pkg...@li...>.
+
+ -- Michael Meskes <me...@de...> Thu, 22 Nov 2007 11:12:43 +0100
+
+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 <me...@de...> 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 <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 +57,2 @@
* Moved to qscintilla 1.7.
- * Made tora work correctly with UTF8, closes: 418524
@@ -74,7 +128,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: branches/tora-1.4/tora/debian/control
===================================================================
--- branches/tora-1.4/tora/debian/control 2007-12-11 10:09:18 UTC (rev 2319)
+++ branches/tora-1.4/tora/debian/control 2007-12-11 11:55:16 UTC (rev 2320)
@@ -1,9 +1,10 @@
Source: tora
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
+Maintainer: Debian KDE Extras Team <pkg...@li...>
+Uploaders: Michael Meskes <me...@de...>
+Build-Depends: debhelper (>> 4.0.0), libqt3-compat-headers, kdelibs4-dev, docbook-xml (>= 4.2), xsltproc, docbook-xsl, kdebase-bin, libqscintilla-dev, texinfo, dpatch
+Standards-Version: 3.7.3
Package: tora
Architecture: any
Deleted: branches/tora-1.4/tora/debian/debian.patch
===================================================================
--- branches/tora-1.4/tora/debian/debian.patch 2007-12-11 10:09:18 UTC (rev 2319)
+++ branches/tora-1.4/tora/debian/debian.patch 2007-12-11 11:55:16 UTC (rev 2320)
@@ -1,25 +0,0 @@
-diff --exclude debian -ruN tora_1.3.20.orig/toglobalsetting.cpp tora-1.3.20/toglobalsetting.cpp
---- tora_1.3.20.orig/toglobalsetting.cpp 2005-04-19 12:30:42.000000000 +0200
-+++ tora-1.3.20/toglobalsetting.cpp 2006-02-11 13:23:54.000000000 +0100
-@@ -84,7 +84,7 @@
- HistorySize->setValue(toTool::globalConfig(CONF_STATUS_SAVE,
- DEFAULT_STATUS_SAVE).toInt());
- IncludeDB->setChecked(!toTool::globalConfig(CONF_DB_TITLE, "Yes").isEmpty());
-- MaximizeMain->setChecked(!toTool::globalConfig(CONF_MAXIMIZE_MAIN, "Yes").isEmpty());
-+ MaximizeMain->setChecked(!toTool::globalConfig(CONF_MAXIMIZE_MAIN, "").isEmpty());
- Statusbar->setChecked(!toTool::globalConfig(CONF_MESSAGE_STATUSBAR, "").isEmpty());
- RestoreSession->setChecked(!toTool::globalConfig(CONF_RESTORE_SESSION, "").isEmpty());
- HelpDirectory->setText(toHelpPath());
-diff --exclude debian -ruN tora_1.3.20.orig/tomain.cpp tora-1.3.20/tomain.cpp
---- tora_1.3.20.orig/tomain.cpp 2005-06-28 22:29:35.000000000 +0200
-+++ tora-1.3.20/tomain.cpp 2006-02-11 13:24:17.000000000 +0100
-@@ -484,7 +484,7 @@
- TOCATCH
- }
-
-- if (!toTool::globalConfig(CONF_MAXIMIZE_MAIN, "Yes").isEmpty() && Connections.empty() )
-+ if (!toTool::globalConfig(CONF_MAXIMIZE_MAIN, "").isEmpty() && Connections.empty() )
- showMaximized();
- else
- show();
-
Modified: branches/tora-1.4/tora/debian/dirs
===================================================================
--- branches/tora-1.4/tora/debian/dirs 2007-12-11 10:09:18 UTC (rev 2319)
+++ branches/tora-1.4/tora/debian/dirs 2007-12-11 11:55:16 UTC (rev 2320)
@@ -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
Modified: branches/tora-1.4/tora/debian/docs
===================================================================
--- branches/tora-1.4/tora/debian/docs 2007-12-11 10:09:18 UTC (rev 2319)
+++ branches/tora-1.4/tora/debian/docs 2007-12-11 11:55:16 UTC (rev 2320)
@@ -2,4 +2,3 @@
NEWS
README
TODO
-debian/debian.patch
Modified: branches/tora-1.4/tora/debian/menu
===================================================================
--- branches/tora-1.4/tora/debian/menu 2007-12-11 10:09:18 UTC (rev 2319)
+++ branches/tora-1.4/tora/debian/menu 2007-12-11 11:55:16 UTC (rev 2320)
@@ -1,8 +1,7 @@
?package(tora):\
needs="X11"\
- section="Apps/Databases"\
+ section="Applications/Data Management"\
title="TOra"\
command="/usr/bin/tora"\
- kderemove="y"\
icon32x32="/usr/share/icons/hicolor/32x32/apps/tora.xpm"\
icon16x16="/usr/share/icons/hicolor/16x16/apps/tora.xpm"
Modified: branches/tora-1.4/tora/debian/rules
===================================================================
--- branches/tora-1.4/tora/debian/rules 2007-12-11 10:09:18 UTC (rev 2319)
+++ branches/tora-1.4/tora/debian/rules 2007-12-11 11:55:16 UTC (rev 2320)
@@ -5,15 +5,13 @@
# 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: configure-stamp
+configure: patch configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
@@ -23,16 +21,16 @@
build: build-stamp
-build-stamp: configure-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/lib/tora
+ $(MAKE) CFLAGS_GLOB="-O2 -W -g -fPIC -Wall -Wno-unused" libdir=/usr/share/tora
$(XP) $(DB2MAN) debian/tora.xml
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -51,14 +49,9 @@
dh_installdirs
# 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
- -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
+ $(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 --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.
@@ -75,9 +68,9 @@
dh_installman tora.1
dh_installinfo
dh_installchangelogs
+ dh_desktop
dh_link
dh_strip
- chmod 644 `pwd`/debian/tora/usr/lib/tora/libto*
dh_compress
dh_fixperms
dh_installdeb
Modified: trunk/tora/debian/changelog
===================================================================
--- trunk/tora/debian/changelog 2007-12-11 10:09:18 UTC (rev 2319)
+++ trunk/tora/debian/changelog 2007-12-11 11:55:16 UTC (rev 2320)
@@ -1,12 +1,21 @@
-tora (1.3.22-4) UNRELEASED; urgency=low
+tora (1.3.22-5) unstable; urgency=low
+ * Bumped standards version to 3.7.3.
+ * Bumped tora.dekstop to version 1.0, closes: #455588
+ * Added call to dh_desktop.
+ * Bumbed debhelper version to 5.
+
+ -- Michael Meskes <me...@de...> Tue, 11 Dec 2007 10:32:06 +0100
+
+tora (1.3.22-4) unstable; urgency=low
+
* Removed build dependency on g++, closes: #452976
* Also removed build dependency on libqt3-mt-dev because kdelibs4-dev
depends on it.
* Made menu file adhere new standard.
* Do not install sources for help files.
- -- Michael Meskes <me...@de...> Mon, 26 Nov 2007 14:29:47 +0000
+ -- Michael Meskes <me...@de...> Thu, 06 Dec 2007 10:13:24 +0100
tora (1.3.22-3) unstable; urgency=low
Modified: trunk/tora/debian/control
===================================================================
--- trunk/tora/debian/control 2007-12-11 10:09:18 UTC (rev 2319)
+++ trunk/tora/debian/control 2007-12-11 11:55:16 UTC (rev 2320)
@@ -4,7 +4,7 @@
Maintainer: Debian KDE Extras Team <pkg...@li...>
Uploaders: Michael Meskes <me...@de...>
Build-Depends: debhelper (>> 4.0.0), libqt3-compat-headers, kdelibs4-dev, docbook-xml (>= 4.2), xsltproc, docbook-xsl, kdebase-bin, libqscintilla-dev, texinfo, dpatch
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Package: tora
Architecture: any
Modified: trunk/tora/debian/rules
===================================================================
--- trunk/tora/debian/rules 2007-12-11 10:09:18 UTC (rev 2319)
+++ trunk/tora/debian/rules 2007-12-11 11:55:16 UTC (rev 2320)
@@ -5,9 +5,6 @@
# 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
@@ -71,6 +68,7 @@
dh_installman tora.1
dh_installinfo
dh_installchangelogs
+ dh_desktop
dh_link
dh_strip
dh_compress
Modified: trunk/tora/debian/tora.desktop
===================================================================
--- trunk/tora/debian/tora.desktop 2007-12-11 10:09:18 UTC (rev 2319)
+++ trunk/tora/debian/tora.desktop 2007-12-11 11:55:16 UTC (rev 2320)
@@ -1,5 +1,5 @@
[Desktop Entry]
-Encoding=UTF-8
+Version=1.0
Name=TOra
Exec=tora
Icon=tora
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|