Merge version 5.212.0~alpha2-7+rpi1 and 5.212.0~alpha2-9 to produce 5.212.0~alpha2... archive/raspbian/5.212.0_alpha2-9+rpi1 raspbian/5.212.0_alpha2-9+rpi1
authorRaspbian forward pporter <root@raspbian.org>
Tue, 17 Apr 2018 03:45:32 +0000 (04:45 +0100)
committerRaspbian forward pporter <root@raspbian.org>
Tue, 17 Apr 2018 03:45:32 +0000 (04:45 +0100)
1  2 
debian/changelog
debian/libqt5webkit5.symbols
debian/patches/series

index 9ad9f768b7019b44449e062d4e680fb8a5645030,74a0c4acee2f2e42e7fb23606e62d414c1449fd2..2c6899014bb0a46b296c1bb8456db9f1011a5b20
@@@ -1,13 -1,19 +1,30 @@@
- qtwebkit-opensource-src (5.212.0~alpha2-7+rpi1) buster-staging; urgency=medium
++qtwebkit-opensource-src (5.212.0~alpha2-9+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 5.212.0~alpha2-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 09 Dec 2017 00:03:30 +0000]
 +  * Update symbols file for raspbian.
 +  * Fix clean target.
 +  [changes introduced in 5.212.0~alpha2-6+rpi1] by Peter Michael Green
 +  * Try unsuccessfully to hack offlineasm to prevent generation of movw/movt
 +  * Disable JIT
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 24 Jan 2018 08:28:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Apr 2018 03:45:32 +0000
++
+ qtwebkit-opensource-src (5.212.0~alpha2-9) unstable; urgency=medium
+   * Release to unstable.
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Sat, 07 Apr 2018 17:23:09 -0300
+ qtwebkit-opensource-src (5.212.0~alpha2-8) experimental; urgency=medium
+   * Build with system WOFF2 library, add a patch for that.
+   * Build against Qt 5.10.1 in experimental.
+   * Add support for the nodoc build profile.
+   * Update Vcs fields for migration to salsa.debian.org.
+   * Add a patch to fix include path in pkg-config files (closes: #890413).
+   * Update debian/libqt5webkit5.symbols from the current build log.
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 24 Feb 2018 15:21:11 +0300
  
  qtwebkit-opensource-src (5.212.0~alpha2-7) unstable; urgency=medium
  
Simple merge
index 3344cebb6fc375346dd973a6f8d085a671e3b4fa,89c1542b529bcbb8113d2aa0720ba00e2f516825..906df57c414aa4498e4d0b3cf2fac911c9370377
@@@ -7,5 -7,5 +7,7 @@@ fix_ftbfs_x32.dif
  path_max.diff
  fix_ftbfs_alpha.diff
  pkgconfig_description.diff
+ use_system_woff2.diff
+ pkgconfig_includedir.diff
 +hack-offlineasm-to-prevent-generation-of.patch
 +make-further-unsuccesful-changes-to-offl.patch