Merge version 1.3-3+rpi2 and 1.4-1 to produce 1.4-1+rpi1 bullseye-staging archive/raspbian/1.4-1+rpi1 raspbian/1.4-1+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Tue, 25 Feb 2020 16:48:20 +0000 (16:48 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Tue, 25 Feb 2020 16:48:20 +0000 (16:48 +0000)
1  2 
debian/changelog
debian/control

index 3d2357e7f17ea18ba9d7fe4d8f009aae6c5b9108,685a3c067cec4abc94896443467163385fd0eba6..64b929f90425704391144d59058d0226275b0ba9
@@@ -1,15 -1,9 +1,20 @@@
- primus-vk (1.3-3+rpi2) bullseye-staging; urgency=medium
++primus-vk (1.4-1+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 1.3-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 01 Dec 2019 03:06:16 +0000]
++  * Disable libnv-vulkan-wrapper1 package, we don't have any nvidia stuff in raspbian.
++
++  [changes brought forward from 1.3-3+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sat, 07 Dec 2019 02:54:38 +0000]
 +  * Also disable primus-vk-nvidia.
 +  * Fix clean target.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 07 Dec 2019 02:54:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 25 Feb 2020 16:48:20 +0000
 +
- primus-vk (1.3-3+rpi1) bullseye-staging; urgency=medium
+ primus-vk (1.4-1) unstable; urgency=medium
  
-   * Disable libnv-vulkan-wrapper1 package, we don't have any nvidia stuff in raspbian.
+   [ Felix Dörre ]
+   * Upstream fixes which ensure compatibility with 440-nvidia-driver
  
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 01 Dec 2019 03:06:16 +0000
+  -- Luca Boccassi <bluca@debian.org>  Mon, 10 Feb 2020 18:26:45 +0000
  
  primus-vk (1.3-3) unstable; urgency=medium
  
diff --cc debian/control
Simple merge