diff -u kxgenerator-0.3.7+dfsg/debian/changelog kxgenerator-0.3.7+dfsg/debian/changelog
--- kxgenerator-0.3.7+dfsg/debian/changelog
+++ kxgenerator-0.3.7+dfsg/debian/changelog
@@ -1,3 +1,29 @@
+kxgenerator (0.3.7+dfsg-3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/controll: Fix Maintainer field (LP: #226739)
+
+ -- Steve Stalcup <vorian@ubuntu.com>  Thu, 01 May 2008 03:46:00 +0100
+
+kxgenerator (0.3.7+dfsg-3) unstable; urgency=low
+
+  * QA upload.
+  * Fix gcc-4.3 FTBFS, patch by Stefan Ritter <stefan.ritter@credativ.de>.
+    (Closes: #461699)
+
+ -- Marc 'HE' Brockschmidt <he@debian.org>  Sat, 05 Apr 2008 17:42:46 +0200
+
+kxgenerator (0.3.7+dfsg-2) unstable; urgency=low
+
+  * QA upload.
+    + Set maintainer to Debian QA.
+  * Remove watch file. Unable to find upstream. (Closes: #450084)
+  * Remove Homepage from package description. Dead Link.
+  * Bump Standards Version to 3.7.3.
+    + Update for new menu policy.
+
+ -- Barry deFreese <bddebian@comcast.net>  Thu, 24 Jan 2008 15:19:40 -0500
+
 kxgenerator (0.3.7+dfsg-1ubuntu1) feisty; urgency=low
 
   * debian/rules: remove empty po/pl.po to fix FTBFS. (LP: #85898)
@@ -14,0 +41 @@
+
diff -u kxgenerator-0.3.7+dfsg/debian/control kxgenerator-0.3.7+dfsg/debian/control
--- kxgenerator-0.3.7+dfsg/debian/control
+++ kxgenerator-0.3.7+dfsg/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Lionel Le Folgoc (mr_pouit) <mrpouit@gmail.com>
 Build-Depends: debhelper (>= 5), cdbs, autotools-dev, autoconf, kdelibs4-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: kxgenerator
 Architecture: any
@@ -26,2 +25,0 @@
- .
-  Homepage: http://www.kxgenerator.xt.pl/
diff -u kxgenerator-0.3.7+dfsg/debian/menu kxgenerator-0.3.7+dfsg/debian/menu
--- kxgenerator-0.3.7+dfsg/debian/menu
+++ kxgenerator-0.3.7+dfsg/debian/menu
@@ -1,2 +1,2 @@
-?package(kxgenerator):needs="X11" section="Apps/System"\
+?package(kxgenerator):needs="X11" section="Applications/System/Administration"\
   title="kxgenerator" command="/usr/bin/kxgenerator"
reverted:
--- kxgenerator-0.3.7+dfsg/debian/watch
+++ kxgenerator-0.3.7+dfsg.orig/debian/watch
@@ -1,3 +0,0 @@
-version=3
-
-http://dp0154.debowypark.waw.pl/kxgenerator/data/download/kxgenerator-(.*)\.tar\.bz2
only in patch2:
unchanged:
--- kxgenerator-0.3.7+dfsg.orig/debian/patches/01-fix-gcc-4.3.patch
+++ kxgenerator-0.3.7+dfsg/debian/patches/01-fix-gcc-4.3.patch
@@ -0,0 +1,10 @@
+--- kxgenerator-0.3.7+dfsg.orig/src/buf.cpp
++++ kxgenerator-0.3.7+dfsg/src/buf.cpp
+@@ -2,7 +2,7 @@
+
+ #include "PropertiesDialog.h"
+ #include "properties.h"
+-#include <iostream.h>
++#include <iostream>
+ #include <ktabwidget.h>
+ #include <kiconloader.h>