lp:~ubuntu-branches/ubuntu/natty/btrfs-tools/natty-201101181043

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/natty/btrfs-tools

Ubuntu branches: Pending requested 2011-01-18

Diff: 77 lines (+50/-0) (has conflicts)

3 files modified

debian/changelog (+14/-0)
debian/patches/04-werror.patch (+20/-0)
debian/patches/05-fix-ld.patch (+16/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

27. By Michael Vogt on 2011-01-14

* debian/patches/05-fix-ld.patch:
  - add missing -lcom_err to fix FTBFS

26. By Michael Vogt on 2011-01-14

* debian/patches/04-werror.patch:
  - fix missing initialization (fixes FTBFS)

25. By Michael Vogt on 2011-01-14

* btrfs-tools-udeb.install:
  - ship /sbin/btrfs in the udeb

24. By Daniel Baumann on 2010-06-20

* Updating year in copyright file.
* Adding overrides for clean target to make sure package builds twice
  in a row (Closes: #585074).
* Sorting dh call in rules to more common order.
* Adding patch from Colin Watson <email address hidden> to fix FTBFS
  with glibc 2.12 (Closes: #586111).

23. By Colin Watson on 2010-06-16

releasing version 0.19+20100601-2ubuntu1

22. By David Sugar on 2010-06-16

Quick patch for missing sys/stat.h in btrfsck.c (LP: #591412).

21. By Daniel Baumann on 2010-06-05

* Updating ftbfs.patch, thanks to Alexander Kurtz
  <email address hidden> (Closes: #583768).
* Adding two more casts in ftbfs.patch and fixing wrapping in previous
  ones.

20. By Daniel Baumann on 2010-06-01

* Updating patch to fix FTBFS on alpha and ia64, thanks to Alexander
  Kurtz <email address hidden> (Closes: #583768).
* Renumbering patches.
* Merging upstream version 0.19+20100601 (Closes: #583793).
* Removing upstream patches.

19. By Daniel Baumann on 2010-05-24

* Setting section for udeb to debian-installer.
* Disabling valgrind patch, seems to make troubles on armel (Closes:
  #582438).

18. By Daniel Baumann on 2009-12-05

* Adding patch from Josef Bacik <email address hidden> to fix memory
  leaks and segfaults.
* Simplifying shell commands in rules.