diff -Nru xpaint-2.9.1.4/debian/changelog xpaint-2.9.1.4/debian/changelog
--- xpaint-2.9.1.4/debian/changelog	2012-09-05 00:07:24.000000000 +0000
+++ xpaint-2.9.1.4/debian/changelog	2014-08-02 12:54:37.000000000 +0000
@@ -1,8 +1,17 @@
-xpaint (2.9.1.4-3ubuntu1) quantal; urgency=low
+xpaint (2.9.1.4-3.1) unstable; urgency=low
 
-  * Build-depend on libtiff-dev rather than libtiff4-dev.
+  * Non-mantainer upload.
+  * debian/control
+    - Build depend on unversioned dev packages, libtiff-dev and libpng-dev.
+      (Closes: #736051, #662567)
+    - Build depend on hardening-wrapper to set security hardening compilation
+      flags.
+    - Bump Standards-Version to 3.9.5
+      - Remove obsolete DM-Upload-Allowed control field.
+    - Suggest imagemagick instead of imagemagickb typo.
+    - libxaw3dxft6: Set section libs. (Closes: #693728)
 
- -- Colin Watson <cjwatson@ubuntu.com>  Wed, 05 Sep 2012 01:07:23 +0100
+ -- Per Andersson <avtobiff@gmail.com>  Sat, 02 Aug 2014 14:34:47 +0200
 
 xpaint (2.9.1.4-3) unstable; urgency=low
 
diff -Nru xpaint-2.9.1.4/debian/control xpaint-2.9.1.4/debian/control
--- xpaint-2.9.1.4/debian/control	2012-09-05 00:07:20.000000000 +0000
+++ xpaint-2.9.1.4/debian/control	2014-08-02 12:52:38.000000000 +0000
@@ -1,14 +1,12 @@
 Source: xpaint
 Section: graphics
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Josue Abarca <jmaslibre@debian.org.gt>
-DM-Upload-Allowed: yes
+Maintainer: Josue Abarca <jmaslibre@debian.org.gt>
 Build-Depends: debhelper (>= 7.0.50~), libxpm-dev, libxaw7-dev, libtiff-dev,
- libpng12-dev, xutils-dev, libxft-dev, bison, flex (>= 2.5.31-16),
+ libpng-dev, xutils-dev, libxft-dev, bison, flex (>= 2.5.31-16),
  libxmu-dev, libxt-dev, libsm-dev, libice-dev, libxext-dev, libx11-dev,
- x11proto-core-dev, x11proto-xext-dev
-Standards-Version: 3.9.1
+ x11proto-core-dev, x11proto-xext-dev, hardening-wrapper
+Standards-Version: 3.9.5
 Vcs-Git: git://git.debian.org/collab-maint/xpaint.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/xpaint.git
 Homepage: https://sourceforge.net/projects/sf-xpaint/
@@ -16,7 +14,7 @@
 Package: xpaint
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: gv, netpbm, lpr, x-terminal-emulator, editor, imagemagickb, ocrad
+Suggests: gv, netpbm, lpr, x-terminal-emulator, editor, imagemagick, ocrad
 Description: simple paint program for X
  XPaint is suitable for producing simple graphics. It does offer some
  advanced features such as image processing functions and gradient
@@ -41,6 +39,7 @@
  programs that use the libxaw3dxft library.
 
 Package: libxaw3dxft6
+Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: An extended version of Xaw3d with support for UTF8