diff -u gbatnav-1.0.4cvs20051004/debian/changelog gbatnav-1.0.4cvs20051004/debian/changelog
--- gbatnav-1.0.4cvs20051004/debian/changelog
+++ gbatnav-1.0.4cvs20051004/debian/changelog
@@ -1,3 +1,20 @@
+gbatnav (1.0.4cvs20051004-2ubuntu1) hardy; urgency=low
+
+  * debian/watch:
+    + Modify URL to fix it (LP: #181627).
+  * debian/control:
+    + Add Homepage field.
+    + Bump Standards-Version to 3.7.3 (no changes).
+    + Bump debhelper to version 5.
+  * debian/compat:
+    + Bump to version 5.
+  * debian/rules:
+    + Add dh_desktop.
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Marco Rodrigues <gothicx@sapo.pt>  Wed, 09 Jan 2008 22:45:40 +0000
+
 gbatnav (1.0.4cvs20051004-2build1) hardy; urgency=low
 
   * Rebuild for libglib1.2 -> libglib1.2ldbl transition.
diff -u gbatnav-1.0.4cvs20051004/debian/compat gbatnav-1.0.4cvs20051004/debian/compat
--- gbatnav-1.0.4cvs20051004/debian/compat
+++ gbatnav-1.0.4cvs20051004/debian/compat
@@ -1 +1 @@
-4
+5
diff -u gbatnav-1.0.4cvs20051004/debian/control gbatnav-1.0.4cvs20051004/debian/control
--- gbatnav-1.0.4cvs20051004/debian/control
+++ gbatnav-1.0.4cvs20051004/debian/control
@@ -1,9 +1,11 @@
 Source: gbatnav
 Section: gnome
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Standards-Version: 3.6.2
-Build-Depends: libgnome-dev, debhelper (>= 4), libjpeg62-dev (>= 6b-5), libglib1.2-dev (>= 1.2.10-4)
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
+Standards-Version: 3.7.3
+Build-Depends: libgnome-dev, debhelper (>= 5), libjpeg62-dev (>= 6b-5), libglib1.2-dev (>= 1.2.10-4)
+Homepage: http://batnav.sourceforge.net/
 
 Package: gbatnav
 Architecture: any
diff -u gbatnav-1.0.4cvs20051004/debian/rules gbatnav-1.0.4cvs20051004/debian/rules
--- gbatnav-1.0.4cvs20051004/debian/rules
+++ gbatnav-1.0.4cvs20051004/debian/rules
@@ -69,6 +69,7 @@
 	dh_installinfo
 #	dh_undocumented
 	dh_installchangelogs ChangeLog
+	dh_desktop
 	dh_link
 	dh_strip
 	dh_compress
diff -u gbatnav-1.0.4cvs20051004/debian/watch gbatnav-1.0.4cvs20051004/debian/watch
--- gbatnav-1.0.4cvs20051004/debian/watch
+++ gbatnav-1.0.4cvs20051004/debian/watch
@@ -1,2 +1,3 @@
-version=2
-http://prdownloads.sourceforge.net/batnav/gbatnav-(.*)\.tar\.gz
+version=3
+opts=dversionmangle=s/(.*)cvs(.*)/$1/ \
+http://sf.net/batnav/gbatnav-(.*)\.tar\.gz