Merge lp:~logan/ubuntu/raring/nbd/new-merge into lp:ubuntu/raring/nbd

[Logan Rosen]

[Didier Roche-Tolomelli (didrocks)]

Looking good and builds fine. Sponsoring. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-05 16:47:29 +0000
+++ debian/changelog	2013-01-06 08:53:20 +0000
@@ -1,3 +1,26 @@
+nbd (1:3.2-2ubuntu1) raring; urgency=low
+
+  * 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.
+
+ -- Logan Rosen <[e-mail]>  Sun, 06 Jan 2013 03:48:19 -0500
+
+nbd (1:3.2-2) unstable; urgency=low
+
+  * Update build-dependencies: Build-depend on debhelper 9 (we already
+    say 9 in debian/compat, so this is just stating what's effectively
+    already the case), and tighten libglib2.0-dev dependency, since
+    nbd-server requires at least 2.26 these days.
+  * Change nbd-client-udeb from Architecture: <long list> to
+    Architecture: linux-any, similarly to how it's done for nbd-client.
+    I keep forgetting about this teensie tiny thing here. Oh well.
+  * Ack NMU
+
+ -- Wouter Verhelst <[e-mail]>  Sat, 08 Sep 2012 19:38:02 +0200
+
 nbd (1:3.2-1.1ubuntu1) raring; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
@@ -16,6 +39,9 @@
 
  -- Christian Perrier <[e-mail]>  Sun, 05 Aug 2012 09:49:21 +0200
 
+ nbd (1:3.2-1) unstable; urgency=low
+ 
+   * New upstream release. Includes many stability fixes, so hopefully
 nbd (1:3.2-1) unstable; urgency=low
 
   * New upstream release. Includes many stability fixes, so hopefully

=== modified file 'debian/control'
--- debian/control	2012-12-05 16:47:29 +0000
+++ debian/control	2013-01-06 08:53:20 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Wouter Verhelst <[e-mail]>
-Build-Depends: debhelper (>= 7.4.0), libglib2.0-dev
+Build-Depends: debhelper (>= 9), libglib2.0-dev (>= 2.26.0)
 Standards-Version: 3.9.2
 Vcs-Git: git://anonscm.debian.org/users/wouter/nbd.git
 Vcs-Browser: http://git.debian.org/?p=users/wouter/nbd.git;a=summary
@@ -46,7 +46,7 @@
 Priority: optional
 Depends: ${shlibs:Depends}
 XC-Package-Type: udeb
-Architecture: alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 sh3 sh3eb sh4 sh4eb sparc
+Architecture: linux-any
 Description: Network Block Device protocol - client for Debian Installer
  Network Block Device (NBD) is a client/server protocol that
  emulates a block device (such as a hard disk, a floppy, or a CD-ROM)