From: Raspbian forward pporter <root@raspbian.org>
Date: Sun, 16 Dec 2018 12:54:40 +0000 (+0000)
Subject: Merge version 1.12.1+dfsg-2+rpi1 and 1.12.2+dfsg-1 to produce 1.12.2+dfsg-1+rpi1
X-Git-Tag: archive/raspbian/1.12.2+dfsg-1+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7a15f7afb3c58cb1f4a31b6d3305114fa4348fca;p=qbs.git

Merge version 1.12.1+dfsg-2+rpi1 and 1.12.2+dfsg-1 to produce 1.12.2+dfsg-1+rpi1
---

7a15f7afb3c58cb1f4a31b6d3305114fa4348fca
diff --cc debian/changelog
index 2009d881,f77ab532..cf6b1ab3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,21 @@@
- qbs (1.12.1+dfsg-2+rpi1) buster-staging; urgency=medium
++qbs (1.12.2+dfsg-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.10.0+dfsg-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 06 Feb 2018 00:27:38 +0000]
 +  * Add symbols file hack for Raspbian.
 +  * Fix clean target.
 +
 +  [changes introduced in 1.12.1+dfsg-2+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
-  -- Peter Michael green <plugwash@raspbian.org>  Mon, 05 Nov 2018 21:05:05 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 16 Dec 2018 12:54:39 +0000
++
+ qbs (1.12.2+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Refresh debian/patches/skip_test_concurrent.diff.
+   * Update symbols files (closes: #916155).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 10 Dec 2018 22:15:09 +0300
  
  qbs (1.12.1+dfsg-2) unstable; urgency=medium