[neon/neon-packaging/kgeotag/Neon/release] debian: manually sync to ubuntu packaging
Jonathan Riddell
null at kde.org
Wed Sep 4 12:14:26 BST 2024
Git commit 405b4ac27fc8e09fc50a5b09212c83a734906988 by Jonathan Riddell.
Committed on 04/09/2024 at 11:14.
Pushed by jriddell into branch 'Neon/release'.
manually sync to ubuntu packaging
M +50 -15 debian/changelog
M +32 -18 debian/control
M +201 -6 debian/copyright
M +10 -2 debian/rules
https://invent.kde.org/neon/neon-packaging/kgeotag/-/commit/405b4ac27fc8e09fc50a5b09212c83a734906988
diff --git a/debian/changelog b/debian/changelog
index 53815aa..a0cf3fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,29 +1,64 @@
-kgeotag (1.5.0-0neon) jammy; urgency=medium
+kgeotag (1.5.0-1ubuntu4) oracular; urgency=medium
- * New release
+ * Properly address the apparmor profile issue by adding multiple
+ lines for the different architectures we want to support until
+ @multiarch is supported. This closes (LP: #2064492)
- -- Neon CI <neon at kde.org> Wed, 03 Jan 2024 01:36:05 +0000
+ -- Scarlett Moore <sgmoore at debian.org> Fri, 12 Jul 2024 04:32:38 -0700
-kgeotag (1.4.0-0neon) jammy; urgency=medium
+kgeotag (1.5.0-1ubuntu3) noble; urgency=medium
- * New release
+ * No-change rebuild for CVE-2024-3094
- -- Neon CI <neon at kde.org> Mon, 30 Jan 2023 01:35:24 +0000
+ -- William Grant <wgrant at ubuntu.com> Mon, 01 Apr 2024 17:04:51 +1100
-kgeotag (1.3.1-0neon) focal; urgency=medium
+kgeotag (1.5.0-1ubuntu2) noble; urgency=medium
- * New release
+ * No-change rebuild against libqt5core5t64
- -- Neon CI <neon at kde.org> Sat, 13 Nov 2021 01:35:18 +0000
+ -- Steve Langasek <steve.langasek at ubuntu.com> Fri, 15 Mar 2024 04:57:14 +0000
-kgeotag (1.1.0-0neon) focal; urgency=medium
+kgeotag (1.5.0-1ubuntu1) noble; urgency=medium
- * New release
+ * Add apparmor profile to fix userns. Ref: (LP: #2046844)
- -- Neon CI <neon at kde.org> Sun, 17 Oct 2021 01:35:04 +0000
+ -- Scarlett Moore <sgmoore at debian.org> Thu, 15 Feb 2024 00:06:50 -0700
-kgeotag (1.0.0-0neon) focal; urgency=medium
+kgeotag (1.5.0-1) unstable; urgency=medium
- * New release
+ * Team upload.
+ * New upstream release.
+ * Minor comment updates in lintian overrides.
+ * Update copyright.
- -- Neon CI <neon at kde.org> Tue, 20 Oct 2020 13:05:34 +0000
+ -- Pino Toscano <pino at debian.org> Wed, 03 Jan 2024 11:04:49 +0100
+
+kgeotag (1.4.0-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+ * Update the build dependencies according to the upstream build system:
+ - bump Qt packages to 5.12.0
+ - bump KF packages to 5.68.0
+ - drop version requirement for libmarble-dev
+ - explicitly add gettext
+ * Small updates to copyright.
+
+ -- Pino Toscano <pino at debian.org> Sun, 29 Jan 2023 10:00:30 +0100
+
+kgeotag (1.3.1-2) unstable; urgency=medium
+
+ * Team upload.
+ * Drop the qtwebengine5-dev build dependency, not used directly.
+ * Update standards version to 4.6.2, no changes needed.
+ * Rename debian/lintian-overrides to debian/kgeotag.lintian-overrides,
+ to make it clearer to which package it refers to.
+
+ -- Pino Toscano <pino at debian.org> Wed, 25 Jan 2023 20:54:36 +0100
+
+kgeotag (1.3.1-1) unstable; urgency=medium
+
+ [ Matthias Geiger ]
+ * Initial release. (Closes: #1008238)
+
+ -- Aurélien COUDERC <coucouf at debian.org> Tue, 20 Dec 2022 15:08:15 +0100
diff --git a/debian/control b/debian/control
index d7624bf..485e392 100644
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,39 @@
Source: kgeotag
Section: kde
Priority: optional
-Maintainer: Jonathan Riddell <jr at jriddell.org>
-Build-Depends: cmake,
- debhelper (>= 12),
- extra-cmake-modules,
- libkf5configwidgets-dev,
- libkf5coreaddons-dev,
- libkf5crash-dev,
- libkf5doctools-dev,
- libkf5i18n-dev,
- libkf5kexiv2-dev,
- libkf5xmlgui-dev,
+Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras at alioth-lists.debian.net>
+Uploaders: Matthias Geiger <matthias.geiger1024 at tutanota.de>
+Build-Depends: debhelper-compat (= 13),
+ dh-sequence-kf5,
+ dh-apparmor,
+ cmake (>= 3.16.0~),
+ extra-cmake-modules (>= 5.68.0~),
+ gettext,
+ libkf5configwidgets-dev (>= 5.68.0~),
+ libkf5coreaddons-dev (>= 5.68.0~),
+ libkf5crash-dev (>= 5.68.0~),
+ libkf5doctools-dev (>= 5.68.0~),
+ libkf5i18n-dev (>= 5.68.0~),
+ libkf5kexiv2-dev (>= 5.0.0~),
+ libkf5xmlgui-dev (>= 5.68.0~),
libmarble-dev,
- pkg-kde-tools,
- qtbase5-dev,
- qtwebengine5-dev
-Standards-Version: 4.1.4
+ qtbase5-dev (>= 5.12.0~),
+Standards-Version: 4.6.2
+Homepage: https://kgeotag.kde.org
+Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kgeotag
+Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kgeotag
+Rules-Requires-Root: no
Package: kgeotag
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: photo geotagging program
- Add geotags to your photos.
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: apparmor
+Description: Photo geotagging program
+ Images can be associated with geographic coordinates (geotagging) by different
+ means: On the one hand, a matching with GPX encoded geodata can be done, on
+ the other hand, the coordinates can be set manually, either via drag and drop
+ onto a map, via bookmarks or by manually supplying them.
+ .
+ The coordinates can be stored in the images' Exif header and/or in XMP sidecar
+ files.
diff --git a/debian/copyright b/debian/copyright
index d33ef60..ec53577 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,206 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: kgeotag
-Source: https://invent.kde.org/network/kgeotag
+Upstream-Name: KGeotag
+Upstream-Contact: Tobias Leupold <tl at stonemx.de>
+Source: https://invent.kde.org/graphics/kgeotag
Files: *
-Copyright: 2020 Tobias Leupold <tobias.leupold at gmx.de>
-License: GPL-3.0-or-later OR LicenseRef-KDE-Accepted-GPL
+Copyright: 2020-2024 Tobias Leupold <tl at stonemx.de>
+License: GPL-3 OR LicenseRef-KDE-Accepted-GPL
+Files: timezones/compile_timezones_data.py
+Copyright: 2021-2023 Isaac Wismer <isaac at iwismer.ca>
+License: GPL-3 OR LicenseRef-KDE-Accepted-GPL
+
+Files: cmake/GitDescription.cmake
+ cmake/UpdateVersion.cmake
+Copyright: 2012-2020, Johannes Zarl-Zierl <johannes at zarl-zierl.at>
+ 2020-2022, Tobias Leupold <tl at stonemx.de>
+License: BSD-3-Clause
+
+Files: CMakeLists.txt
+Copyright: 2020-2024, Tobias Leupold <tl at stonemx.de>
+License: BSD-3-Clause
+
+Files: .git*
+ .kde-ci.yml
+ Messages.sh
+ kgeotag.qrc
+ kgeotagui.rc
+ org.kde.kgeotag.appdata.xml
+ org.kde.kgeotag.desktop
+ snapcraft.yaml
+Copyright: none
+License: CC0-1.0
+
+Files: CHANGELOG.rst
+ README.md
+ doc/index.docbook
+ doc/overview.docbook
+ icons/*
+Copyright: 2020-2024, Tobias Leupold<tl at stonemx.de>
+License: CC-BY-SA-4.0
+
+Files: po/ca/kgeotag.po
+ po/ca at valencia/kgeotag.po
+ po/uk/kgeotag.po
+Copyright: 2020-2021, This_file_is_part_of_KDE
+License: LGPL-2.1+3+KDEeV
+
+Files: timezones/timezones.json
+ timezones/timezones.png
+Copyright: 2021-2023, Isaac Wismer <isaac at iwismer.ca>
+License: ODbL-1.0
+
Files: debian/*
-Copyright: 2020 Jonathan Riddell <jr at jriddell.org>
-License: GPL-3.0-or-later OR LicenseRef-KDE-Accepted-GPL
+Copyright: 2022, Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+ 2022, Matthias Geiger <matthias.geiger1024 at tutanota.de>
+License: GPL-3+ OR LicenseRef-KDE-Accepted-GPL
+
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ kare met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ 3. Neither the name of the copyright holder nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+License: CC0-1.0
+ On Debian systems, the complete text of the CC0 Public Domain
+ Dedication can be found in `/usr/share/common-licenses/CC0-1.0’.
+
+License: CC-BY-SA-4.0
+ Attribution-ShareAlike 4.0 International
+ .
+ =======================================================================
+ .
+ Creative Commons Corporation ("Creative Commons") is not a law firm and
+ does not provide legal services or legal advice. Distribution of
+ Creative Commons public licenses does not create a lawyer-client or
+ other relationship. Creative Commons makes its licenses and related
+ information available on an "as-is" basis. Creative Commons gives no
+ warranties regarding its licenses, any material licensed under their
+ terms and conditions, or any related information. Creative Commons
+ disclaims all liability for damages resulting from their use to the
+ fullest extent possible.
+ .
+ Using Creative Commons Public Licenses
+ .
+ Creative Commons public licenses provide a standard set of terms and
+ conditions that creators and other rights holders may use to share
+ original works of authorship and other material subject to copyright
+ and certain other rights specified in the public license below. The
+ following considerations are for informational purposes only, are not
+ exhaustive, and do not form part of our licenses.
+ .
+ Considerations for licensors: Our public licenses are
+ intended for use by those authorized to give the public
+ permission to use material in ways otherwise restricted by
+ copyright and certain other rights. Our licenses are
+ irrevocable. Licensors should read and understand the terms
+ and conditions of the license they choose before applying it.
+ Licensors should also secure all rights necessary before
+ applying our licenses so that the public can reuse the
+ material as expected. Licensors should clearly mark any
+ material not subject to the license. This includes other CC-
+ licensed material, or material used under an exception or
+ limitation to copyright. More considerations for licensors:
+ wiki.creativecommons.org/Considerations_for_licensors
+ .
+ Considerations for the public: By using one of our public
+ licenses, a licensor grants the public permission to use the
+ licensed material under specified terms and conditions. If
+ the licensor's permission is not necessary for any reason--for
+ example, because of any applicable exception or limitation to
+ copyright--then that use is not regulated by the license. Our
+ licenses grant only permissions under copyright and certain
+ other rights that a licensor has authority to grant. Use of
+ the licensed material may still be restricted for other
+ reasons, including because others have copyright or other
+ rights in the material. A licensor may make special requests,
+ such as asking that all changes be marked or described.
+ Although not required by our licenses, you are encouraged to
+ respect those requests where reasonable. More considerations
+ for the public:
+ wiki.creativecommons.org/Considerations_for_licensees
+
+License: GPL-3
+ On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: GPL-3+
+ On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: LGPL-2.1+3+KDEeV
+ This file is distributed under the license LGPL version 2.1 or
+ version 3 or later versions approved by the membership of KDE e.V.
+ .
+ The complete text of the GNU Lesser General Public License version 2.1
+ can be found in `/usr/share/common-licenses/LGPL-2.1', likewise,
+ the complete text of the GNU Lesser General Public License version 3
+ can be found in `/usr/share/common-licenses/LGPL-3'.
+
+License: ODbL-1.0
+ Preamble
+ .
+ The Open Database License (ODbL) is a license agreement intended to
+ allow users to freely share, modify, and use this Database while
+ maintaining this same freedom for others. Many databases are
+ covered by copyright, and therefore this document licenses these
+ rights. Some jurisdictions, mainly in the European Union, have
+ specific rights that cover databases, and so the ODbL addresses
+ these rights, too. Finally, the ODbL is also an agreement in
+ contract for users of this Database to act in certain ways in return
+ for accessing this Database.
+ .
+ Databases can contain a wide variety of types of content (images,
+ audiovisual material, and sounds all in the same database, for
+ example), and so the ODbL only governs the rights over the Database,
+ and not the contents of the Database individually. Licensors should
+ use the ODbL together with another license for the contents, if the
+ contents have a single set of rights that uniformly covers all of
+ the contents. If the contents have multiple sets of different
+ rights, Licensors should describe what rights govern what contents
+ together in the individual record or in some other way that
+ clarifies what rights apply.
+ .
+ Sometimes the contents of a database, or the database itself, can be
+ covered by other rights not addressed here (such as private
+ contracts, trade mark over the name, or privacy rights / data
+ protection rights over information in the contents), and so you are
+ advised that you may have to consult other documents or clear other
+ rights before doing activities not covered by this License.
+
+License: LicenseRef-KDE-Accepted-GPL
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3 of
+ the license or (at your option) at any later version that is
+ accepted by the membership of KDE e.V. (or its successor
+ approved by the membership of KDE e.V.), which shall act as a
+ proxy as defined in Section 14 of version 3 of the license.
+ .
+ This program 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.
diff --git a/debian/rules b/debian/rules
index 5c87712..71be7e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,13 @@
#!/usr/bin/make -f
-# -*- makefile -*-
+
+#export DH_VERBOSE = 1
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
- dh $@ --with kf5 --buildsystem kf5
+ dh $@
+
+override_dh_install:
+ mkdir -p debian/kgeotag/etc/apparmor.d
+ cp debian/kgeotag-apparmor debian/kgeotag/etc/apparmor.d/usr.bin.kgeotag
+ dh_apparmor --profile-name=usr.bin.kgeotag -pkgeotag
More information about the Neon-commits
mailing list