Ubuntu
dpkg-cross package

Merge dpkg-cross 2.6.2 (universe) from Debian unstable (main)

Bug #736154 reported by Marcin Juszkiewicz on 2011-03-16

This bug affects 1 person

Affects		Status	Importance	Assigned to	Milestone
	dpkg-cross (Ubuntu)	Fix Released	Wishlist	Steve Langasek

Bug Description

Binary package hint: dpkg-cross

I am working on cross toolchain packages. Recently I merged support for Debian, Ubuntu and Linaro backport PPA into one source package. It builds fine under Debian but fails under Ubuntu because old version of dpkg-cross is present (which does not preserve Section: field value).

dpkg-cross (2.6.2) unstable; urgency=low

* Only suggest binutils-multiarch (relies on changes
in debhelper >= 8.1.2) (Closes: #591542)

-- Neil Williams <email address hidden> Tue, 22 Feb 2011 13:00:18 +0000

dpkg-cross (2.6.1) unstable; urgency=low

* Target unstable.
* Update standards version (no changes)

-- Neil Williams <email address hidden> Mon, 07 Feb 2011 19:25:59 +0000

dpkg-cross (2.6.0) experimental; urgency=low

   * Add armhf support to cross-config (Closes: #605409)
   * Document file removal process (Closes: #599206)
   * Add translation support for runtime messages.
   * Move upload to experimental
   * Retain Section in converted package. (Closes: #592458)

-- Neil Williams <email address hidden> Wed, 08 Dec 2010 20:39:01 +0000

dpkg-cross (2.5.9) unstable; urgency=low

* Downgrade binutils-multiarch to Recommends
* Get dpkg-cross --version from dpkg-query.

-- Neil Williams <email address hidden> Mon, 07 Jun 2010 12:44:26 +0100

See original description

Tags:

Related branches

lp:ubuntu/natty/dpkg-cross

Revision history for this message

Marcin Juszkiewicz (hrw) wrote on 2011-03-16:

Changelog Edit (1.9 KiB, text/plain)

cvs2cl generated changelog as there is no such one in sources - existing one ends at 2007

Revision history for this message

Marcin Juszkiewicz (hrw) wrote on 2011-03-16:

build.log Edit (46.3 KiB, text/plain)

Revision history for this message

Marcin Juszkiewicz (hrw) wrote on 2011-03-16:

install.log Edit (558 bytes, text/plain)

Revision history for this message

Marcin Juszkiewicz (hrw) wrote on 2011-03-16:

dpkg-cross.debdiff Edit (11.2 KiB, text/plain)

Steve Langasek (vorlon) on 2011-03-16

summary:

- sync 2.6.2 from Debian
+ merge 2.6.2 from Debian

Revision history for this message

Martin Pitt (pitti) wrote on 2011-03-21: Re: merge 2.6.2 from Debian

This is only bug fixes and fixing i18n, no FFE necessary. Sub'ing sponsors again.

Changed in dpkg-cross (Ubuntu):
status:	New → Confirmed

Revision history for this message

Artur Rona (ari-tczew) wrote on 2011-03-22:

I'll take this one.

Changed in dpkg-cross (Ubuntu):
assignee:	nobody → Artur Rona (ari-tczew)
importance:	Undecided → Wishlist
status:	Confirmed → In Progress

Revision history for this message

Marcin Juszkiewicz (hrw) wrote on 2011-03-23:

Please wait for 2.6.3 release as it will contain important fixes.

summary:

- merge 2.6.2 from Debian
+ merge 2.6.3 from Debian

Revision history for this message

Artur Rona (ari-tczew) wrote on 2011-03-23:

Marcin, let me know when debdiff for merge 2.6.3 is ready to sponsor.

summary:	- merge 2.6.3 from Debian + Merge dpkg-cross 2.6.2 (universe) from Debian unstable (main)
description:	updated
Changed in dpkg-cross (Ubuntu):
status:	In Progress → New

Philipp Kaluza (pixelpapst) on 2011-03-29

tags:

added: multiarch-followup

Revision history for this message

Marcin Juszkiewicz (hrw) wrote on 2011-04-04:

dpkg-cross-2.6.3ubuntu1.debdiff Edit (10.7 KiB, text/plain)

2.6.3 got uploaded into Debian - attached patch is merge of Ubuntu changes

Brian Murray (brian-murray) on 2011-04-04

tags:

added: patch

Steve Langasek (vorlon) on 2011-04-06

Changed in dpkg-cross (Ubuntu):
assignee:	Artur Rona (ari-tczew) → Steve Langasek (vorlon)

Revision history for this message

Steve Langasek (vorlon) wrote on 2011-04-06:

#10

@@ -18,9 +19,9 @@
Architecture: all
Depends: ${perl:Depends}, ${misc:Depends}, dpkg-dev (>= 1.14.7),
  libconfig-auto-perl, libdebian-dpkgcross-perl (= ${source:Version})
-Recommends: fakeroot
-Suggests: binutils-multiarch
-Breaks: debhelper (<< 8.1.2~)
+Recommends: fakeroot, binutils-multiarch
+Conflicts: apt-cross (<< 0.2.9), emdebian-tools (<< 0.3.9)
+Enhances: dpkg-dev
Description: tools for cross compiling Debian packages
  dpkg-cross is a tool for installing libraries and headers from
  packages which have not been converted for Multi-Arch to support

I think this is probably a mis-merge; we had dropped binutils-multiarch from a Depends to a Recommends, upstream now dropped it from Depends to Suggests and we had no other changes to debian/control. So I think we want to take the upstream changes. I'll fix this as part of the merge.

Revision history for this message

Launchpad Janitor (janitor) wrote on 2011-04-06:

#11

This bug was fixed in the package dpkg-cross - 2.6.3ubuntu1

---------------
dpkg-cross (2.6.3ubuntu1) natty; urgency=low

  * Merge with Debian (LP: #736154), remaining changes:
    - Cache ac_cv_func_malloc_0_nonnull=yes and
      ac_cv_func_realloc_0_nonnull=yes globally.
    - Handle datarootdir specially in .pc files; it should keep the original
      prefix.
    - Handle lines containing '${exec_prefix}/bin' specially in .pc files;
      these are normally development tools, so should keep the original
      prefix. (For example, orbit_idl in ORBit-2.0.pc.)
-- Marcin Juszkiewicz <email address hidden> Mon, 04 Apr 2011 12:23:15 +0200