[neon/extras/calamares/Neon/release-lts] debian: Merge tag 'debian/3.2.35.1-1' into Neon/release-lts

Harald Sitter null at kde.org
Fri Feb 12 13:33:22 GMT 2021


Git commit c31ca2dc6fbf33773d4e955faa05be7c640f9e93 by Harald Sitter.
Committed on 12/02/2021 at 10:30.
Pushed by sitter into branch 'Neon/release-lts'.

Merge tag 'debian/3.2.35.1-1' into Neon/release-lts

M  +206  -114  debian/changelog
M  +8    -7    debian/control
M  +3    -0    debian/rules

https://invent.kde.org/neon/extras/calamares/commit/c31ca2dc6fbf33773d4e955faa05be7c640f9e93

diff --cc debian/changelog
index 6c7f7bb,dd9ce6c..02dcdf1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,232 -1,318 +1,324 @@@
 +calamares (3.2.36-0neon) focal; urgency=medium
 +
 +  * New release
 +
 + -- Harald Sitter <sitter at kde.org>  Fri, 12 Feb 2021 11:01:01 +0100
 +
- calamares (3.2.35.1-0neon) focal; urgency=medium
+ calamares (3.2.35.1-1) unstable; urgency=medium
  
-   * New release
+   * New upstream release
  
-  -- Harald Sitter <sitter at kde.org>  Tue, 15 Dec 2020 11:27:14 +0100
+  -- Jonathan Carter <jcc at debian.org>  Tue, 08 Dec 2020 16:22:17 +0200
  
- calamares (3.2.34-0neon) focal; urgency=medium
+ calamares (3.2.33-1) unstable; urgency=medium
  
-   * New release
+   * New upstream release
  
-  -- Harald Sitter <sitter at kde.org>  Wed, 18 Nov 2020 14:28:04 +0100
+  -- Jonathan Carter <jcc at debian.org>  Tue, 10 Nov 2020 13:59:04 +0200
  
- calamares (3.2.33-0neon) focal; urgency=medium
+ calamares (3.2.32.1-3) unstable; urgency=medium
  
-   [ Jonathan Riddell ]
-   * New release
+   * No changes version bump
  
-   [ Harald Sitter ]
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Wed, 21 Oct 2020 09:28:26 +0200
  
-  -- Harald Sitter <sitter at kde.org>  Thu, 12 Nov 2020 12:32:51 +0100
+ calamares (3.2.32.1-2) unstable; urgency=medium
  
- calamares (3.2.30-0neon) focal; urgency=medium
+   * Small changes upload for kpmcore ABI bump (to version 10)
+   * Replace DEB_BUILD_OPTIONS with DEB_BUILD_MAINT_OPTIONS in
+     debian/rules
+   * Use secure copyright format URI
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Sun, 18 Oct 2020 18:31:41 +0200
  
-  -- Neon CI <neon at kde.org>  Thu, 03 Sep 2020 23:39:09 +0000
+ calamares (3.2.32.1-1) unstable; urgency=medium
  
- calamares (3.2.29-0neon) bionic; urgency=medium
+   * New upstream release
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Sat, 17 Oct 2020 17:55:22 +0200
  
-  -- Neon CI <neon at kde.org>  Thu, 20 Aug 2020 23:39:04 +0000
+ calamares (3.2.32-1) unstable; urgency=medium
  
- calamares (3.2.28.3-0neon) bionic; urgency=medium
+   * New upstream release
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Fri, 16 Oct 2020 17:56:48 +0200
  
-  -- Neon CI <neon at kde.org>  Tue, 18 Aug 2020 23:39:04 +0000
+ calamares (3.2.31-2) unstable; urgency=medium
  
- calamares (3.2.28.2-0neon) bionic; urgency=medium
+   * New upstream release
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Wed, 07 Oct 2020 19:26:25 +0200
  
-  -- Neon CI <neon at kde.org>  Wed, 12 Aug 2020 15:29:04 +0000
+ calamares (3.2.30-1) unstable; urgency=medium
  
- calamares (3.2.28.1-0neon) bionic; urgency=medium
+   * New upstream release
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Mon, 07 Sep 2020 22:25:17 +0200
  
-  -- Neon CI <neon at kde.org>  Mon, 10 Aug 2020 23:39:04 +0000
+ calamares (3.2.28.3-2) unstable; urgency=medium
  
- calamares (3.2.28-0neon) bionic; urgency=medium
+   * New upstream release
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Wed, 19 Aug 2020 14:13:37 +0200
  
-  -- Neon CI <neon at kde.org>  Sun, 09 Aug 2020 23:39:05 +0000
+ calamares (3.2.28.2-1) unstable; urgency=medium
  
- calamares (3.2.27-0neon) bionic; urgency=medium
+   * New upstream release
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Fri, 14 Aug 2020 11:09:21 +0200
  
-  -- Neon CI <neon at kde.org>  Sat, 11 Jul 2020 16:06:03 +0000
+ calamares (3.2.28.1-1) unstable; urgency=medium
  
- calamares (3.2.26.1-0neon) bionic; urgency=medium
+   * New upstream release
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Tue, 11 Aug 2020 11:48:45 +0200
  
-  -- Neon CI <neon at kde.org>  Tue, 23 Jun 2020 23:39:05 +0000
+ calamares (3.2.27-1) unstable; urgency=medium
  
- calamares (3.2.26-0neon) bionic; urgency=medium
+   * New upstream release
+   * Remove lintian false-positive spelling warning
+     (no longer needed)
+   * debian/rules:
+     - Export buildinfo path to make .buildinfo files reproducible
+   * Remove files no longer shipped from debian/copyright
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Wed, 15 Jul 2020 11:43:33 +0200
  
-  -- Neon CI <neon at kde.org>  Thu, 18 Jun 2020 23:39:05 +0000
+ calamares (3.2.26.1-1) unstable; urgency=medium
  
- calamares (3.2.25-0neon) bionic; urgency=medium
+   * New upstream release
+   * debian/lintian-overrides:
+     - Fix spelling mistake
+     - Replace spelling false-positive with a new one
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Tue, 30 Jun 2020 19:59:54 +0200
  
-  -- Neon CI <neon at kde.org>  Sat, 06 Jun 2020 23:39:06 +0000
+ calamares (3.2.26-1) unstable; urgency=medium
  
- calamares (3.2.24-0neon) bionic; urgency=medium
+   * New upstream release
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Sun, 21 Jun 2020 14:29:12 +0200
  
-  -- Neon CI <neon at kde.org>  Mon, 11 May 2020 23:39:05 +0000
+ calamares (3.2.24-1) unstable; urgency=medium
  
- calamares (3.2.23-0neon) bionic; urgency=medium
+   * New upstream release
+   * Upgrade to debhelper-compat (= 13)
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Sat, 16 May 2020 11:16:17 +0200
  
-  -- Neon CI <neon at kde.org>  Fri, 17 Apr 2020 23:39:05 +0000
+ calamares (3.2.23-1) unstable; urgency=medium
  
- calamares (3.2.22-0neon) bionic; urgency=medium
+   * New upstream release
+   * Add lintian override for spelling mistake false-positive
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Fri, 17 Apr 2020 14:04:57 +0200
  
-  -- Neon CI <neon at kde.org>  Wed, 08 Apr 2020 23:39:05 +0000
+ calamares (3.2.22-1) unstable; urgency=medium
  
- calamares (3.2.21-0neon) bionic; urgency=medium
+   * New upstream release
+   * Update copyright file
+   * Remove spelling error lintian override (no longer needed)
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Wed, 08 Apr 2020 17:45:39 +0200
  
-  -- Neon CI <neon at kde.org>  Fri, 27 Mar 2020 23:39:05 +0000
+ calamares (3.2.21-1) unstable; urgency=medium
  
- calamares (3.2.20-0neon) bionic; urgency=medium
+   * New upstream release
+   * Declare Rules-Requires-Root: no
+   * Override lintian spelling error false-positive
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Sat, 28 Mar 2020 13:25:17 +0200
  
-  -- Neon CI <neon at kde.org>  Thu, 27 Feb 2020 23:39:09 +0000
+ calamares (3.2.20-1) unstable; urgency=medium
  
- calamares (3.2.19.1-0neon) bionic; urgency=medium
+   * New upstream release
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Mon, 02 Mar 2020 10:20:06 +0200
  
-  -- Neon CI <neon at kde.org>  Mon, 24 Feb 2020 23:39:06 +0000
+ calamares (3.2.19.1-1) unstable; urgency=medium
  
- calamares (3.2.19-0neon) bionic; urgency=medium
+   * New upstream release
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Tue, 25 Feb 2020 08:47:28 +0200
  
-  -- Neon CI <neon at kde.org>  Fri, 21 Feb 2020 23:39:07 +0000
+ calamares (3.2.19-1) unstable; urgency=medium
  
- calamares (3.2.18-0neon) bionic; urgency=medium
+   * New upstream release
  
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Mon, 24 Feb 2020 11:06:20 +0200
+ 
+ calamares (3.2.18-1) unstable; urgency=medium
  
-  -- Neon CI <neon at kde.org>  Tue, 28 Jan 2020 23:39:05 +0000
+   * New upstream release
+   * Update copyright years
  
- calamares (3.2.17.1-0neon) bionic; urgency=medium
+  -- Jonathan Carter <jcc at debian.org>  Fri, 07 Feb 2020 18:34:53 +0200
  
-   * New release
+ calamares (3.2.17.1-1) unstable; urgency=medium
  
-  -- Neon CI <neon at kde.org>  Tue, 03 Dec 2019 23:39:05 +0000
+   * New upstream release
  
- calamares (3.2.17-0neon) bionic; urgency=medium
+  -- Jonathan Carter <jcc at debian.org>  Tue, 03 Dec 2019 15:22:58 +0200
  
-   * New release
+ calamares (3.2.17-1) unstable; urgency=medium
  
-  -- Neon CI <neon at kde.org>  Thu, 28 Nov 2019 23:39:05 +0000
+   * New upstream release
  
- calamares (3.2.16-0neon) bionic; urgency=medium
+  -- Jonathan Carter <jcc at debian.org>  Mon, 02 Dec 2019 11:19:51 +0200
  
-   * New release
+ calamares (3.2.16-1) unstable; urgency=medium
  
-  -- Neon CI <neon at kde.org>  Fri, 01 Nov 2019 23:39:05 +0000
+   * New upstream release
  
- calamares (3.2.15-0neon) bionic; urgency=medium
+  -- Jonathan Carter <jcc at debian.org>  Tue, 12 Nov 2019 08:00:29 +0000
  
-   * New release
+ calamares (3.2.15-1) unstable; urgency=medium
  
-  -- Neon CI <neon at kde.org>  Fri, 11 Oct 2019 23:39:05 +0000
+   * New upstream release
+   * Update standards version to 4.4.1
  
- calamares (3.2.14-0neon) bionic; urgency=medium
+  -- Jonathan Carter <jcc at debian.org>  Mon, 14 Oct 2019 08:31:17 +0000
  
-   * New release
+ calamares (3.2.14-1) unstable; urgency=medium
  
-  -- Neon CI <neon at kde.org>  Tue, 01 Oct 2019 23:39:16 +0000
+   * New upstream release
+   * Update standards version to 4.5.0
+   * Override lintian false-positive
  
- calamares (3.2.13-0neon) bionic; urgency=medium
+  -- Jonathan Carter <jcc at debian.org>  Tue, 08 Oct 2019 20:33:58 +0200
  
-   * New release
+ calamares (3.2.13-1) unstable; urgency=medium
  
-  -- Neon CI <neon at kde.org>  Fri, 30 Aug 2019 23:39:08 +0000
+   * New upstream release
+   * Add copyright information for appdata file
+   * Remove lintian false positive that no longer applies
  
- calamares (3.2.12-0neon) bionic; urgency=medium
+  -- Jonathan Carter <jcc at debian.org>  Mon, 09 Sep 2019 12:25:55 +0000
  
-   * New release
+ calamares (3.2.12-1) unstable; urgency=medium
  
-  -- Neon CI <neon at kde.org>  Wed, 07 Aug 2019 23:39:06 +0000
+   * New upstream release
+   * Add lintian override for spelling mistake for something that looks like
+     a string, but isn't
+   * Remove lintian override that's no longer needed
  
- calamares (3.2.11-0neon) bionic; urgency=medium
+  -- Jonathan Carter <jcc at debian.org>  Thu, 08 Aug 2019 08:52:16 +0000
  
-   * New release
+ calamares (3.2.11-1) unstable; urgency=medium
  
-  -- Neon CI <neon at kde.org>  Fri, 05 Jul 2019 23:39:06 +0000
+   * New upstream release
+   * Update standards version to 4.4.0
  
- calamares (3.2.10-0neon) bionic; urgency=medium
+  -- Jonathan Carter <jcc at debian.org>  Mon, 08 Jul 2019 09:01:46 +0000
  
-   * New release
+ calamares (3.2.7-1~exp1) experimental; urgency=medium
  
-  -- Neon CI <neon at kde.org>  Fri, 28 Jun 2019 12:24:36 +0000
+   * New upstream release
  
- calamares (3.2.9-0neon) bionic; urgency=medium
+  -- Jonathan Carter <jcc at debian.org>  Mon, 29 Apr 2019 09:26:13 +0000
  
-   * New release
+ calamares (3.2.5-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
  
-  -- Neon CI <neon at kde.org>  Mon, 03 Jun 2019 23:39:06 +0000
+  -- Jonathan Carter <jcc at debian.org>  Wed, 24 Apr 2019 12:19:56 +0200
  
- calamares (3.2.8-0neon) bionic; urgency=medium
+ calamares (3.2.4-4) unstable; urgency=medium
  
-   * New release
+   * Update VCS location
+   * Revert nostrip deb option
  
-  -- Neon CI <neon at kde.org>  Fri, 10 May 2019 23:39:04 +0000
+  -- Jonathan Carter <jcc at debian.org>  Mon, 25 Feb 2019 07:32:20 +0000
  
- calamares (3.2.7-0neon) bionic; urgency=medium
+ calamares (3.2.4-3) unstable; urgency=medium
  
-   * New release
+   * Do not build against pythonqt (avoid buggy dep during freeze)
  
-  -- Neon CI <neon at kde.org>  Sat, 27 Apr 2019 23:39:06 +0000
+  -- Jonathan Carter <jcc at debian.org>  Thu, 21 Feb 2019 08:45:45 +0000
  
- calamares (3.2.6-0neon) bionic; urgency=medium
+ calamares (3.2.4-2) unstable; urgency=medium
  
-   * New release
+   * Add libkf5plasma-dev as build dependency (Closes: #922105)
  
-  -- Neon CI <neon at kde.org>  Thu, 25 Apr 2019 23:39:04 +0000
+  -- Jonathan Carter <jcc at debian.org>  Fri, 15 Feb 2019 08:47:19 +0000
  
- calamares (3.2.5-0neon) bionic; urgency=medium
+ calamares (3.2.4-1) unstable; urgency=medium
  
-   * New release
+   * New upstream release
+   * Update to debhelper-compat (=12)
  
-  -- Neon CI <neon at kde.org>  Mon, 15 Apr 2019 23:42:41 +0000
+  -- Jonathan Carter <jcc at debian.org>  Wed, 13 Feb 2019 07:01:50 +0000
  
- calamares (3.2.4-0neon) bionic; urgency=medium
+ calamares (3.2.3-2) unstable; urgency=medium
  
-   [ Jonathan Carter ]
-   * Fix minor style issue in debian/patches/use-sudo-instead-of-pkexec
+   * Add libpwquality-dev to build-depends
+   * Remove patch to use sudo instead of pkexec
+     (pkexec seems to work fine now on all debian variants)
  
-   [ Neon CI ]
-   * New release
+  -- Jonathan Carter <jcc at debian.org>  Mon, 21 Jan 2019 11:58:37 +0200
+ 
+ calamares (3.2.3-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Update copyright years
+   * Update standards version to 4.3.0
+ 
+  -- Jonathan Carter <jcc at debian.org>  Thu, 10 Jan 2019 09:09:48 +0200
+ 
+ calamares (3.2.2-4) unstable; urgency=medium
+ 
+   * Rebuild for latest pythonqt with Python 3.7
+ 
+  -- Jonathan Carter <jcc at debian.org>  Mon, 10 Dec 2018 14:10:22 +0200
+ 
+ calamares (3.2.2-3) unstable; urgency=medium
+ 
+   * Re-add lintian-overrides removed in error
+ 
+  -- Jonathan Carter <jcc at debian.org>  Tue, 27 Nov 2018 09:45:18 +0200
+ 
+ calamares (3.2.2-2) unstable; urgency=medium
+ 
+   * Version bump (no changes)
+ 
+  -- Jonathan Carter <jcc at debian.org>  Thu, 22 Nov 2018 23:07:48 +0200
+ 
+ calamares (3.2.2-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Update standards version to 4.2.1
+   * debian/control: wrap-and-sort
+   * Remove 0002-Add-patch-to-compile-with-pythonQt.patch (fixed upstream)
+   * Remove 0003-remove-wrong-path.patch (no longer needed)
+   * Remove extra-license-file lintian override (no longer needed)
+   * Remove spelling error lintian override (no longer needed)
+ 
+  -- Jonathan Carter <jcc at debian.org>  Mon, 10 Sep 2018 09:12:14 +0200
+ 
+ calamares (3.2.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Update copyright file
+   * Apply patches from Paul Rodrigo Segura to re-enable pythonqt support.
+ 
+  -- Jonathan Carter <jcc at debian.org>  Tue, 26 Jun 2018 14:33:04 +0200
+ 
+ calamares (3.2.0-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Add btrfs-progs to recommends
+   * Update lintian-overrides
+ 
+  -- Jonathan Carter <jcc at debian.org>  Fri, 18 May 2018 10:36:44 +0200
+ 
+ calamares (3.1.13-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Fix minor style issue in debian/patches/use-sudo-instead-of-pkexec
+   * Move VCS to salsa.debian.org service
+   * Update standards version to 4.1.4
  
-  -- Neon CI <neon at kde.org>  Wed, 13 Feb 2019 16:34:10 +0000
+  -- Jonathan Carter <jcc at debian.org>  Tue, 24 Apr 2018 11:26:24 +0200
  
  calamares (3.1.12-1) unstable; urgency=medium
  
diff --cc debian/control
index f040bee,72ba904..e4a12fd
--- a/debian/control
+++ b/debian/control
@@@ -4,10 -4,9 +4,10 @@@ Priority: optiona
  Maintainer: Jonathan Carter <jcc at debian.org>
  Build-Depends: cmake,
                 cryptsetup,
-                debhelper (>= 11),
 -               debhelper-compat (= 13),
++               debhelper-compat (= 12),
                 extra-cmake-modules,
                 gettext,
 +               libappstreamqt-dev,
                 libatasmart-dev,
                 libboost-python-dev,
                 libkf5config-dev,
@@@ -39,22 -37,17 +39,23 @@@
                 qtbase5-dev,
                 qtdeclarative5-dev,
                 qttools5-dev,
 -               qttools5-dev-tools
 +               qttools5-dev-tools,
 +               qtwebengine5-dev
- Standards-Version: 4.1.3
+ Standards-Version: 4.5.0
+ Rules-Requires-Root: no
  Homepage: https://github.com/calamares/calamares
- Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-extras/calamares.git
- Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-extras/calamares.git
+ Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/calamares
+ Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/calamares.git
  
  Package: calamares
- Architecture: any
+ Architecture: linux-any
 -Depends: os-prober, ${misc:Depends}, ${shlibs:Depends}
 -Recommends: btrfs-progs, squashfs-tools
 +Depends: os-prober,
 +         qml-module-qtquick-window2,
 +         qml-module-qtquick2,
 +         rsync,
 +         ${misc:Depends},
 +         ${shlibs:Depends}
- Recommends: grub-efi-amd64-bin, grub-pc, konsole, squashfs-tools
++Recommends: btrfs-progs, grub-efi-amd64-bin, grub-pc, konsole, squashfs-tools
  Description: distribution-independent installer framework
   Calamares is a distribution-independent installer framework.
   .



More information about the Neon-commits mailing list