Ubuntu
mercurial package

Sync mercurial 1.2-1 (universe) from Debian unstable (main).

Bug #378078 reported by Vincenzo Ampolo
12
This bug affects 1 person
Affects Status Importance Assigned to Milestone
mercurial (Ubuntu)
Fix Released
Wishlist
Unassigned

Bug Description

Please sync mercurial 1.2-1 (universe) from Debian unstable (main).

Explanation of the Ubuntu delta and why it can be dropped:
Changes are only in debian/control and it's related to maintainer name and email only.
Sync is better than merge to reduce the ubuntu-debian delta.

Changelog since current karmic version 1.1.2-2ubuntu1:

mercurial (1.2-1) unstable; urgency=low

  * New upstream release.

  * Fix FTBFS with python-support 0.90 by removing dependence on
    python-support internals. (closes: #516269)

 -- Vernon Tang <email address hidden> Fri, 06 Mar 2009 17:37:45 +0800

mercurial (1.1.2+hg20090217-7787-b8d750daadde-1) experimental; urgency=low

  [ Vernon Tang ]
  * New snapshot for feature freeze before next major release.

  * debian/patches:
    - deb_specific__mergetools: remove RCS merge from merge tools
    - Added:
      - proposed_upstream__dont-install-i18n
    - Dropped:
      - convert-darc-doc.patch: dropping for now to avoid fuzzing translations
      - backport__zeroconf-doc
    - Refreshed:
      - deb_specific__install-templates-separately
      - deb_specific__mergetools

  * debian/control:
    - Add gettext to build dependencies for compiling translations
    - Remove RCS merge from Recommends
    - Change merge tool Recommends to Suggests, add xxdiff

  [ Vincent Danjean ]
  * swich to debhelper 7.
    Debhelper 5.0.37.2 is not enought: 6.0.7 at least is required for
    dh_lintian to be called.
  * Fix version to hg hash (instead of 'unknown') for this snapshot
  * Fix upstream version in changelog
  * Upload to experimental

 -- Vincent Danjean <email address hidden> Wed, 18 Feb 2009 16:24:23 +0100

Revision history for this message
Siegfried Gevatter (rainct) wrote :

ACK'd.

Vincenzo: If you look at the diff between the latest Debian version which was in Ubuntu and 1.1.2-2ubuntu1 (http://launchpadlibrarian.net/22976334/mercurial_1.1.2-2_1.1.2-2ubuntu1.diff.gz), you'll see that changing the Maintainer isn't the only change (and you'll never find a package where it is the only change, unless whoever uploaded is was drunk :P). Matthias Klose's revision added a change to fix mercurial's executable so that it works with the default Python version and not a hard-coded one; however, if you build 1.2-1 and look at the top of file debian/mercurial/usr/bin/hg you'll see that even without Matthias's change the interpreter isn't hard-coded to any particular version anymore, so his change can be dropped and we can sync from Debian.

Changed in mercurial (Ubuntu):
importance: Undecided → Wishlist
status: New → Confirmed
Revision history for this message
Steve Langasek (vorlon) wrote :

[Updating] mercurial (1.1.2-2ubuntu1 [Ubuntu] < 1.2.1-3 [Debian])
 * Trying to add mercurial...
  - <mercurial_1.2.1-3.diff.gz: downloading from http://ftp.debian.org/debian/>
  - <mercurial_1.2.1.orig.tar.gz: downloading from http://ftp.debian.org/debian/>
  - <mercurial_1.2.1-3.dsc: downloading from http://ftp.debian.org/debian/>
I: mercurial [universe] -> mercurial-common_1.1.2-2ubuntu1 [universe].
I: mercurial [universe] -> mercurial_1.1.2-2ubuntu1 [universe].

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

Other bug subscribers

Remote bug watches

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