Sync doc++ 3.4.10-3.4 from Debian

Bug #76479 reported by Pappan
4
Affects Status Importance Assigned to Milestone
doc++ (Ubuntu)
Fix Released
Undecided
Tollef Fog Heen

Bug Description

Source Package Name: doc++
Source Package Version number to sync: 3.4.10-3.4
Where to sync from: Debian unstable (main)
Ubuntu Changes apart from debian/changelog: Yes

Description of Ubuntu Changes:
The fix included not to install "/usr/share/locale/locale.alias"

Reason why it may be dropped:
Debian has incorporated this fix in 3.4.10-3.3 itself.

debian/changelog from last Ubuntu Change:

doc++ (3.4.10-3.4) unstable; urgency=low

  * NMU as part of the GCC 4.1 transition.
  * Revert GCC 3.3 builds patch since it introduced illegal syntax.
  * Add GCC 4.1 build fix from Jeremy Nimmer (Closes: #339921).

 -- Martin Michlmayr <email address hidden> Thu, 25 May 2006 17:57:50 +0200

doc++ (3.4.10-3.3) unstable; urgency=high

  * Non-maintainer upload.
  * Update aclocal.m4 to not install locale.alias (Closes: #354048).

 -- Luk Claes <email address hidden> Fri, 10 Mar 2006 16:29:38 +0100

Revision history for this message
Pappan (ppadman) wrote :

Attaching

debdiff doc++_3.4.10-3.2ubuntu1.dsc doc++_3.4.10-3.4ubuntu1.dsc > doc++_3.4.10-3.4ubuntu1.debdiff

Revision history for this message
Pappan (ppadman) wrote :

Attaching the debdiff between Debian dsc and the new ubuntu dsc:

debdiff doc++_3.4.10-3.4.dsc doc++_3.4.10-3.4ubuntu1.dsc > doc++_3.4.10-3.4ubuntu1.debdiff.1

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

This is a sync candidate. Please request a sync.

The only Ubuntu change is to not install locale.alias. This was fixed in doc++ 3.4.10-3.3:
   * Non-maintainer upload.
   * Update aclocal.m4 to not install locale.alias (Closes: #354048).

Revision history for this message
Pappan (ppadman) wrote :

As mentioned by Michael, this is a sync request rather than a merge. So changed this bug from merge to sync request.

Thanks

description: updated
Pappan (ppadman)
description: updated
description: updated
Pappan (ppadman)
description: updated
Revision history for this message
Michael Bienia (geser) wrote :

ACK to overwrite Ubuntu changes.

Changed in doc++:
status: Unconfirmed → Confirmed
Revision history for this message
Tollef Fog Heen (tfheen) wrote :

[Updating] doc++ (3.4.10-3.2ubuntu1 [Ubuntu] < 3.4.10-3.4 [Debian])
 * Trying to add doc++...
  - <doc++_3.4.10.orig.tar.gz: already in distro - downloading from librarian>
  - <doc++_3.4.10-3.4.dsc: downloading from http://ftp.debian.org/debian/>
  - <doc++_3.4.10-3.4.diff.gz: downloading from http://ftp.debian.org/debian/>
I: doc++ [universe] -> doc++_3.4.10-3.2ubuntu1 [universe].

Changed in doc++:
assignee: nobody → tfheen
status: Confirmed → 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.