From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 22 Nov 2020 21:17:39 +0000 (+0000)
Subject: Merge version 2.11.2-11+rpi1 and 3.0-3 to produce 3.0-3+rpi1
X-Git-Tag: archive/raspbian/3.0-3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6d5466e962f85322e4889af989c2329c84829ecc;p=bibletime.git

Merge version 2.11.2-11+rpi1 and 3.0-3 to produce 3.0-3+rpi1
---

6d5466e962f85322e4889af989c2329c84829ecc
diff --cc debian/changelog
index 53dcdec,2c785b7..166c502
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,35 +1,42 @@@
- bibletime (2.11.2-11+rpi1) buster-staging; urgency=medium
++bibletime (3.0-3+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 2.11.2-11+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 18 Nov 2018 15:41:42 +0000]
 +  * Use qtwebkit for raspbian (we don't have qtwebengine).
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 18 Nov 2018 15:41:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 22 Nov 2020 21:17:39 +0000
++
+ bibletime (3.0-3) unstable; urgency=medium
+ 
+   [ Bastian Germann ]
+   * Team upload
+   * Revert "Add two upstream patches"
+   * Add missing qml-module-qtquick2 dependency
+   * Disable lto-partition on mips64el (Closes: #970471)
+ 
+  -- Roberto C. Sánchez <roberto@debian.org>  Sat, 14 Nov 2020 08:36:18 -0500
+ 
+ bibletime (3.0-2) unstable; urgency=medium
+ 
+   * Team upload
+   * Add two upstream patches (Closes: #970471)
+ 
+  -- Bastian Germann <bastiangermann@fishpost.de>  Sun, 20 Sep 2020 19:50:43 +0200
+ 
+ bibletime (3.0-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream version 3.0
+   * Prevent building PDF
+   * Build and install the HTML documentation
+   * d/control: Remove an unused variable
+   * d/control: Bump debhelper compat level to 13
+   * d/copyright: Add missing info
+   * Remove leftover patches
+   * Update Standards-Version to 4.5.0
+   * Add Rules-Requires-Root
+   * Patch: Install qml file to datadir
+ 
+  -- Bastian Germann <bastiangermann@fishpost.de>  Thu, 20 Aug 2020 10:15:39 +0200
  
  bibletime (2.11.2-11) unstable; urgency=medium
  
diff --cc debian/control
index 8340d19,2f9cf17..2167ab8
--- a/debian/control
+++ b/debian/control
@@@ -7,12 -7,16 +7,16 @@@ Build-Depends: quilt (>= 0.46-7~)
      cmake,
      pkg-config,
      libcurl4-gnutls-dev,
+     docbook-xml,
+     docbook-xsl,
      git,
+     po4a,
      qtbase5-dev,
      qttools5-dev,
 -    qtwebengine5-dev [amd64 arm64 armhf i386 mipsel],
 -    libqt5webkit5-dev [alpha armel hppa hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mips64el powerpc powerpcspe ppc64 ppc64el riscv64 sh4 sparc64 s390x x32],
 +    qtwebengine5-dev [amd64 arm64 i386 mipsel],
 +    libqt5webkit5-dev [alpha armel armhf hppa hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mips64el powerpc powerpcspe ppc64 ppc64el riscv64 sh4 sparc64 s390x x32],
-     libqt5svg5-dev
+     libqt5svg5-dev,
+     xsltproc
  Priority: optional
  Maintainer: CrossWire Packaging Team <pkg-crosswire-devel@alioth-lists.debian.net>
  Uploaders: Daniel Glassey <wdg@debian.org>,