rev 8036 - in kde-extras/tora/trunk/debian: . patches

Michael Meskes meskes at alioth.debian.org
Thu Nov 22 09:27:25 UTC 2007


Author: meskes
Date: 2007-11-22 09:27:24 +0000 (Thu, 22 Nov 2007)
New Revision: 8036

Added:
   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/tora.desktop
Modified:
   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/rules
Log:
[svn-inject] Applying Debian modifications to trunk

Modified: kde-extras/tora/trunk/debian/changelog
===================================================================
--- kde-extras/tora/trunk/debian/changelog	2007-11-22 09:20:34 UTC (rev 8035)
+++ kde-extras/tora/trunk/debian/changelog	2007-11-22 09:27:24 UTC (rev 8036)
@@ -1,3 +1,32 @@
+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.
@@ -2,3 +31,2 @@
   * Moved to qscintilla 1.7.
-  * Made tora work correctly with UTF8, closes: 418524
   
@@ -74,7 +102,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 <meskes at debian.org>  Fri,  4 Mar 2005 11:26:34 +0100
  

Modified: kde-extras/tora/trunk/debian/control
===================================================================
--- kde-extras/tora/trunk/debian/control	2007-11-22 09:20:34 UTC (rev 8035)
+++ kde-extras/tora/trunk/debian/control	2007-11-22 09:27:24 UTC (rev 8036)
@@ -2,8 +2,8 @@
 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
-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: kde-extras/tora/trunk/debian/dirs
===================================================================
--- kde-extras/tora/trunk/debian/dirs	2007-11-22 09:20:34 UTC (rev 8035)
+++ kde-extras/tora/trunk/debian/dirs	2007-11-22 09:27:24 UTC (rev 8036)
@@ -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: kde-extras/tora/trunk/debian/docs
===================================================================
--- kde-extras/tora/trunk/debian/docs	2007-11-22 09:20:34 UTC (rev 8035)
+++ kde-extras/tora/trunk/debian/docs	2007-11-22 09:27:24 UTC (rev 8036)
@@ -2,4 +2,3 @@
 NEWS
 README
 TODO
-debian/debian.patch

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:27:24 UTC (rev 8036)
@@ -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:27:24 UTC (rev 8036)
@@ -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:27:24 UTC (rev 8036)
@@ -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
   + *

Modified: kde-extras/tora/trunk/debian/rules
===================================================================
--- kde-extras/tora/trunk/debian/rules	2007-11-22 09:20:34 UTC (rev 8035)
+++ kde-extras/tora/trunk/debian/rules	2007-11-22 09:27:24 UTC (rev 8036)
@@ -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,16 +24,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 +52,14 @@
 	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
+	$(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)/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: 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:27:24 UTC (rev 8036)
@@ -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