From: Raspbian forward pporter <root@raspbian.org>
Date: Sat, 27 Jan 2018 09:06:39 +0000 (+0000)
Subject: Merge version 2.1.18-3+rpi1 and 2.1.18-4 to produce 2.1.18-4+rpi1
X-Git-Tag: raspbian/2.1.18-4+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fa7517ca0e522bfab79744073021051a98b721e7;p=xpa.git

Merge version 2.1.18-3+rpi1 and 2.1.18-4 to produce 2.1.18-4+rpi1
---

4a91b12dfabbdf0d9804afb0f3d382513b7188b1
diff --cc debian/changelog
index f9440af,20160cb..9ccb1f8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,11 +1,18 @@@
- xpa (2.1.18-3+rpi1) buster-staging; urgency=medium
++xpa (2.1.18-4+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 2.1.18-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 19:49:55 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 17 Aug 2017 19:49:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 27 Jan 2018 09:06:38 +0000
++
+ xpa (2.1.18-4) unstable; urgency=medium
+ 
+   * Push Standards-Version to 4.1.3. Change remaining URLs to https
+   * Move package RCS to salsa
+   * Restrict test to "local" (Closes: #886200)
+   * Remove uintptr_t cast
+ 
+  -- Ole Streicher <olebole@debian.org>  Thu, 11 Jan 2018 21:17:38 +0100
  
  xpa (2.1.18-3) unstable; urgency=medium