From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 3 May 2018 12:13:05 +0000 (+0100)
Subject: Merge version 1.1.28-3+rpi1 and 1.2.2-1 to produce 1.2.2-1+rpi1
X-Git-Tag: archive/raspbian/1.2.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=83846af52dd9d704a8260df1fcd02a7b248f948d;p=nbdkit.git

Merge version 1.1.28-3+rpi1 and 1.2.2-1 to produce 1.2.2-1+rpi1
---

83846af52dd9d704a8260df1fcd02a7b248f948d
diff --cc debian/changelog
index bdb660f,9924d55..a383177
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,35 +1,44 @@@
- nbdkit (1.1.28-3+rpi1) buster-staging; urgency=medium
++nbdkit (1.2.2-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.1.16-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 26 Oct 2017 12:09:47 +0000]
 +  * Change kernel build-dep for Raspbian.
 +  * Disable testsuite.
 +  * Add build-conflicts on ocaml-base-nox
 +
-  -- Peter Michael green <plugwash@raspbian.org>  Fri, 16 Feb 2018 03:33:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 03 May 2018 12:13:05 +0000
++
+ nbdkit (1.2.2-1) unstable; urgency=medium
+ 
+   * New upstream version 1.2.2
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 22 Apr 2018 12:25:49 +0200
+ 
+ nbdkit (1.2.1-3) unstable; urgency=medium
+ 
+   * Disable tests on all architectures except i386, amd64, arm64
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 16 Apr 2018 20:32:11 +0200
+ 
+ nbdkit (1.2.1-2) unstable; urgency=medium
+ 
+   * Remove build-dependency for armel kernel image
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 16 Apr 2018 16:38:19 +0200
+ 
+ nbdkit (1.2.1-1) unstable; urgency=medium
+ 
+   * New upstream version 1.2.1
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 10 Apr 2018 06:18:05 +0200
+ 
+ nbdkit (1.2.0-1) unstable; urgency=medium
+ 
+   * New upstream version 1.2.0
+   * Update watch file
+   * Bump Standards-Version
+   * Update Vcs-* to salsa.debian.org
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sat, 07 Apr 2018 09:29:51 +0200
  
  nbdkit (1.1.28-3) unstable; urgency=medium
  
diff --cc debian/control
index 1c80e9e,5b34bb0..81592cc
--- a/debian/control
+++ b/debian/control
@@@ -15,14 -15,7 +15,9 @@@ Build-Depends: debhelper (>= 10~)
   libselinux1-dev,
   libvirt-dev,
   zlib1g-dev,
 + linux-image-marvell [armel] <!nocheck> | linux-image-versatile [armel] <!nocheck>,
-  linux-image-rpi [armhf] <!nocheck> | linux-image-rpi2 [armhf] <!nocheck>, 
++ linux-image-rpi [armhf] <!nocheck> | linux-image-rpi2 [armhf] <!nocheck>,
   linux-image-arm64 [arm64] <!nocheck>,
-  linux-image-4kc-malta [mips mipsel] <!nocheck> | linux-image-5kc-malta [mips mipsel mips64 mips64el] <!nocheck>,
-  linux-image-s390x [s390x] <!nocheck>,
-  linux-image-powerpc64 [powerpc ppc64] <!nocheck>,
-  linux-image-powerpc64le [ppc64el] <!nocheck>,
-  linux-image-sparc64 [sparc] <!nocheck>,
   linux-image-amd64 [amd64] <!nocheck>,
   linux-image-686-pae [i386] <!nocheck> | linux-image-586 [i386] | linux-image-486 [i386] <!nocheck>,
   busybox <!nocheck>,