lp:~logan/ubuntu/raring/dpkg-cross/debian-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/raring/dpkg-cross at revision 34

Daniel Holbach (community): Approve on 2012-12-17

Ubuntu branches: Pending requested 2012-12-17

Diff: 1819 lines (+332/-1327)

10 files modified

config/cmake/CMakeCross.txt (+13/-4)
config/cross-config.arm64 (+90/-0)
config/cross-config.cache (+88/-31)
config/qmake/cross/features/link_xpkgconfig.prf (+7/-0)
config/qmake/cross/qmake.conf (+48/-0)
config/qmake/multi/qmake.conf (+49/-0)
debian/changelog (+35/-0)
debian/changelog- (+0/-1291)
debian/dpkg-cross.install (+1/-0)
dpkg-cross (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

34. By Logan Rosen on 2012-12-17

* Merge from Debian experimental. Remaining changes:
  - dpkg-cross:
    + 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.)
    + Assume multiarch if encoutering a /usr/include/$crosstype/ file too.
      This fixes issues with arch-qualified include files being moved to
      “doubly-qualified” paths.
* Fix cmake integration use of variables and add explicit
  support for g++. (Closes: #695369)
* Tell cmake about a cross pkg-config executable. (Closes:
  #695370)
* Add qmake cross-building support.
* Add arm64 support, thanks to patch from Wookey, also
  adds more packages to the cross-config.cache and
  generalise some more common values. (Closes: #693730)
* Target experimental.
* Fix use of qw in list context for perl 5.14

33. By Logan Rosen on 2012-08-15

* Merge from Debian unstable. 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.)
  - Applied patch from Thibaut Girka:
    Assume multiarch if encoutering a /usr/include/$crosstype/ file too.
    This fixes issues with arch-qualified include files being moved to
    “doubly-qualified” paths.

32. By Marcin Juszkiewicz on 2012-05-17

* New upstream release.
* 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.)
* Applied patch from Thibaut Girka:
  Assume multiarch if encoutering a /usr/include/$crosstype/ file too.
  This fixes issues with arch-qualified include files being moved to
  “doubly-qualified” paths. (/usr/<triplet>/include/<triplet> example:
  libc6-dev from last arm{el|hf}-cross-toolchain-base)

31. By Wookey on 2012-04-20

Update coreutils and util-linux cache vars for precise (LP: #986226)

30. By Marcin Juszkiewicz on 2011-07-28

[ Marcin Juszkiewicz ]
* Merge with Debian (LP: #817513), 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.)

[ Loïc Minier ]
* Rename Vcs-* to XS-Debian-Vcs-*.

29. By Marcin Juszkiewicz on 2011-04-06

Merge with Debian

28. By Loïc Minier on 2010-08-03

Only recommend rather than depend on binutils-multiarch.

27. By Loïc Minier on 2010-05-23

* Merge with Debian, remaining changes:
  - Cache ac_cv_func_malloc_0_nonnull=yes and
    ac_cv_func_realloc_0_nonnull=yes globally.
  - Add support for multiarch paths even for packages that don't have
    appropriate control fields. (This is a temporary workaround for
    libffi-dev, and probably doesn't need to go upstream.) When the package
    has multiarch fields, move the files, otherwise just link them around.
  - 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.)

26. By Loïc Minier on 2010-03-25

* Resynchronise with Debian, dropping configurability of crosstype.
  Remaining changes:
  - Cache ac_cv_func_malloc_0_nonnull=yes and
    ac_cv_func_realloc_0_nonnull=yes globally.
  - Add support for multiarch paths even for packages that don't have
    appropriate control fields. (This is a temporary workaround for
    libffi-dev, and probably doesn't need to go upstream.) When the package
    has multiarch fields, move the files, otherwise just link them around.
  - 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.)
* Implement transitionary support for Multi-Arch (Closes: #545464)
* Allow for apt-cross to not be installed when checking list of
  multiarch packages (Closes: #566744)

25. By Colin Watson on 2010-02-02

releasing version 2.5.5ubuntu1