--- tora-2.1.2.orig/debian/tora.install
+++ tora-2.1.2/debian/tora.install
@@ -2,3 +2,6 @@
 doc/help/images/*.png	/usr/share/tora/help/images
 
 src/icons/tora.xpm	/usr/share/icons/hicolor/32x32/apps
+
+debian/tmp/usr/share/doc/tora/*	/usr/share/doc/tora
+debian/tmp/usr/bin/tora		/usr/bin
--- tora-2.1.2.orig/debian/compat
+++ tora-2.1.2/debian/compat
@@ -0,0 +1,2 @@
+5
+
--- tora-2.1.2.orig/debian/control
+++ tora-2.1.2/debian/control
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Michael Meskes <meskes@debian.org>
-Build-Depends: debhelper (>= 5), kdelibs5-dev, kdebase-bin, dpatch, libqscintilla2-dev, cdbs, libpq-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 5), libqscintilla2-dev, cdbs, libpq-dev, cmake
+Standards-Version: 3.8.4
 Homepage: http://www.torasql.com
 Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/tora.git
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/tora.git
@@ -17,3 +17,15 @@
  storage manager, rollback segment monitor, instance manager, and SQL output
  viewer. Via qt4 it can access PostgreSQL and MySQL directly. Any other
  database systems can be accessed via ODBC.
+
+Package: tora-dbg
+Section: debug
+Architecture: any
+Depends: ${misc:Depends}, tora
+Description: A graphical toolkit for database developers and administrators - debugging symbols
+ Tora features a schema browser, SQL worksheet, PL/SQL editor & debugger,
+ storage manager, rollback segment monitor, instance manager, and SQL output
+ viewer. Via qt4 it can access PostgreSQL and MySQL directly. Any other
+ database systems can be accessed via ODBC.
+ .
+ This package provides the debugging symbols for tora.
--- tora-2.1.2.orig/debian/rules
+++ tora-2.1.2/debian/rules
@@ -2,28 +2,18 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 
-DEB_KDE_ENABLE_FINAL := yes
-
-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
+DEB_DBG_PACKAGES := tora-dbg
 
 install/tora::
 	# remove some file we don't want to install
-	rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/README.OSX
-	rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/README.LICENSE
-	rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/README.WINDOWS
-	rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/INSTALL
-	rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/COPYING
-	rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/ChangeLog
-	rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/changelog
+	rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/README.OSX
+	rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/README.LICENSE
+	rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/README.WINDOWS
+	rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/INSTALL
+	rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/COPYING
+	rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/ChangeLog
+	rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/changelog
 	# this file cannot be installed by dh_install because it has to be renamed
 	-install --owner root --group root --mode=644 $(CURDIR)/src/icons/toramini.xpm $(CURDIR)/debian/tora/usr/share/icons/hicolor/16x16/apps/tora.xpm
 	# we have a desktop file
--- tora-2.1.2.orig/debian/changelog
+++ tora-2.1.2/debian/changelog
@@ -1,21 +1,27 @@
 tora (2.1.2-1) unstable; urgency=low
 
-  * Improved: Add editor option for uppler/lowercase object names
-  * Improved: Db extract/compare tool now remembers widgets states
-  * New: Filesystem completer for target line edit
-  * Improved: Compatibility with sql+
-  * New: Color/pixmap identifier for connection
-  * Improved: Schema browser improvements
-  * New: Ability to add external static check
-  * New: Save package specification and body to one file
-  * New: Initial support for creating/modifying tables
-  * Bugfixes
+  * Added debug package. (Closes: #560064)
+  * New Upstream version 2.1.2
+    * Improved: Add editor option for uppler/lowercase object names
+    * Improved: Db extract/compare tool now remembers widgets states
+    * New: Filesystem completer for target line edit
+    * Improved: Compatibility with sql+
+    * New: Color/pixmap identifier for connection
+    * Improved: Schema browser improvements
+    * New: Ability to add external static check
+    * New: Save package specification and body to one file
+    * New: Initial support for creating/modifying tables
+    * Bugfixes
+  * Bumped Standards-Version to 3.8.4, no changes needed.
+  * No patches needed anymore, removed patch system.
+
+ -- Michael Meskes <meskes@debian.org>  Tue, 30 Mar 2010 13:14:16 +0200
 
 tora (2.1.1-1) unstable; urgency=low
 
-  * New upstream version
+  * New upstream version.
 
- -- Nathan Neulinger <nneul@neulinger.org> Tue, 13 Oct 2009 13:44:40 -0600
+ -- Michael Meskes <meskes@debian.org>  Thu, 19 Nov 2009 15:18:19 +0100
 
 tora (2.1.0-1) unstable; urgency=low
 
