[neon/extras/alkimia/Neon/release] debian: sync with ubuntu manually cos salsa not up today

Jonathan Riddell null at kde.org
Tue Sep 3 14:34:01 BST 2024


Git commit 2a71dc993017476d3f80152002b8009c58518447 by Jonathan Riddell.
Committed on 03/09/2024 at 13:33.
Pushed by jriddell into branch 'Neon/release'.

sync with ubuntu manually cos salsa not up today

M  +81   -18   debian/changelog
M  +33   -34   debian/control
M  +18   -28   debian/copyright
M  +1    -1    debian/libalkimia5-dev.install
M  +3    -13   debian/plasma-widget-foreigncurrencies.install
M  +10   -3    debian/rules
M  +1    -1    debian/watch [INFRASTRUCTURE]

https://invent.kde.org/neon/extras/alkimia/-/commit/2a71dc993017476d3f80152002b8009c58518447

diff --git a/debian/changelog b/debian/changelog
index 30db5f6..db1f6e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,38 +1,101 @@
-alkimia (8.1.2-0neon) jammy; urgency=medium
+alkimia (8.1.2-2build2) noble; urgency=medium
 
-  * New release
+  * No-change rebuild for CVE-2024-3094
 
- -- Neon CI <neon at kde.org>  Wed, 06 Sep 2023 17:51:05 +0000
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Sun, 31 Mar 2024 17:36:44 +0000
 
-alkimia (8.1.1-0neon) focal; urgency=medium
+alkimia (8.1.2-2build1) noble; urgency=medium
 
-  * New release
+  * No-change rebuild against libqt5core5t64
 
- -- Neon CI <neon at kde.org>  Thu, 04 Mar 2021 17:51:04 +0000
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Fri, 15 Mar 2024 03:50:36 +0000
 
-alkimia (8.0.4-0neon) focal; urgency=medium
+alkimia (8.1.2-2) unstable; urgency=medium
 
-  * New release
+  * Team upload.
+  * Update symbols file from the logs of buildds.
+  * Drop also the not useful README files in installed data files
+    - ship the README for plasma-widget-foreigncurrencies from the sources,
+      instead of relying on it being installed
+  * Switch the cmake parameter -DCMAKE_DISABLE_FIND_PACKAGE_MPIR=OFF to
+    -DCMAKE_DISABLE_FIND_PACKAGE_MPIR=ON to actually disable the search of MPIR;
+    GMP is wanted instead.
+
+ -- Pino Toscano <pino at debian.org>  Sat, 21 Oct 2023 08:00:21 +0200
+
+alkimia (8.1.2-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * Update standards version to 4.6.2, no changes needed.
+  * Update the upstream GPG signing key.
+  * Update the build dependencies according to the upstream build system:
+    - bump cmake to 3.16.0
+  * Drop LICENSE files after the installation to debian/tmp; this way there is
+    no need for extra steps to avoid them in install files:
+    - simplify debian/plasma-widget-foreigncurrencies.install, shipping the
+      whole directory of the plasmoid
+    - drop debian/not-installed, no more needed
 
- -- Neon CI <neon at kde.org>  Sat, 24 Oct 2020 17:51:04 +0000
+ -- Pino Toscano <pino at debian.org>  Wed, 06 Sep 2023 00:58:50 +0200
 
-alkimia (8.0.3-0neon) bionic; urgency=medium
+alkimia (8.1.1-2) unstable; urgency=medium
 
-  * New release
+  * Release to unstable.
 
- -- Neon CI <neon at kde.org>  Sat, 11 Jan 2020 17:51:05 +0000
+ -- Sandro Knauß <hefee at debian.org>  Mon, 21 Nov 2022 13:38:34 +0100
 
-alkimia (8.0.2-0neon) bionic; urgency=medium
+alkimia (8.1.1-1) experimental; urgency=medium
 
-  * New release
+  [ Sandro Knauß ]
+  * New upstream release (8.1.1).
+  * Remove inactive Uploaders, adding myself as one to avoid leaving the
+    source with no human maintainers.
+  * Update alkimia-bin install file.
+  * Update symbols for 8.1.1.
+  * Remove not needed shlibs:Depdens.
 
- -- Neon CI <neon at kde.org>  Sat, 07 Sep 2019 17:51:08 +0000
+ -- Sandro Knauß <hefee at debian.org>  Thu, 10 Nov 2022 10:10:44 +0100
 
-alkimia (8.0.1-0neon) bionic; urgency=medium
+alkimia (8.1.0-2) experimental; urgency=medium
 
-  * New release
+  [ Sandro Knauß ]
+  * Mark xauth,xvfb only needed for test mode.
+  * Bump Standards-Version to 4.6.1.
+  * Make tests not failing the build, as we have an online test, that
+    may fail.
 
- -- Neon CI <neon at kde.org>  Thu, 25 Apr 2019 17:51:04 +0000
+ -- Sandro Knauß <hefee at debian.org>  Thu, 10 Nov 2022 09:23:55 +0100
+
+alkimia (8.1.0-1) experimental; urgency=medium
+
+  * Team upload.
+
+  [ Daniele E. Domenichelli ]
+  * New upstream release.
+  * Rename libalkimia5-7 to libalkimia5-8 according to the new SONAME.
+  * Update symbols file for libalkimia5-8.
+  * Disable the tests, since they fail when run without X11.
+
+  [ Sandro Knauß ]
+  * Update build-deps and deps with the info from cmake.
+  * Update standards version to 4.6.0, no changes needed.
+  * Update symbols from build for 8.1.0.
+  * Check tarball signatures.
+  * Update homepage field.
+  * Add needed Build-Dependencies to run tests successfully.
+  * Enable hardening.
+  * Add buildinfo options.
+  * Split package to own packages (qml and plasmoid).
+  * Add upstream metadata file.
+  * Add Rules-Requirs-Root.
+
+  [ Debian Janitor ]
+  * Bump debhelper from old 11 to 13.
+  * Set debhelper-compat version in Build-Depends.
+  * Update standards version to 4.5.1, no changes needed.
+
+ -- Sandro Knauß <hefee at debian.org>  Mon, 21 Mar 2022 18:02:48 +0100
 
 alkimia (7.0.2-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 0934f4d..3f86337 100644
--- a/debian/control
+++ b/debian/control
@@ -1,44 +1,52 @@
 Source: alkimia
 Section: libs
 Priority: optional
-Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Mark Purcell <msp at debian.org>
-Build-Depends: cmake,
-               debhelper (>= 11),
-               doxygen,
-               extra-cmake-modules,
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Uploaders: Sandro Knauß <hefee at debian.org>
+Build-Depends: cmake (>= 3.16.0~),
+               debhelper-compat (= 13),
+               extra-cmake-modules (>= 0.0.11~),
                libgmp-dev,
+               libkf5completion-dev,
                libkf5config-dev,
                libkf5coreaddons-dev,
-               libkf5kdelibs4support-dev,
+               libkf5i18n-dev,
+               libkf5iconthemes-dev,
+               libkf5kio-dev,
                libkf5newstuff-dev,
                libkf5package-dev,
                libkf5plasma-dev,
+               libkf5textwidgets-dev,
+               libkf5xmlgui-dev,
                libqt5webkit5-dev,
                pkg-config,
-               pkg-kde-tools,
+               pkg-kde-tools (>= 0.5.0),
                qtbase5-dev,
-               xauth,
-               xvfb
-Standards-Version: 4.3.0
-Homepage: http://kde-apps.org/content/show.php?content=137323
+               qtdeclarative5-dev,
+               xauth <!nocheck>,
+               xvfb <!nocheck>
+Standards-Version: 4.6.2
+Homepage: https://invent.kde.org/office/alkimia
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/alkimia
 Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/alkimia.git
+Rules-Requires-Root: no
 
 Package: alkimia-bin
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Financial library common classes for KDE
+Description: Financial library - binaries
  Libalkimia is a library with common classes and functionality used by
  finance applications for KDE. Currently it supports a common
  class to represent monetary values with arbitrary precision.
  .
- Support files for the library.
+ Commandline binaries for the library.
 
 Package: alkimia-data
 Architecture: all
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Financial library common classes for KDE
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: Financial library - data files
  Libalkimia is a library with common classes and functionality used by
  finance applications for KDE. Currently it supports a common
  class to represent monetary values with arbitrary precision.
@@ -47,8 +55,9 @@ Description: Financial library common classes for KDE
 
 Package: libalkimia5-8
 Architecture: any
+Multi-Arch: same
 Depends: alkimia-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Recommends: alkimia-bin (= ${source:Version})
+Recommends: alkimia-bin
 Description: Financial library common classes for KDE
  Libalkimia is a library with common classes and functionality used by
  finance applications for KDE. Currently it supports a common
@@ -62,25 +71,22 @@ Depends: libalkimia5-8 (= ${binary:Version}),
          libgmp-dev,
          qtbase5-dev,
          ${misc:Depends}
-Breaks: libalkimia-dev (<< 8.0.2)
-Replaces: libalkimia-dev (<< 8.0.2)
 Description: Financial library - Development files
  Libalkimia is a library with common classes and functionality used by
- finance applications for the KDE SC. Currently it supports a common
+ finance applications for KDE. Currently it supports a common
  class to represent monetary values with arbitrary precision.
  .
  This package contains development files needed for Libalkimia.
 
 Package: plasma-widget-foreigncurrencies
-Architecture: any
-Depends: libalkimia5-8 (= ${binary:Version}),
-         plasma-desktop,
-         qml-module-org-kde-alkimia,
+Architecture: all
+Multi-Arch: foreign
+Depends: plasma-desktop,
+         qml-module-org-kde-alkimia (>= ${source:Version}),
          qml-module-qtquick-controls,
          qml-module-qtquick-dialogs,
          qml-module-qtquick-layouts,
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Description: Financial library - Currency Plasmoid
  Libalkimia is a library with common classes and functionality used by
  finance applications for KDE. Currently it supports a common
@@ -90,6 +96,7 @@ Description: Financial library - Currency Plasmoid
 
 Package: qml-module-org-kde-alkimia
 Architecture: any
+Multi-Arch: same
 Depends: libalkimia5-8 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -99,11 +106,3 @@ Description: Financial library - QML Module
  class to represent monetary values with arbitrary precision.
  .
  This package contains the files for using Alkimia with QML.
-
-Package: libalkimia-dev
-Depends: libalkimia5-dev, ${misc:Depends}
-Architecture: all
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package. It can safely be removed.
diff --git a/debian/copyright b/debian/copyright
index 7bdcc4e..ff88776 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,23 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: alkimia
 
 Files: *
-       debian/*
-Copyright: 2011, Alvaro Soliverez asoliverez at kde.org
-           2017, Scarlett Clark sgclark at kde.org
-License: LGPL-2.1 or LGPL-3
-
-Files: autotests/alkvaluetest.cpp
-  autotests/alkvaluetest.h
-Copyright: 2010, Thomas Baumgart ipwizard at users.sourceforge.net
-License: LGPL-2.1 or LGPL-3
-
-Files: src/alkvalue.cpp
-  src/alkvalue.h
-Copyright: 2010, Thomas Baumgart ipwizard at users.sourceforge.net
-License: LGPL-2.1 or LGPL-3
-
-License: LGPL-2.1
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by the
- Free Software Foundation; version 2.1 of the License.
+Copyright: 2010, Thomas Baumgart <ipwizard at users.sourceforge.net>
+           2011, Alvaro Soliverez <asoliverez at kde.org>
+License: LGPL-2.1+
+ libalkimia is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License
+ as published by the Free Software Foundation; either version 2.1 of
+ the License or (at your option) version 3 or any later version.
  .
- On Debian systems, the complete text of version 2.1 of the GNU Lesser
- General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
-License: LGPL-3
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by the
- Free Software Foundation; version 3 of the License.
+ libalkimia is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>
  .
- On Debian systems, the complete text of version 3 of the GNU Lesser
- General Public License can be found in `/usr/share/common-licenses/LGPL-3'.
+ On Debian systems, the full texts of the GNU Lesser General Public Licenses
+ version 2.1 and version 3 can be found in the files
+ `/usr/share/common-licenses/LGPL-2.1' and `/usr/share/common-licenses/LGPL-3'.
diff --git a/debian/libalkimia5-dev.install b/debian/libalkimia5-dev.install
index 36c0dea..73cd33d 100644
--- a/debian/libalkimia5-dev.install
+++ b/debian/libalkimia5-dev.install
@@ -1,4 +1,4 @@
 usr/include/alkimia/*
-usr/lib/*/cmake
+usr/lib/*/cmake/LibAlkimia5-*/*
 usr/lib/*/libalkimia5.so
 usr/lib/*/pkgconfig/libalkimia5.pc
diff --git a/debian/plasma-widget-foreigncurrencies.install b/debian/plasma-widget-foreigncurrencies.install
index 118f1a3..48800f0 100644
--- a/debian/plasma-widget-foreigncurrencies.install
+++ b/debian/plasma-widget-foreigncurrencies.install
@@ -1,13 +1,3 @@
-#usr/share/kservices5/plasma-applet-org.wincak.foreigncurrencies2.desktop
-#usr/share/metainfo/org.wincak.foreigncurrencies2.appdata.xml
-#usr/share/plasma/plasmoids/org.wincak.foreigncurrencies2/LICENSE
-#usr/share/plasma/plasmoids/org.wincak.foreigncurrencies2/README
-#usr/share/plasma/plasmoids/org.wincak.foreigncurrencies2/contents/config/config.qml
-#usr/share/plasma/plasmoids/org.wincak.foreigncurrencies2/contents/config/main.xml
-#usr/share/plasma/plasmoids/org.wincak.foreigncurrencies2/contents/icons/currency.svg
-#usr/share/plasma/plasmoids/org.wincak.foreigncurrencies2/contents/ui/Currency.qml
-#usr/share/plasma/plasmoids/org.wincak.foreigncurrencies2/contents/ui/Okno.qml
-#usr/share/plasma/plasmoids/org.wincak.foreigncurrencies2/contents/ui/config/ConfigGeneral.qml
-#usr/share/plasma/plasmoids/org.wincak.foreigncurrencies2/contents/ui/main.qml
-#usr/share/plasma/plasmoids/org.wincak.foreigncurrencies2/metadata.desktop
-#usr/share/plasma/plasmoids/org.wincak.foreigncurrencies2/metadata.json
+usr/share/kservices5/plasma-applet-org.wincak.foreigncurrencies2.desktop
+usr/share/metainfo/org.wincak.foreigncurrencies2.appdata.xml
+usr/share/plasma/plasmoids/org.wincak.foreigncurrencies2/
diff --git a/debian/rules b/debian/rules
index 0f21952..827562e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,20 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all buildinfo=+path
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with kf5
+	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_DISABLE_FIND_PACKAGE_MPIR=OFF -DBUILD_APPLETS=OFF
+	dh_auto_configure -- -DCMAKE_DISABLE_FIND_PACKAGE_MPIR=ON
 
 override_dh_auto_test:
-	xvfb-run -a --server-args="-screen 0 1024x768x24+32" dh_auto_test
+	- xvfb-run dh_auto_test --no-parallel
+
+execute_after_dh_auto_install:
+	# delete extra license files
+	find debian/tmp -name LICENSE -print -delete
+	# delete extra README files
+	find debian/tmp -name README -print -delete
diff --git a/debian/watch b/debian/watch
index 7824263..884b3fb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=4
-opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/alkimia/([\d.]+)/alkimia at ANY_VERSION@@ARCHIVE_EXT@
+opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/stable/alkimia/([\d.]+)/alkimia at ANY_VERSION@@ARCHIVE_EXT@


More information about the Neon-commits mailing list