lp:~logan/ubuntu/raring/iproute/debian-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/raring/iproute at revision 40

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

Ubuntu branches: Pending requested 2012-12-02

Diff: 1683 lines (+115/-1506)

8 files modified

.pc/7f747fd9377b8538adeba7332d25905ba08ac156.diff/ip/ipaddress.c (+0/-1416)
.pc/applied-patches (+1/-1)
debian/changelog (+25/-0)
debian/control (+1/-1)
debian/patches/0001-iproute2-List-interfaces-without-net-address-by-defa.patch (+86/-0)
debian/patches/7f747fd9377b8538adeba7332d25905ba08ac156.diff (+0/-86)
debian/patches/series (+1/-1)
debian/rules (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

40. By Logan Rosen on 2012-12-02

* Merge from Debian experimental. Remaining changes:
  - debian/patches/cross.diff: Add cross-building support.
* Dropped changes:
  - Cherry pick from git (done in 0001-iproute...patch in Debian).
* Generate recommends for optional module dependencies
  This makes the optional module dependency on libxtables more
  visible, to hopefully get iproute rebuilt whenever libxtables
  bumps soname.
  Thanks to iptables maintainer for splitting libxtables9 into
  a separate package in version 1.4.16.3-2.
* 0001-iproute2-List-interfaces-without-net-address-by-defa.patch:
  List interfaces without net address by default.
  This fixes regression in iproute2-3.5.1 when `ip addr show' skipped
  interfaces without network layer address.
  Patch from upstream (git 7f747fd9377b8538ad).

39. By Stéphane Graber on 2012-11-09

* Merge from Debian experimental. Remaining changes: (LP: #1077110)
  - Add cross-building support.
* Cherry pick upstream commit to list interfaces without net address
  by default. (7f747fd9377b8538adeba7332d25905ba08ac156)

38. By Stéphane Graber on 2012-11-09

releasing version 20121001-1ubuntu1

37. By Stéphane Graber on 2012-11-09

Cherry pick bugfix from upstream

36. By Stéphane Graber on 2012-11-09

Merge from Debian experimental

35. By Stéphane Graber on 2012-11-09

Merging shared upstream rev into target branch.

34. By Colin Watson on 2012-06-25

* Resynchronise with Debian. Remaining changes:
  - Add cross-building support.

33. By Colin Watson on 2012-05-22

* Resynchronise with Debian. Remaining changes:
  - Mark iproute as Multi-Arch: foreign.
  - Add cross-building support.

32. By Colin Watson on 2012-04-09

Add cross-building support (LP: #870197).

31. By Stéphane Graber on 2012-02-02

releasing version 20111117-1ubuntu1