[Bug 486157] Re: Merge xtide 2.10-2 (universe) from Debian testing (main)

[Charlie_Smotherman (porthose)]

MIss read the changelog.  Changing bug to a merge request and attaching
diff's.

Charlie

** Description changed:

- Please sync xtide 2.10-2 (universe) from Debian testing (main)
+ Please merge xtide 2.10-2 (universe) from Debian testing (main)
  
-   Upstream has included the icons copyright info into debian/copyright
+   * Merge from debian testing, remaining changes:
+     -  debian/changelog: carry along notes on old Ubuntu changes.
  
  Changelog entries since current lucid version 2.9.5-3ubuntu2:
  
+ xtide (2.10-2) unstable; urgency=low
+ 
+   * Bug fix: "Icons missing copyright information", thanks to Charlie
+     Smotherman for reporting and for the patch (Closes: #557598).
+ 
+  -- Peter S Galbraith <psg at debian.org>  Thu, 26 Nov 2009 22:04:31 -0500
+ 
  xtide (2.10-1) unstable; urgency=low
  
-   * New upstream release
-   * Bug fix: "more command line options on man page", thanks to Kevin Ryde
-     (Closes: #422663).
-   * Bug fix: "/etc/cron.weekly/xtide claims to be obsolete", thanks to
-     Justin B Rye (Closes: #493990).  Deleted reference to slink and potato.
-   * Standards-Version: 3.8.3 without changes.
+   * New upstream release
+   * Bug fix: "more command line options on man page", thanks to Kevin Ryde
+     (Closes: #422663).
+   * Bug fix: "/etc/cron.weekly/xtide claims to be obsolete", thanks to
+     Justin B Rye (Closes: #493990).  Deleted reference to slink and potato.
+   * Standards-Version: 3.8.3 without changes.
  
-  -- Peter S Galbraith <psg at debian.org>  Mon, 12 Oct 2009 14:14:06 -0400
+  -- Peter S Galbraith <psg at debian.org>  Mon, 12 Oct 2009 14:14:06 -0400

** Attachment added: "xtide_debian_diff"
   http://launchpadlibrarian.net/36614311/xtide_debian_diff

-- 
Merge xtide 2.10-2 (universe) from Debian testing (main)
https://bugs.launchpad.net/bugs/486157
You received this bug notification because you are a member of Ubuntu
Package Archive Administrators, which is a direct subscriber.