From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 23 Jul 2020 20:44:50 +0000 (+0100)
Subject: Merge version 104+rpi1 and 105 to produce 105+rpi1
X-Git-Tag: archive/raspbian/105+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3b2da9ad2de2b98841003956eb5b2c3c6b05daf1;p=partman-ext3.git

Merge version 104+rpi1 and 105 to produce 105+rpi1
---

3b2da9ad2de2b98841003956eb5b2c3c6b05daf1
diff --cc debian/changelog
index 2018648,e7316ab..9171202
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- partman-ext3 (104+rpi1) bullseye-staging; urgency=medium
++partman-ext3 (105+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 82+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 23 Mar 2014 13:52:02 +0000]
 +  * Remove ext4-modules dependency as raspbian kernels have it built-in.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Nov 2019 07:19:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 23 Jul 2020 20:44:50 +0000
++
+ partman-ext3 (105) unstable; urgency=medium
+ 
+   * Team upload
+ 
+   [ Holger Wansing ]
+   * Fix missing package name in 'Project-Id-Version' header of template.pot
+     file, to allow correct declaration in po|pot files.
+ 
+   [ Samuel Thibault ]
+   * init.d/kernelmodules_ext3: Don't try to read /proc/modules on non-Linux.
+ 
+  -- Holger Wansing <hwansing@mailbox.org>  Wed, 15 Jul 2020 23:38:11 +0200
  
  partman-ext3 (104) unstable; urgency=medium