--- gtablix-0.9.13-1.orig/debian/rules
+++ gtablix-0.9.13-1/debian/rules
@@ -18,6 +18,7 @@
 	dh_testroot
 	dpatch deapply-all
 	rm -rf debian/patched
+	rm -rf po/*.mo
 	rm -rf builddir
 	rm -f build-stamp 
 	dh_clean
@@ -25,15 +26,14 @@
 install: 
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	dh_install
 	install -o root -g root -m 644 $(CURDIR)/modules/pixmaps/gtablix.xpm $(CURDIR)/debian/gtablix/usr/share/pixmaps/gtablix.xpm
-#	install -o root -g root -m 644 $(CURDIR)/debian/gtablix.applications $(CURDIR)/debian/gtablix/usr/share/application-registry/gtablix.applications	
+#	install -o root -g root -m 644 $(CURDIR)/debian/gtablix.applications $(CURDIR)/debian/gtablix/usr/share/application-registry/gtablix.applications
 	dh_installdocs
 	dh_installman
 	dh_installmenu
-	dh_desktop
 	sh intltool.sh
 
 binary-indep: install
--- gtablix-0.9.13-1.orig/debian/dirs
+++ gtablix-0.9.13-1/debian/dirs
@@ -1,5 +1,3 @@
-usr/lib/gtablix/
 usr/share/doc/gtablix/
 usr/share/gtablix/
-usr/share/application-registry/
 usr/share/pixmaps/
--- gtablix-0.9.13-1.orig/debian/control
+++ gtablix-0.9.13-1/debian/control
@@ -1,19 +1,18 @@
 Source: gtablix
+Homepage: http://gtablix.homelinux.org 
 Maintainer: Robert Lemmen <robertle@semistable.com>
 Section: misc
 Priority: extra
-Build-Depends-Indep: debhelper (>> 4.0.0), dpatch
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>> 7.0.0), dpatch
+Standards-Version: 3.8.3
 
 Package: gtablix
-Depends: libglib-perl, libgtk2-perl, libgtk2-gladexml-perl, libxml-libxml-common-perl, libxml-libxml-perl, libxml-namespacesupport-perl, libxml-sax-perl, file, perl, liblocale-gettext-perl
-Recommends: tablix
-Suggests: gnuplot, imagemagick, xpvm, html2ps
+Depends: libglib-perl, libgtk2-perl, libgtk2-gladexml-perl, libxml-libxml-perl, libxml-namespacesupport-perl, libxml-sax-perl, file, perl, liblocale-gettext-perl
+Recommends: tablix2, xpvm, html2ps
+Suggests: gnuplot, imagemagick
 Architecture: all
 Description: graphical user interface for Tablix
  G-Tablix is a graphical user interface to Tablix, a timetable
  construction/optimization software. It helps you write properly formatted 
  configuration files, from which Tablix calculates the best possible 
  timetables. 
- .
- Homepage: http://gtablix.homelinux.org 
--- gtablix-0.9.13-1.orig/debian/docs
+++ gtablix-0.9.13-1/debian/docs
@@ -3,3 +3,4 @@
 doc/features.txt
 doc/faq.txt
 doc/008.txt
+doc/*.help
--- gtablix-0.9.13-1.orig/debian/changelog
+++ gtablix-0.9.13-1/debian/changelog
@@ -1,13 +1,32 @@
+gtablix (0.9.13-1-3) unstable; urgency=low
+
+  * drop dependency on libxml-libxml-common-perl (closes: #551640)
+  * update debhelper version, remove deprecated debhelper calls
+  * bumbed standards-version
+
+ -- Robert Lemmen <robertle@semistable.com>  Wed, 21 Oct 2009 15:32:24 +0100
+
+gtablix (0.9.13-1-2) unstable; urgency=low
+
+  * Can be re-built now (closes: #442588)
+  * Dependencies on xpvm and html2ps are now recommends instead of suggests
+    (closes: #444567)
+  * Lots of small fixes to make policy compliant again
+
+ -- Robert Lemmen <robertle@semistable.com>  Mon,  5 May 2008 12:54:02 +0100
+
 gtablix (0.9.13-1-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release (closes: #380672, #388773)
+  * Improvements to the Debian packaging, mainly dependencies (closes: 369400)
+  * Sponsored upload by Petter Reinholdtsen 
 
  -- Robert Lemmen <robertle@semistable.com>  Thu,  5 Oct 2006 23:16:07 +0200
 
 gtablix (0.0.9-11-1) unstable; urgency=low
 
   * Repacked for debian (closes: #321945)
-  * Sponsored upload by Petter Reinholdtsen <pere@hungry.com>
+  * Sponsored upload by Petter Reinholdtsen 
 
  -- Robert Lemmen <robertle@semistable.com>  Thu, 29 Dec 2005 16:45:25 +0200
 
--- gtablix-0.9.13-1.orig/debian/compat
+++ gtablix-0.9.13-1/debian/compat
@@ -1 +1 @@
-4
+7
--- gtablix-0.9.13-1.orig/debian/gtablix.menu
+++ gtablix-0.9.13-1/debian/gtablix.menu
@@ -1,4 +1,4 @@
-?package(gtablix): needs="X11" section="Apps/Technical"\
+?package(gtablix): needs="X11" section="Applications/Office"\
   hints="Timetabling"\
   title="G-Tablix" command="/usr/bin/gtablix"\
   icon="/usr/share/pixmaps/gtablix.xpm"\
--- gtablix-0.9.13-1.orig/debian/patches/manpage.dpatch
+++ gtablix-0.9.13-1/debian/patches/manpage.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## manpage.dpatch by Robert Lemmen <robertle@semistable.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix for wrong tempdir usage
+
+exit 0
+
+@DPATCH@
+--- gtablix/doc/gtablix.1.orig
++++ gtablix/doc/gtablix.1
+@@ -1,6 +1,6 @@
+ .\" These macros were copied from MPlayer manpage, written by Gabucino, 
+ .\" Diego Biurrun and Jonas Jermann. 
+-..
++.\".
+ .\" default indentation is 7, don't change!
+ .nr IN 7
+ .\" define indentation for suboptions
--- gtablix-0.9.13-1.orig/debian/patches/00list
+++ gtablix-0.9.13-1/debian/patches/00list
@@ -1,2 +1,3 @@
+manpage.dpatch
+#tempdir.dpatch
 libtoshare.dpatch
-tempdir.dpatch
--- gtablix-0.9.13-1.orig/debian/patches/libtoshare.dpatch
+++ gtablix-0.9.13-1/debian/patches/libtoshare.dpatch
@@ -24,26 +24,25 @@
 
 @DPATCH@
 --- gtablix.orig	2005-11-18 13:15:24.000000000 +0100
-+++ gtablix-0.0.9-10/gtablix	2005-11-18 13:15:55.000000000 +0100
-@@ -27,12 +27,12 @@
- my $version = "0.0.9-11";
++++ gtablix/gtablix	2005-11-18 13:15:55.000000000 +0100
+@@ -27,7 +27,7 @@
+ my $version = "0.0.9-13";
  my $debug = 0;
  
 -use lib "/usr/lib";
 +use lib "/usr/share";
  use lib "./modules";
  
- my $libdir = $0;
- 	$libdir =~ s/\/gtablix//;
--if ($libdir eq '/usr/bin') { $libdir = '/usr/lib'; }
-+if ($libdir eq '/usr/bin') { $libdir = '/usr/share'; }
- 
  # -----------------------------------
+@@ -76,11 +76,11 @@
+ 	if ($opt_d) { $debug = 1; }
  
-@@ -81,7 +81,7 @@
+ my $libdir = $Bin;
+-if ($libdir eq '/usr/bin') { $libdir = '/usr/lib'; }
++if ($libdir eq '/usr/bin') { $libdir = '/usr/share'; }
  my $docdir;
  my $picdir;
- my $tempdir = tempdir()."-gtablix";
+ my $tempdir = tempdir("gtablix-XXXX", TMPDIR => 1);
 -if ($libdir eq '/usr/lib') {
 +if ($libdir eq '/usr/share') {
  	$picdir = '/usr/share/gtablix';
--- gtablix-0.9.13-1.orig/debian/patches/tempdir.dpatch
+++ gtablix-0.9.13-1/debian/patches/tempdir.dpatch
@@ -4,16 +4,17 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Fix for wrong tempdir usage
 
-@DPATCH@
+exit 0
 
---- gtablix.orig	2005-12-29 18:41:08.000000000 +0100
-+++ gtablix-0.0.9-11/gtablix	2005-12-29 18:41:52.000000000 +0100
-@@ -80,7 +80,7 @@
- 
+@DPATCH@
+--- gtablix/gtablix.orig
++++ gtablix/gtablix
+@@ -79,7 +79,7 @@
+ if ($libdir eq '/usr/bin') { $libdir = '/usr/lib'; }
  my $docdir;
  my $picdir;
 -my $tempdir = tempdir()."-gtablix";
 +my $tempdir = tempdir("gtablix-XXXXXXXX");
- if ($libdir eq '/usr/share') {
+ if ($libdir eq '/usr/lib') {
  	$picdir = '/usr/share/gtablix';
  	$docdir = '/usr/share/doc/gtablix';
