diff -u xtide-2.9.5/debian/changelog xtide-2.9.5/debian/changelog
--- xtide-2.9.5/debian/changelog
+++ xtide-2.9.5/debian/changelog
@@ -1,3 +1,17 @@
+xtide (2.9.5-2ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable (LP: #188086)
+  * Remaining Ubuntu changes 
+  * debian/control:
+     - set Ubuntu maintainer address, set Homepage 
+       field according to recent policy
+     - add new package xtide-vws1-data to Recommends  
+  * debian/compat: create this file, DH_COMPAT setting removed from rules,
+    to satisfy lintian.
+  * debian/rules: clean rule modified to satisfy lintian
+
+ -- Morten Kjeldgaard <mok@bioxray.au.dk>  Fri, 01 Feb 2008 17:20:53 +0100
+
 xtide (2.9.5-2) unstable; urgency=low
 
   * Added sharutils to Build-Depends for uudecode.
@@ -15,6 +29,31 @@
 
  -- Peter S Galbraith <psg@debian.org>  Fri, 21 Dec 2007 21:03:20 -0500
 
+xtide (2.9.3-3ubuntu1) hardy; urgency=low
+
+  * Merge with Debian (LP: #164706). Remaining changes:
+      - Add desktop file:
+        + add xtide.desktop file in debian/
+        + add desktop file installation in debian/rules
+        + add dh_desktop call in debian/rules
+      - Created new icon for xtide:
+        + add sharutils Depends in debian/control
+        + add icons.tar.uu in debian/
+        + add icon installation in build, clean and binary-arch targets in
+          debian/rule
+        + add dh_icons call for icon registration in debian/rules
+        + add icon copyright in debian/copyright
+      - debian/control: set Ubuntu maintainer address, set Homepage 
+        field according to recent policy
+      - Reorganize /usr/share/xtide to better accommodate for 
+        extra harmonics and shoreline data.
+      - debian/xtide.dirs: move creation of directories from rules to here.
+      - debian/compat: create this file, DH_COMPAT setting removed from rules,
+        to satisfy lintian.
+      - debian/rules: clean rule modified to satisfy lintian
+  
+ -- Morten Kjeldgaard <mok@bioxray.dk>  Sat, 24 Nov 2007 17:17:32 +0100
+
 xtide (2.9.3-3) unstable; urgency=low
 
   * Brown paper bag upload.  Had built locally with a local library and
@@ -36,6 +75,20 @@
 
  -- Peter S Galbraith <psg@debian.org>  Fri, 20 Jul 2007 23:11:49 -0400
 
+xtide (2.8.2-3ubuntu2) feisty; urgency=low
+
+  * Rebuild for ldbl128 change (powerpc, sparc).
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu,  1 Mar 2007 23:02:23 +0000
+
+xtide (2.8.2-3ubuntu1) edgy; urgency=low
+
+  * Re-sync with Debian
+  * Add desktop file from Phil Bull (Closes Malone: #36449)
+
+ -- Barry deFreese <bddebian@comcast.net>  Thu, 13 Jul 2006 00:22:02 -0400
+
 xtide (2.8.2-3) unstable; urgency=low
 
   * Bug fix: "FTBFS with G++ 4.1: ... not declared in this scope", thanks
diff -u xtide-2.9.5/debian/rules xtide-2.9.5/debian/rules
--- xtide-2.9.5/debian/rules
+++ xtide-2.9.5/debian/rules
@@ -2,7 +2,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-export DH_COMPAT=5
+#export DH_COMPAT=5
 
 package=xtide
 
@@ -22,8 +22,8 @@
 
 clean:
 	$(checkdir)
-	-rm -f build
-	-make clean	
+	-rm -f build 
+	[ ! -f Makefile ] || $(MAKE) distclean
 	-rm Makefile Makefile.bak
 	-rm config.log config.status config.cache
 	-rm -f harmonics.tcd harmonics-initial.tcd
diff -u xtide-2.9.5/debian/control xtide-2.9.5/debian/control
--- xtide-2.9.5/debian/control
+++ xtide-2.9.5/debian/control
@@ -1,7 +1,9 @@
 Source: xtide
 Section: science
 Priority: optional
-Maintainer: Peter S Galbraith <psg@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Peter S Galbraith <psg@debian.org>
+Homepage: http://www.flaterco.com/xtide/
 Build-Depends: debhelper, libxaw7-dev, libpng12-dev, libtcd-dev, tcd-utils, sharutils
 Standards-Version: 3.7.2
 
@@ -9,7 +11,7 @@
 Architecture: any
 Depends:  ${shlibs:Depends}
 Conflicts: xtide-data (<< 20030409-1)
-Recommends: xtide-data, logrotate
+Recommends: xtide-data, xtide-wvs1-data, logrotate
 Description: provides tide and current predictions
  XTide is a package that provides tide and current predictions in a wide
  variety of formats. Graphs, text listings, and calendars can be generated,
@@ -31,2 +32,0 @@
- .
- Web Page: http://www.flaterco.com/xtide/
diff -u xtide-2.9.5/debian/copyright xtide-2.9.5/debian/copyright
--- xtide-2.9.5/debian/copyright
+++ xtide-2.9.5/debian/copyright
@@ -59,0 +60,3 @@
+
+The xtide icons are copyright 2007 Morten Kjeldgaard and are distributed 
+according to the GNU Public License version 2 (or later).
only in patch2:
unchanged:
--- xtide-2.9.5.orig/debian/compat
+++ xtide-2.9.5/debian/compat
@@ -0,0 +1 @@
+5
only in patch2:
unchanged:
--- xtide-2.9.5.orig/debian/xtide.dirs
+++ xtide-2.9.5/debian/xtide.dirs
@@ -0,0 +1,2 @@
+usr/share/xtide
+etc/logrotate.d