From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 23 Jun 2019 14:51:55 +0000 (+0100)
Subject: Merge version 146+rpi1 and 148 to produce 148+rpi1
X-Git-Tag: archive/raspbian/148+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=df8140308cf01a536dba11451e3c595d73399b97;p=partman-basicfilesystems.git

Merge version 146+rpi1 and 148 to produce 148+rpi1
---

df8140308cf01a536dba11451e3c595d73399b97
diff --cc debian/changelog
index c5a8144,75fe33e..a003b94
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,28 +1,36 @@@
- partman-basicfilesystems (146+rpi1) buster-staging; urgency=medium
++partman-basicfilesystems (148+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 97+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 31 Jul 2014 21:59:02 +0000]
 +  * Remove fat-modules and ext2-modules dependencies as Raspbian
 +    kernels have the support built in.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 04 Apr 2019 04:08:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 23 Jun 2019 14:51:55 +0000
++
+ partman-basicfilesystems (148) unstable; urgency=medium
+ 
+   * Team upload
+ 
+   [ Cyril Brulebois ]
+   * Remove Christian Perrier from Uploaders, with many thanks for all
+     his contributions over the years! (Closes: #927487)
+ 
+   [ Updated translations ]
+   * Hebrew (he.po) by Yaron Shahrabani
+ 
+  -- Holger Wansing <hwansing@mailbox.org>  Sun, 21 Apr 2019 22:51:26 +0200
+ 
+ partman-basicfilesystems (147) unstable; urgency=medium
+ 
+   * Team upload
+ 
+   [ Updated translations ]
+   * Arabic (ar.po) by Yaron Shahrabani
+   * Hebrew (he.po) by Yaron Shahrabani
+ 
+  -- Holger Wansing <hwansing@mailbox.org>  Tue, 16 Apr 2019 23:26:01 +0200
  
  partman-basicfilesystems (146) unstable; urgency=medium
+ 
    * Team upload
  
    [ Updated translations ]