From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 26 Jan 2017 06:59:18 +0000 (+0000)
Subject: Merge version 1.3.2-1+rpi1 and 1.3.2-2 to produce 1.3.2-2+rpi1
X-Git-Tag: archive/raspbian/1.3.2-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=25f33fb5a697b55bb5e63225dcde7d3a7cd93b68;p=htslib.git

Merge version 1.3.2-1+rpi1 and 1.3.2-2 to produce 1.3.2-2+rpi1
---

25f33fb5a697b55bb5e63225dcde7d3a7cd93b68
diff --cc debian/changelog
index e85fc3d,f77e67a..9de7e77
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,10 +1,23 @@@
- htslib (1.3.2-1+rpi1) stretch-staging; urgency=medium
++htslib (1.3.2-2+rpi1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 1.2.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 29 Sep 2015 19:03:00 +0000]
 +  * Fix bus errors in testsuite.
 +  
 +  [changes introduced in 1.2.1-2+rpi1 by Peter Michael Green]
 +  * Cleanup duplicated patching with one version bad that made it impossible to unpack source package
 +    manually.
 +  * Remove single-debian-patch from debian/source/options, it was almost certainly responsible for
 +    the above source package screwup.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 29 Nov 2016 02:43:40 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Jan 2017 06:59:17 +0000
++
+ htslib (1.3.2-2) unstable; urgency=medium
+ 
+   * Add build-essential and @builddeps@ to autopkgtest
+   * debhelper 10
+   * d/watch: version=4
+ 
+  -- Andreas Tille <tille@debian.org>  Sat, 14 Jan 2017 19:23:52 +0100
  
  htslib (1.3.2-1) unstable; urgency=medium