Please merge nbd 1:2.9.13-2(main) from debian unstable(main)

Bug #399707 reported by Bhavani Shankar
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
nbd (Ubuntu)
Fix Released
Wishlist
Unassigned

Bug Description

debian has a new version to be merged

 nbd (1:2.9.13-2) unstable; urgency=low

   * The "Black Finger DebConf" release.
   * Add avr32 to nbd-client-udeb, too. Oops. Closes: #533694, hopefully
     for good.
   * nbd-client.README.Debian: add a bit more clarification on how
     root-on-NBD is supposed to work.
   * nbd-client.init.d: parse /proc/cmdline rather than /proc/mounts
     (the same way as how nbd-client.initrd does it) to figure out what
     the NBD root device is, so that root-on-LVM-on-nbd or something
     equally batshit insane does not confuse the sendsigs.omit.d
     generating code.
   * nbd-client.init.d: add support for an OMITKILL variable that will
     allow to specify extra nbd devices that should receive the same
     protection as for the above.
   * nbd-client.config: fetch KILLALL value from /etc/nbd-client (if it
     exists) and use it to db_set nbd-client/killall
   * nbd-client.postinst: fix so that KILLALL is correctly written to
     /etc/nbd-client, even if the number of devices is zero.
   * The above four were inspired by conversations with Vagrant
     Cascadian, while he was working on LTSP support in Debian. Thanks!
   * Updated Swedish translation. Thanks, Martin Bagge; Closes: #534246.

 -- Wouter Verhelst <email address hidden> Fri, 17 Jul 2009 01:25:26 +0200

nbd (1:2.9.13-1) unstable; urgency=low

  * New upstream release

 -- Wouter Verhelst <email address hidden> Thu, 09 Jul 2009 11:18:51 +0200

nbd (1:2.9.12-3) unstable; urgency=low

  * Add Finnish translation. Thanks, Esko Arajärvi; Closes: #533451.
  * Add 'avr32' to nbd-client's 'Architecture:' list. Closes: #533694.

 -- Wouter Verhelst <email address hidden> Sat, 20 Jun 2009 16:30:40 +0200

nbd (1:2.9.12-2) unstable; urgency=low

  * Steal a patch from git HEAD so that nbd-tester-client doesn't try to
    do unaligned access on SPARC.
  * Add German translation too. Oops. Closes: #530835.

 -- Wouter Verhelst <email address hidden> Sat, 06 Jun 2009 02:15:16 +0200

nbd (1:2.9.12-1) unstable; urgency=low

  * The "spring cleaning" release.
  * New upstream release.
- The meaning of the -swap option has been changed; rather than
       trying to use a kernel patch which hasn't been maintained since
       the Linux 2.1.something days, use mlockall() to make sure we don't
       get swapped out. Closes: #409530.
       - Steal patch from git HEAD to document this change in nbd-client(8).
     - Removed (corrupt) winnbd.zip. Closes: #473823.
   * The Debconf templates have been reviewed by the debian-l10n-english
     team; incorporate those changes. Closes: #528476, 430701, 530711.
   * Updated debconf translations, to reflect the above:
     - Dutch, by myself
     - Swedish, by Martin Bagge; Closes: #529859.
     - Czech, by Miroslav Kure; Closes: #530236.
     - French, by Christian Perrier and the French l10n team; Closes: #530332.
     - Portuguese, by "Traduz - Portuguese Translation Team"; Closes: #531303.
   * New debconf translations:
     - Russian, by Yuri Kozlov; Closes: #531203.
   * nbd-client: install nbd-client.modprobe using debhelper rather than
     using our own 'install' invocation. This takes care of giving it the
     proper name (re recent module-init-tools) and moving files from the
     old to the new location. Depend on debhelper (>= 7.2.2) to make sure
     it has the required functionality to handle this correctly.
   * nbd-client.init.d: remove '-k' option from modprobe. This was once
     useful in the 2.4 days, but module-init-tools modprobe has never
     needed that option, and now produces an error message when it's
     used. Closes: #531620.
   * (Conditionally, compliant with the new DEB_BUILD_OPTIONS' "nocheck"
     option) re-enable the test suite. It did /not/ give false positives,
     ever. However, it did indeed break at some point...
   * Update to debhelper compat level 7.
   * nbd-client.postinst: don't use full path to update-initramfs.
   * copyright: refer to common-licenses/GPL-2 rather than the versionless
     variant.
   * That leaves one TODO for Policy 3.8.1: initscripts must not error
     out when 'start' is called and the daemon is already running. This
     will require some work (it might be there already, but I'm not sure
     and would need to test extensively).

 -- Wouter Verhelst <email address hidden> Fri, 05 Jun 2009 20:42:25 +0200

Related branches

Revision history for this message
Bhavani Shankar (bhavi) wrote :
Changed in nbd (Ubuntu):
status: New → Confirmed
Revision history for this message
Daniel Holbach (dholbach) wrote :

Why
+ * use ubuntu's debhelper version rather than debian's as we have not
+ yet got 7.2.2 in the archive.
?

We have 7.2.14ubuntu1 in the archive.

Revision history for this message
Bhavani Shankar (bhavi) wrote :

yes daniel but,

if you have a look closely,

debian have versioned their debhelper to be >>7.2.2 which is in debian but we still have got 7.2.14 in our archive...

Regards

Revision history for this message
Sebastien Bacher (seb128) wrote :

right, the debian version is lower since you don't compare one digit but the numbers after the .

Changed in nbd (Ubuntu):
importance: Undecided → Wishlist
Revision history for this message
Bhavani Shankar (bhavi) wrote :

Seb, I m a bit confused .. You mean to revert that change?

Regards

Revision history for this message
Bhavani Shankar (bhavi) wrote :

updated diff against new version

regards

Bhavani Shankar (bhavi)
summary: - Please merge nbd 1:2.9.13-1(main) from debian unstable(main)
+ Please merge nbd 1:2.9.13-2(main) from debian unstable(main)
description: updated
Revision history for this message
Colin Watson (cjwatson) wrote :

This needs a remerge as Debian now has 1:2.9.13-4, and the debian/control part of your patch is corrupted so it doesn't apply using 'patch -p1' (it looks as if you edited the patch by hand, perhaps). Could you do a quick update and I'll review it?

Revision history for this message
Daniel Holbach (dholbach) wrote :

Unsubscribing Sponsors team for now.

Revision history for this message
Daniel T Chen (crimsun) wrote :

20:04 < Yoe> I've prepared a patch, but launchpad seems to hate me; would anyone here be kind enough to post the URL for me? http://grep.be/~wouter/ubuntu/nbd_2.9.14-2ubuntu1.dsc

Revision history for this message
Wouter Verhelst (wouter-debian) wrote :

Managed to get past the problems I had with launchpad previously.

What's keeping this from being updated?

Revision history for this message
Colin Watson (cjwatson) wrote :

I'm looking at this now. So far I've made two (trivial) changes:

  * It's implicit that Ubuntu merges follow Debian unless otherwise stated, so we don't need to say that. Conventionally, though, we do list the changes that we're still carrying relative to Debian, so I've done that.
  * I preserved the changes to Maintainer in debian/control, per the requirements made of Ubuntu by Debian recorded in http://wiki.ubuntu.com/DebianMaintainerField.

Otherwise this (obviously) looks fine and I'll upload it. Thanks!

Revision history for this message
Colin Watson (cjwatson) wrote :

nbd (1:2.9.14-2ubuntu1) lucid; urgency=low

  * Merge from Debian Unstable. Remaining changes:
    - Drop /etc/modprobe.d/nbd-client; the kernel default is already
      appropriate.

 -- Wouter Verhelst <email address hidden> Mon, 14 Dec 2009 16:35:25 +0000

Changed in nbd (Ubuntu):
status: Confirmed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.