From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 25 Feb 2020 01:14:36 +0000 (+0000)
Subject: Manual merge of version 4:17.08.3-2+rpi1 and 4:19.12.1-2 to produce 4:19.12.1-2+rpi1
X-Git-Tag: archive/raspbian/4%19.12.1-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0ac241808e3b0561ad2f3460ae81d4e54f41c845;p=kalgebra.git

Manual merge of version 4:17.08.3-2+rpi1 and 4:19.12.1-2 to produce 4:19.12.1-2+rpi1
---

0ac241808e3b0561ad2f3460ae81d4e54f41c845
diff --cc debian/changelog
index 4156f22,78ce2e6..ec7b41e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,41 +1,49 @@@
- kalgebra (4:17.08.3-2+rpi1) buster-staging; urgency=medium
++kalgebra (4:19.12.1-2+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 4:17.08.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 16 Dec 2017 12:52:33 +0000]
 +  * Make armhf a non-webengine architecture.
 +  * Fix clean target.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 16 Dec 2017 12:52:33 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 25 Feb 2020 00:47:14 +0000
++
+ kalgebra (4:19.12.1-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Fix FTBFS on architectures without qtwebengine5-dev. (Closes: #950565)
+   * Bump Standards-Version to 4.5.0, no change required.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Mon, 03 Feb 2020 23:09:09 +0100
+ 
+ kalgebra (4:19.12.1-1) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Scarlett Moore ]
+   * Update VCS entries to Salsa.
+ 
+   [ Aurélien COUDERC ]
+   * Change debian/watch to point to new KDE release service URL.
+   * New upstream release (19.12.1) (Closes: #914300).
+   * Update dependencies according to upstream build system:
+     - cmake >= 3.5
+     - add libkf5coreaddons-dev
+   * Bump build dependency to libanalitza-dev to >= 19.12~ required for
+     kalgebra mobile.
+   * Drop patch cmake-dependencies.diff, merged upstream.
+   * debian/control:
+     - Move to debhelper-compat build dependency, bump level to 12
+   * Borrow minimal upstream signing key from k3b.
+   * Bump Standards-Version to 4.4.1:
+     - Add Rules-Requires-Root: no to debian/control
+   * Refresh debian/copyright.
+   * Drop l10n migration rules not needed anymore after 2 stable releases.
+   * Drop dbgsym migration rules not needed anymore after 2 stable releases.
+   * Drop obsolete breaks / replaces.
+   * Fix upstream project URL.
+   * Add build hardening flag hardening=+all.
+   * Switch from dhmk to dh --with kf5.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Sun, 26 Jan 2020 23:03:24 +0100
  
  kalgebra (4:17.08.3-2) unstable; urgency=medium
  
diff --cc debian/control
index 87eb134,3f3766d..34c1955
--- a/debian/control
+++ b/debian/control
@@@ -22,14 -23,15 +23,15 @@@ Build-Depends: cmake (>= 3.5~)
                 pkg-kde-tools (>> 0.15.15),
                 qtbase5-dev (>= 5.4),
                 qtdeclarative5-dev (>= 5.4),
 -               qtwebengine5-dev [amd64 arm64 armhf i386 mipsel],
 +               qtwebengine5-dev [amd64 arm64 i386 mipsel],
- Standards-Version: 4.1.2
- Homepage: http://edu.kde.org/
- Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kalgebra.git
- Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kalgebra.git
+ Standards-Version: 4.5.0
+ Homepage: https://kde.org/applications/education/org.kde.kalgebra
+ Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kalgebra
+ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kalgebra.git
+ Rules-Requires-Root: no
  
  Package: kalgebra
 -Architecture: amd64 arm64 armhf i386 mipsel
 +Architecture: amd64 arm64 i386 mipsel
  Section: math
  Depends: kalgebra-common (= ${binary:Version}),
           ${misc:Depends},
@@@ -43,10 -44,8 +44,8 @@@ Description: algebraic graphing calcula
   This package is part of the KDE education module.
  
  Package: kalgebra-common
 -Architecture: amd64 arm64 armhf i386 mipsel
 +Architecture: amd64 arm64 i386 mipsel
  Section: math
- Breaks: kalgebra (<< 4:4.7.2), ${kde-l10n:all}
- Replaces: kalgebra (<< 4:4.7.2), ${kde-l10n:all}
  Depends: plasma-framework,
           qml-module-org-kde-analitza,
           ${misc:Depends},
diff --cc debian/rules
index bc72c64,e8c99ca..adb305a
--- a/debian/rules
+++ b/debian/rules
@@@ -2,20 -12,12 +12,16 @@@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,-
  
  include /usr/share/dpkg/architecture.mk
  
- l10npkgs_firstversion_ok := 4:16.04.3-8~
 -webengine_archs := amd64 arm64 armhf i386 mipsel
 +webengine_archs := amd64 arm64 i386 mipsel
  
- include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
- include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
+ %:
+ 	dh $@ --with kf5
  
  ifneq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(webengine_archs)))
  override_dh_auto_configure:
- 	$(overridden_command) -- -DMOBILE_BACKEND="none"
+ 	dh_auto_configure --buildsystem=kf5 -- -DMOBILE_BACKEND="none"
  endif
 +
- override_dh_strip:
- 	$(overridden_command) --dbgsym-migration='kalgebra-dbg (<= 4:15.12.1-1~~)'
- 
 +override_dh_auto_clean:
 +	dh_auto_clean
 +	rm -rf debian/kalgebra