Merge version 2.14.2-1+rpi1 and 2.14.3-1 to produce 2.14.3-1+rpi1 archive/raspbian/2.14.3-1+rpi1 raspbian/2.14.3-1+rpi1
authorRaspbian forward pporter <root@raspbian.org>
Tue, 31 Jan 2017 04:41:49 +0000 (04:41 +0000)
committerRaspbian forward pporter <root@raspbian.org>
Tue, 31 Jan 2017 04:41:49 +0000 (04:41 +0000)
1  2 
debian/changelog
debian/rules

index e32b9c9bca1201d070b6cd9c7b1d1d7ac9fff875,d9013e95640909c0f4c140e579323c743e75d5ea..63b4ba0c6be31ba51ae32ac54aba1ee20a309b29
@@@ -1,10 -1,26 +1,34 @@@
- webkit2gtk (2.14.2-1+rpi1) stretch-staging; urgency=medium
++webkit2gtk (2.14.3-1+rpi1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 25 Jan 2015 02:14:50 +0000]
 +  * Disable javascript JIT as it doesn't appear to be armv6 compatible
 +    (at least I assume that is the cause of the assembler errors)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 15 Nov 2016 13:43:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 31 Jan 2017 04:41:40 +0000
++
+ webkit2gtk (2.14.3-1) unstable; urgency=high
+   * New upstream release.
+     + The WebKitGTK+ security advisory WSA-2017-0001 published along with
+       this release lists the following security fixes in the latest
+       versions of WebKitGTK+:
+       - CVE-2016-4743, CVE-2016-7587, CVE-2016-7598 (fixed in 2.14.0).
+       - CVE-2016-4692, CVE-2016-7610 (fixed in 2.14.1).
+       - CVE-2016-7611, CVE-2016-7640, CVE-2016-7642, CVE-2016-7646,
+         CVE-2016-7648, CVE-2016-7649 (fixed in 2.14.2)
+       - CVE-2016-7586, CVE-2016-7589, CVE-2016-7592, CVE-2016-7599,
+         CVE-2016-7623, CVE-2016-7632, CVE-2016-7635, CVE-2016-7639,
+         CVE-2016-7645, CVE-2016-7641, CVE-2016-7652, CVE-2016-7654,
+         CVE-2016-7656 (fixed in 2.14.3)
+   * Verify GPG signature of the upstream tarball:
+     + debian/upstream/signing-key.asc:
+       - Add key file.
+     + debian/watch:
+       - Add pgpsigurlmangle option.
+   * debian/rules:
+     + Use the NEWS file as the upstream changelog.
+  -- Alberto Garcia <berto@igalia.com>  Wed, 18 Jan 2017 11:28:41 +0200
  
  webkit2gtk (2.14.2-1) unstable; urgency=medium
  
diff --cc debian/rules
Simple merge