please merge unison 2.27.57-2 (universe) from debian unstable (main)

Bug #377652 reported by Andreas Olsson
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
unison (Ubuntu)
Fix Released
Wishlist
Unassigned

Bug Description

Binary package hint: unison

News in unison 2.27.57-2

  * Correct typo in documentation, thanks to Lucas B. Cohen
    (Closes: #137960, #129478, #466173)
  * Switch packaging to git
  * Set maintainer to Debian OCaml Maintainers
  * Add dh-ocaml build-dependency (rules/ocaml.mk)
  * Upgrade debian/compat to 7
  * Upgrade Standards-Version to 3.8.0 (debian/README.source)
  * Add ${misc:Depends} to dependencies
  * Update debian/copyright file to use
    http://wiki.debian.org/Proposals/CopyrightFormat
  * Remove obsolete debian/control.in related variables and files

Related branches

Andreas Olsson (andol)
Changed in unison (Ubuntu):
assignee: nobody → Andreas Olsson (andol)
importance: Undecided → Wishlist
status: New → In Progress
Revision history for this message
Andreas Olsson (andol) wrote :

Hmm, seems like this has to wait until lablgtk2 2.12.0-2 is (successfully) built.

Revision history for this message
Andreas Olsson (andol) wrote :

...which in turn happen to rely on lablgl 1.04-2 being (successfully) built.

Revision history for this message
Andreas Olsson (andol) wrote :

...which I guess should happen on the next try now with a new version of dh-ocaml.

(Sorry about the comment spam)

Revision history for this message
Andreas Olsson (andol) wrote :

Debdiff from Debian version to Merged version.

Remaining changes:
- Change default logfile directory to .unison by prepending
  .unison to name of logfile in ubase/trace.ml

Revision history for this message
Andreas Olsson (andol) wrote :

Debdiff from last Ubuntu version to Merged version.

  * Correct typo in documentation, thanks to Lucas B. Cohen
    (Closes: #137960, #129478, #466173)
  * Switch packaging to git
  * Set xsbc-original-maintainer to Debian OCaml Maintainers
  * Add dh-ocaml build-dependency (rules/ocaml.mk)
  * Upgrade debian/compat to 7
  * Upgrade Standards-Version to 3.8.0 (debian/README.source)
  * Add ${misc:Depends} to dependencies
  * Update debian/copyright file to use
    http://wiki.debian.org/Proposals/CopyrightFormat
  * Remove obsolete debian/control.in related variables and files

Changed in unison (Ubuntu):
assignee: Andreas Olsson (andol) → nobody
status: In Progress → Confirmed
Revision history for this message
Andrea Veri (av) wrote :

it seems you forgot to add some remaining changes:
- Maintainer set to the MOTU team
- a patch added on the 00list (change-logfile-location) which contains the change made to the trace.ml file.

When you do a merge you should *alwais* look at the diff you generate. Every change you report on the changelog should be visible on the diff you provide. So don't just copy/paste the previous merge entry that got added but step by step think about what changes you see in the diff and what your changelog entry reports instead.
Unsubscribing u-u-s until you fix this.

Changed in unison (Ubuntu):
status: Confirmed → Incomplete
Revision history for this message
Andreas Olsson (andol) wrote :

@Andrea: Actually, I have looked thru the debdiff, and I know that the changes in there are deliberate.

That said, I'm still trying to come to an understand the proper way to document changes. For one thing I figured setting Maintainer to MOTU was an obvious change, considering that we are introducing an Ubuntu delta, and that the package lives in Universe. Yet, I guess it never hurts to be explicit. I'll add that part to the changelog.

Regarding the patch I (re)-added to 00list (change-logfile-location.dpatch). How detailed do you want me to be in that matter? Should I be more explicit than when it was originally added in unison 2.27.57-1ubuntu1?

Revision history for this message
Andrea Veri (av) wrote :

you are learning and improving so I want you to be accurate in every single thing you do. About the 00list change just add a note like :

 debian/00list: updated including foo patch ...

Anyway what you said about the maintainer change is true, but if you gonna drop it, it might happen on the next merge run that the guy who gonna do it (maybe a bit inexperienced) will forget to add it maybe saying the previous merger didnt add it as well. Again be accurate and strict when you process packaging issues. (especially when you document changes)

Revision history for this message
Andreas Olsson (andol) wrote :

Have clarified the changelog entry. Uploading a new set of debdiffs.

Revision history for this message
Andreas Olsson (andol) wrote :
Revision history for this message
Andrea Veri (av) wrote :

Looks like something is still wrong. The release should be karmic not jaunty, please update it and set the bug back to confirmed. Watch out for this little errors.

Revision history for this message
Andrea Veri (av) wrote :

Looks like something is still wrong. The release should be karmic not jaunty, please update it and set the bug back to confirmed. Watch out for these little errors.

Revision history for this message
Andreas Olsson (andol) wrote :

Darn, forgot to watch out for that "feature" i dch. Anyway, hopefully third time is the charm...

Revision history for this message
Andreas Olsson (andol) wrote :
Changed in unison (Ubuntu):
status: Incomplete → Confirmed
Revision history for this message
Andrea Veri (av) wrote :

Looks fine now. Gonna process it tomorrow. Thanks for the fast responses.

Changed in unison (Ubuntu):
assignee: nobody → Andrea Veri (bluekuja)
Revision history for this message
Andrea Veri (av) wrote :

it looks like you forgot to add previoys ubuntu changelog's entry :)

Changed in unison (Ubuntu):
assignee: Andrea Veri (bluekuja) → Andreas Olsson (andol)
status: Confirmed → Incomplete
Revision history for this message
Andrea Veri (av) wrote :

plus you should not use this address anymore: Ubuntu MOTU Developers <email address hidden>, but this one instead: Ubuntu Developers <email address hidden> as per https://wiki.ubuntu.com/DebianMaintainerField

Revision history for this message
Andreas Olsson (andol) wrote :

Which Ubuntu changelog entry are you missing? From what I can see unison_2.27.57-2_2.27.57-2ubuntu1.debdiff does add the 2.27.57-1ubuntu1 entry?

Didn't know about the new Maintainer guidelines. Thank for pointing them out.

Revision history for this message
Andrea Veri (av) wrote :

you just added the karmic/intrepid ones but as you can see here: https://edge.launchpad.net/ubuntu/+source/unison you didnt add some of them like feisty / dapper ones and more.

Revision history for this message
Michael Bienia (geser) wrote :

There is no need to mention the Maintainer change in debian/changelog anymore.

From /usr/share/doc/ubuntu-policy/policy.txt.gz:
     If the `Maintainer' field is modified, then the old value must be
     saved in a field named `XSBC-Original-Maintainer'. Because it is
     mandated and very common, it is not necessary or appropriate to
     document this change in `debian/changelog', unless it is the only
     change involved in the upload.

Revision history for this message
Andrea Veri (av) wrote :

Uploaded. I changed the maintainer address to point to the new one and I removed this change in changelog as michael suggested here. Please don't drop the ball at the first problem next time, it's not the way to work.

Changed in unison (Ubuntu):
assignee: Andreas Olsson (andol) → nobody
status: Incomplete → Fix Committed
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package unison - 2.27.57-2ubuntu1

---------------
unison (2.27.57-2ubuntu1) karmic; urgency=low

  * Merge from debian unstable (LP: #377652), remaining changes:
    - Change default logfile directory to .unison by prepending
      .unison to name of logfile in ubase/trace.ml. For this reason
      debian/patches/00list still include change-logfile-location

 -- Andreas Olsson <email address hidden> Mon, 03 Aug 2009 20:32:54 +0200

Changed in unison (Ubuntu):
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.