[needs-merge] xtide-2.9.5-2 from sid

[Morten Kjeldgaard]

Binary package hint: xtide

* Current version in is hardy 2.9.3-3ubuntu1.
* DM incorporated new upstream version + Ubuntu icons and desktop entry.
* Hardy will provide new data package xtide-wvs1-data, which should be Recommended.

[Morten Kjeldgaard (mok0)]

Debdiff enclosed

[Daniel Holbach (dholbach)]

What about bug 188093?

[Morten Kjeldgaard (mok0)]

Both bugs should be taken care of; otherwise things will break:

1) merge Debian's newest xtide from sid (xtide-2.9.5-2)
2) nuke the ubuntu version of xtide-data (20070318-1ubuntu1) and sync Debian's version (20070318-1) again.

[Ming Hua (minghua)]

If Debian's xtide-data is uploaded as 20070318-1ubuntu2 (since removing already uploaded version is very unlikely), will the dependencies still work (i.e., xtide 2.9.5-2 and xtide-data 20070318-1ubuntu2 in hardy)?

[Ming Hua (minghua)]

I meant xtide 2.9.5-2ubuntu1 and xtide-data 20070318-1ubuntu2.

[Morten Kjeldgaard (mok0)]

On 07/02/2008, at 18.53, Ming Hua wrote:

> I meant xtide 2.9.5-2ubuntu1 and xtide-data 20070318-1ubuntu2.

Yes, that's the idea. The earlier merged xtide-2.9.3-3ubuntu1 will
_not_ work, however. I don't know if a versioned dependency is
required in xtide-2.9.5-2ubuntu1, or if the fact that hardy still is
in development makes that unnecessary.

Cheers,
Morten

[Emmet Hikory (persia)]

Setting the xtide-data task as "Invalid", as this seems to be part of bug #188093, to which a debdiff is attached.

[Cesare Tirabassi (norsetto)]

It seems to me that all the remaining Ubuntu changes are just cosmetic. Wouldn't be better to just sync it from Debian?
What is xtide-wvs1-data and why is it being added as a recommend (note that this is not a carry-over from previous changes)?

[Morten Kjeldgaard (mok0)]

When I requested that to be done, I was asked to make a debdiff that reverted to the Debian version.

[Cesare Tirabassi (norsetto)]

For xtide-data, yes, but, there is no need to do that for xtide; as far as I can see there is nothing which needs to be reverted, or am I missing something?

[Morten Kjeldgaard (mok0)]

Here's a patch to xtide_2.9.5-3 from Debian (unstable). Most of the former Ubuntu mods are now part of the Debian package.

This patch includes configuration for the optional xtide-wvs1-data Ubuntu package, and a versioned depends on debhelper 5.0.51 (because of dh_icons).

To get a working xtide program it is ABSOLUTELY NECESSARY to sync xtide-data_20070318-3. Please see bug #188093 . The reason is that xtide-data and xtide need to agree on where that data is resides.

[Morten Kjeldgaard (mok0)]

Please grant permission to upload the version cf. comment @ 2008-03-31. The current hardy version is buggy as explained above.

The changes between version 2.9.3 and 2.9.5 are mainly in the packaging, and includes additions and modifications I have forwarded to the DM during the hardy development cycle.

I attach the relevant excerpt of debian/changelog. In the comment following this one, I will attach upstream's changelog.

[Morten Kjeldgaard (mok0)]

Attached is upstream's changelog. As you can see, there are no new features, but a number of minor bugfixes, portability issues and general housekeeping of the code.

Thanks to pochu for digging this out for me!

[Scott Kitterman (kitterman)]

Ack. Go ahead then. No FFe needed.

[Launchpad Janitor (janitor)]

This bug was fixed in the package xtide - 2.9.5-3ubuntu1

---------------
xtide (2.9.5-3ubuntu1) hardy; urgency=low

  * Merge from Debian unstable (LP: #188086). Remaining Ubuntu changes:
  * debian/xtide.conf: add /usr/share/xtide-wvs1 to specify where
    to find optional shoreline data.
  * debian/control:
    - versioned build-depends on debhelper >= 5.0.51~ due to the use
      of dh_icons in debian/rules.
    - ubuntu maintainer mangling.
    - add suggests: xtide-wvs1-data, the Ubuntu package containing the
      shoreline data.
  * debian/copyright: add icon copyright info.
  * debian/changelog: carry along notes on old Ubuntu changes. All
    except the here mentioned are now part of the Debian version.

xtide (2.9.5-3) unstable; urgency=low

  [ Morten Kjeldgaard <email address hidden> ]
  * debian/rules:
    + clean rule modified to satisfy lintian
    + DH_COMPAT line removed.
  * debian/compat: create this file
  * debian/control:
    + versioned dependency of debhelper
    + move webpage from long description to Homepage field
    + bump Standards-Version

  [ Peter S Galbraith ]
  * Bug fix: "xtide: Please add LSB formatted dependency info in init.d
    script", thanks to Petter Reinholdtsen (Closes: #466147).
  * menu entry switched to section "Applications/Science/Geoscience"

xtide (2.9.5-2) unstable; urgency=low

  * Added sharutils to Build-Depends for uudecode.

xtide (2.9.5-1) unstable; urgency=low

  [ Peter S Galbraith ]
  * New upstream release.

  [ Morten Kjeldgaard ]
  * Add xtide.desktop.
  * Add desktop icons.

 -- Morten Kjeldgaard <email address hidden> Mon, 31 Mar 2008 19:12:04 +0200