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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/raring/nbd at revision 39

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

Ubuntu branches: Pending requested 2012-12-05

Diff: 961 lines (+296/-153)

13 files modified

Makefile.am (+2/-1)
Makefile.in (+3/-2)
README.md (+0/-8)
config.sub (+10/-1)
configure (+10/-10)
configure.ac (+1/-1)
debian/changelog (+25/-0)
debian/po/cs.po (+27/-24)
man/nbd-client.8.in.sgml (+4/-3)
man/nbd-client.8.sh.in (+4/-3)
nbd-client.c (+49/-5)
nbd-server.c (+131/-94)
simple_test (+30/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

39. By Logan Rosen on 2012-12-05

* Merge from Debian unstable. Remaining changes:
  - Drop /etc/modprobe.d/nbd-client; the kernel default is already
    appropriate. Ubuntu-specific change.
    + Modify debian/nbd-client.dirs.
    + Remove debian/nbd-client.modprobe.
* Non-maintainer upload.
* Fix pending l10n issues. Debconf translations:
* Czech (Miroslav Kure). Closes: #681702
* New upstream release. Includes many stability fixes, so hopefully
  this will get a freeze exception.

38. By Vibhav Pant on 2012-06-17

* Merge from Debian unstable. (LP: #1014184) Remaining changes:
  - Drop /etc/modprobe.d/nbd-client; the kernel default is already
    appropriate. Ubuntu-specific change.
    + Modify debian/nbd-client.dirs
    + Remove debian/nbd-client.modprobe

37. By Stéphane Graber on 2012-05-03

releasing version 1:3.0-1ubuntu1

36. By Stéphane Graber on 2012-05-03

Merge from Debian unstable

35. By Stéphane Graber on 2012-05-03

Merging shared upstream rev into target branch.

34. By Stéphane Graber on 2012-02-11

* Merge from Debian unstable. Remaining changes (LP: #594595):
  - Drop /etc/modprobe.d/nbd-client; the kernel default is already
    appropriate. Ubuntu-specific change.
    + Modify debian/nbd-client.dirs
    + Remove debian/nbd-client.modprobe
    + Add debian/nbd-client.preinst

33. By Stéphane Graber on 2011-10-20

Fix incorrect use of log2() in nbd_server.c, replace by log3()
instead. Fixes FTBFS with previous upload.

32. By Stéphane Graber on 2011-10-20

* Merge from debian unstable. Remaining changes:
  - Drop /etc/modprobe.d/nbd-client; the kernel default is already
    appropriate. Ubuntu-specific change.
    + Modify debian/nbd-client.dirs
    + Remove debian/nbd-client.modprobe
    + Add debian/nbd-client.preinst

31. By Stéphane Graber on 2011-07-28

* Merge from debian unstable. Remaining changes:
  - Drop /etc/modprobe.d/nbd-client; the kernel default is already
    appropriate. Ubuntu-specific change.
    + Modify debian/nbd-client.dirs
    + Remove debian/nbd-client.modprobe
    + Add debian/nbd-client.preinst

30. By Stéphane Graber on 2011-07-07

* Merge from debian unstable. Remaining changes:
  - Drop /etc/modprobe.d/nbd-client; the kernel default is already
    appropriate. Ubuntu-specific change.
    + Modify debian/nbd-client.dirs
    + Remove debian/nbd-client.modprobe
    + Add debian/nbd-client.preinst