Please merge wmclock 1.0.12.2-5ubuntu3 (universe) from Debian unstable (main)

[Chess Griffin]

Binary package hint: wmclock

I am working on this merge and should have it completed shortly.

[Chess Griffin (griffinc)]

This is my first merge so please let me know if there is anything I need to fix or do better. Thanks.

Attached is the debdiff comparing the Debian dsc and the new modified dsc.

[Chess Griffin (griffinc)]

Here is the debdiff comparing the previous Ubuntu dsc and the new modified dsc.

[Michael Bienia (geser)]

You should mention what the "Merged changes from previous changelog entry" are. This way one doesn't have to read all past changelog entries to find out, which changes are (still) there and why.

[Michael Bienia (geser)]

Why did you mention "Updated Standards-Version to 3.7.2" in the changelog entry when the change was done by Debian (in -6)?

[Chess Griffin (griffinc)]

Thank you, Michael, for your review and comments. I really appreciate it. I will edit the changelog to provide more specific details about the merged changes. And that is true about standards-version being bumped by Debian in -6, but the reason I mentioned the update was because the last Ubuntu debian/control (in 5ubuntu-3) listed an earlier version, 3.6.1.0. Should I not include the reference?

I will provide updated debdiffs shortly. Thanks again, Michael.

[Michael Bienia (geser)]

The changelog for the merge should only list those (remaining or new) changes done by Ubuntu. The changes to the package done by the Debian maintainer are already described in the new (since the last Ubuntu version) changelog entries written by the Debian maintainer.

[Chess Griffin (griffinc)]

Thanks, Michael. I understand now and have updated debian/changelog accordingly.

Attached is an updated debdiff comparing the Debian dsc with the updated Ubuntu dsc.

[Chess Griffin (griffinc)]

And here is the updated debdiff comparing the previous Ubuntu dsc with the updated Ubuntu dsc.

[Chess Griffin (griffinc)]

wmclock (1.0.12.2-7ubuntu1) hardy; urgency=low

  * Merge from debian unstable (LP: #163709), remaining changes:
    - Add dependencies against x11proto-xext-dev, libxt-dev, and
      libxext-dev in debian/control
  * Update maintainer fields as per spec

wmclock (1.0.12.2-7) unstable; urgency=low

  * Adopting package (Closes: #439966)
  * debian/control
    - add myself as maintainer
    - added Homepage field to source stanza
    - little reorg of short and long description
    - depends against debhelper at least version 5
    - added dependency against dpatch
  * debian/watch
    - added
  * debian/compat
    - bump to 5
  * debian/copyright
    - added myself as new maintainer
    - added new upstram website address
    - reported upstream as copyright holder, along with asclock copyright
      holders, since wmclock derives from that
    - separated license and copyright section (previous mixed up)
    - fixed license location on a debian machine (it is GPLv2 not GPLv1)
  * debian/rules
    - removed unused dh_ tools calls
    - added explicit file names to dh_installdocs
    - removed "-n" param from dh_installmenu call
    - added dpatch stuff
    - installing debian/lang.* too
  * debian/wmclock.docs
    - removed since merged with debian/rules
  * debian/wmclock.menu
    - renamed wmclock.menu to menu
  * debian/menu
    - manu section is Applications
  * debian/wmclock.post{inst,rm}
    - deleted since menu update is managed by dh_installmenu
  * wmclock.man.in
    - taken back to upstream version
  * debian/patches/00-fix_manpage_source_chgs_prior_adoption.dpatch
    - apply source code modification done (before adoption) without patching
  * debian/patches/00-fix_wmclockc_source_chgs_prior_adoption.dpatch
    - apply source code modification done (before adoption) without patching
  * debian/patches/10-fix_manpage_lintian_warning.dpatch
    - added to fix a lintian warning about (c) character in manpage
      represented using extended char and not with "\(co)" escape sequence
  * debian/lang.polish/*
    - moved here since they are provided buy Debian maintainer, not upstream

wmclock (1.0.12.2-6) unstable; urgency=low

  * debian/control:
    + Set maintainer to Debian QA group.
    + Bump Standards-Version to 3.7.2, no changes needed.

 -- Chess Griffin <email address hidden> Tue, 20 Nov 2007 21:19:04 -0500