Sync xtide 2.10-2 (universe) from Debian testing (main)

[Charlie_Smotherman]

Please sync xtide 2.10-2 (universe) from Debian testing (main)

Explanation of the Ubuntu delta and why it can be dropped:

"debian/xtide.conf: add /usr/share/xtide-wvs1 to specify where to find optional shoreline data" I suspect to be a typo in the changelog however this change has been included upstream, and was not documented in the changelog by the upstream DM.

 "versioned build-depends on debhelper >= 5.0.51~ due to the use of dh_icons in debian/rules." The package now b-d on dh7 which was not documented in the changelog by the upstream DM.

"add suggests: xtide-wvs1-data, the Ubuntu package containing the shoreline data." This was changed to "Suggests, use xtide-coastline" in version 2.9.5-3ubuntu2. This was added by the upstream DM but not documented in the changelog.

"debian/copyright: add icon copyright info", has been added to the latest version by the upsteam DM.

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 <email address hidden> 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.

 -- Peter S Galbraith <email address hidden> Mon, 12 Oct 2009 14:14:06 -0400

[Fabrice Coutadeur (fabricesp)]

Hi,

Can you please check with mok0 and Debian the status of the copyright of the icons?
By the way, it's of no use to attach the full diff.gz file :-)

Thank,
Fabrice

[Charlie_Smotherman (cjsmo)]

Yea come to think of it, not having the copyright information for the icons in debian/copyright is definitely a serious bug.

As you can tell from above I have opened a bug in debian. Not sure if you want to go ahead with the merge, however IMHO I believe that having this fixed in debian and then sync the package over would be a better way to go.

Best regards
Charlie Smotherman

[Fabrice Coutadeur (fabricesp)]

Hi Charlie,

Let's wait a week or two, to see what happen (even if I'm not really confident on it...)

Thanks :-)
Fabrice

[Fabrice Coutadeur (fabricesp)]

By the way: I think that the icons with the missing copyright are the ones in debian/icons.tar.uu, so you perhaps want to fix the Debian bug report description :-)

Thanks,
Fabrice

[Charlie_Smotherman (cjsmo)]

From looking at xtides pts page, xtide has been granted a "age override" for migration from unstable to testing. Xtide should migrate to testing in 3-4 days, so I am going to go ahead and switch this bug from a merge to a sync request. This way, the bug will be ready to go when xtide migrates to testing.

Best regards
Charlie Smotherman

[Charlie_Smotherman (cjsmo)]

According to xtides PTS page, xtide has migrated to testing :)

Best regards
Charlie Smotherman

[Fabrice Coutadeur (fabricesp)]

Sync request ack'd

[Steve Langasek (vorlon)]

There were a lot more Ubuntu-specific changes in the previous version of the package than just to the copyright file. Why are these dropped?

[Charlie_Smotherman (cjsmo)]

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

Charlie

[Steve Langasek (vorlon)]

Charlie,

Your changelog entry for the merge now just says:

  * Merge from debian testing, remaining changes:
    - debian/changelog: carry along notes on old Ubuntu changes.

Sorry, that wasn't my point - my question was, there are lots of other *changes* listed in the Ubuntu package, and these changes are not mentioned as having been merged in the Debian version, so why are they being dropped as part of the sync?

I'm looking here for an answer like:
 - the changes were actually all merged in the Debian package, but just weren't shown in the changelog
 - the changes are obsolete and should be dropped because ____
 - the changes are still applicable, but have been rejected by Debian/upstream and the issue they fix is so minor that it's not worth carrying a delta for.

Analyzing the package myself, here are the conclusions I've reached about the changes mentioned in the latest changelog entry:

  * debian/changelog: carry along notes on old Ubuntu changes. All
    except the here mentioned are now part of the Debian version.

no-op; we don't carry Ubuntu deltas *just* for changelog entries, so if this were the only thing left, it would be a sync. (I wouldn't have even included a changelog entry about this.)

  * debian/copyright: add icon copyright info.

Fixed in 2.10-2, as mentioned.

  * debian/control:
    - versioned build-depends on debhelper >= 5.0.51~ due to the use
      of dh_icons in debian/rules.

superseded by Debian, which build-depends on debhelper 7.

  * debian/control:
    - ubuntu maintainer mangling.

another no-op.

  * debian/control:
    - add suggests: xtide-wvs1-data, the Ubuntu package containing the
      shoreline data.
  * Drop xtide-wvs1-data from Suggests, use xtide-coastline instead.

integrated in the Debian package (again with no mention in the Debian changelog)

  * debian/xtide.conf: add /usr/share/xtide-wvs1 to specify where
    to find optional shoreline data.

This seems to actually be a typo, the directory added is /usr/share/xtide-wvs, not /usr/share/xtide-wvs1. And Debian has that change also, again not documented in the changelog.

So yes, it appears this is suitable for a sync instead of a merge - do you agree with this analysis?

[Morten Kjeldgaard (mok0)]

I used to do some work on the xtide package, as I remember I added an icon and at desktop file and stuff like that. Those changes resulted in a -0ubuntu* version, but those changes were quickly adopted by the DM, and in subsequent releases we just sync'ed xtide. I don't understand why there's a merge request surfacing at this point.

[Charlie_Smotherman (cjsmo)]

Morten, please see the above comments for an explanation of why this was changed to a merge request. This was changed to a merge request due to **my** misunderstanding of what slangasek is requesting to be placed in the bug description. Changing the bug back to a sync request and updating the bug description to include the information slangasek requested.

Best regards
Charlie Smotherman

[Steve Langasek (vorlon)]

Getting binaries for lucid...
[Updating] xtide (2.9.5-3ubuntu2 [Ubuntu] < 2.10-2 [Debian])
 * Trying to add xtide...
  - <xtide_2.10.orig.tar.gz: downloading from http://ftp.debian.org/debian/>
  - <xtide_2.10-2.dsc: downloading from http://ftp.debian.org/debian/>
  - <xtide_2.10-2.diff.gz: downloading from http://ftp.debian.org/debian/>
I: xtide [universe] -> xtide_2.9.5-3ubuntu2 [universe].

Thank you for your contribution to Ubuntu!