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

Sun Jan 4 11:34:41 UTC 2009

Author: meskes
Date: 2009-01-04 11:34:41 +0000 (Sun, 04 Jan 2009)
New Revision: 13125

Added:
   kde-extras/tora/trunk/debian/patches/03_README.LAYOUT.dpatch
Removed:
   kde-extras/tora/trunk/debian/dirs
   kde-extras/tora/trunk/debian/docs
   kde-extras/tora/trunk/debian/patches/01_maximize.dpatch
   kde-extras/tora/trunk/debian/patches/02_cleantarget.dpatch
   kde-extras/tora/trunk/debian/patches/03_gcc43_includes.dpatch
Modified:
   kde-extras/tora/trunk/debian/changelog
   kde-extras/tora/trunk/debian/control
   kde-extras/tora/trunk/debian/patches/00list
   kde-extras/tora/trunk/debian/rules
Log:
Started working on 2.0.0 release.


Modified: kde-extras/tora/trunk/debian/changelog
===================================================================

--- kde-extras/tora/trunk/debian/changelog	2009-01-04 10:24:44 UTC (rev 13124)
+++ kde-extras/tora/trunk/debian/changelog	2009-01-04 11:34:41 UTC (rev 13125)
@@ -1,8 +1,10 @@
-tora (1.3.23-2) UNRELEASED; urgency=low
+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.
 
- -- Michael Meskes <meskes at debian.org>  Fri, 13 Jun 2008 16:24:58 +0200
+ -- Michael Meskes <meskes at debian.org>  Sat, 03 Jan 2009 20:51:13 +0100
 
 tora (1.3.23-1) unstable; urgency=low
 

Modified: kde-extras/tora/trunk/debian/control
===================================================================
--- kde-extras/tora/trunk/debian/control	2009-01-04 10:24:44 UTC (rev 13124)
+++ kde-extras/tora/trunk/debian/control	2009-01-04 11:34:41 UTC (rev 13125)
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Michael Meskes <meskes at debian.org>
-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, docbook-xml (>= 4.2), xsltproc, docbook-xsl, kdebase-bin, texinfo, dpatch, libqscintilla2-dev, cdbs
+Standards-Version: 3.8.0
 
 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.

Deleted: kde-extras/tora/trunk/debian/dirs

Deleted: kde-extras/tora/trunk/debian/docs

Modified: kde-extras/tora/trunk/debian/patches/00list
===================================================================
--- kde-extras/tora/trunk/debian/patches/00list	2009-01-04 10:24:44 UTC (rev 13124)
+++ kde-extras/tora/trunk/debian/patches/00list	2009-01-04 11:34:41 UTC (rev 13125)
@@ -1,4 +1 @@
-01_maximize
-02_cleantarget
-03_gcc43_includes
-
+03_README.LAYOUT

Deleted: kde-extras/tora/trunk/debian/patches/01_maximize.dpatch

Deleted: kde-extras/tora/trunk/debian/patches/02_cleantarget.dpatch

Added: kde-extras/tora/trunk/debian/patches/03_README.LAYOUT.dpatch
===================================================================
--- kde-extras/tora/trunk/debian/patches/03_README.LAYOUT.dpatch	                        (rev 0)
+++ kde-extras/tora/trunk/debian/patches/03_README.LAYOUT.dpatch	2009-01-04 11:34:41 UTC (rev 13125)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_README.LAYOUT.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No such file README.LAYOUT
+
+ at 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

Deleted: kde-extras/tora/trunk/debian/patches/03_gcc43_includes.dpatch

Modified: kde-extras/tora/trunk/debian/rules
===================================================================
--- kde-extras/tora/trunk/debian/rules	2009-01-04 10:24:44 UTC (rev 13124)
+++ kde-extras/tora/trunk/debian/rules	2009-01-04 11:34:41 UTC (rev 13125)
@@ -1,91 +1,17 @@
 #!/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/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
-include /usr/share/dpatch/dpatch.make 
+DEB_KDE_ENABLE_FINAL := yes
 
-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
+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
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-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 --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_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


