Upload to Backports.

debian/changelog

@@ -1,41 +1,8 @@
-libqtxdg (3.10.0-0ubuntu6~ppa1) jammy; urgency=medium
+libqtxdg (3.10.0-0ubuntu1~ppa1) jammy; urgency=medium
 
   * Upload to Backports.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 06 Mar 2023 19:22:09 -0600
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 16 Nov 2022 17:56:43 -0600
-
-libqtxdg (3.10.0-0ubuntu6) lunar; urgency=medium
-
-  * Add support for translations defined via X-Ubuntu-Gettext-Domain.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 06 Mar 2023 19:18:26 -0600
-
-libqtxdg (3.10.0-0ubuntu5) lunar; urgency=medium
-
-  * Rebuild against lxqt-build-tools 0.12.0-0ubuntu3.
-  * Bumped Standards-Version to 4.6.2, no changes necessary.
-  * Updated copyright file.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 09 Feb 2023 13:17:41 -0600
-
-libqtxdg (3.10.0-0ubuntu4) lunar; urgency=medium
-
-  * No-change rebuild against Qt 5.15.8.
-
- -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 14 Jan 2023 10:19:42 +0300
-
-libqtxdg (3.10.0-0ubuntu3) lunar; urgency=medium
-
-  * No-change rebuild against Qt 5.15.7.
-
- -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 10 Dec 2022 12:51:12 +0300
-
-libqtxdg (3.10.0-0ubuntu2) lunar; urgency=medium
-
-  * Fixed Build-Depends-Package fields in symbols files.
-  * Overhauled copyright file.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Mon, 28 Nov 2022 11:23:49 -0600
 
 libqtxdg (3.10.0-0ubuntu1) lunar; urgency=medium
 

debian/control

@@ -16,7 +16,7 @@ Build-Depends: cmake,
                qtbase5-private-dev,
                qttools5-dev,
                qttools5-dev-tools
-Standards-Version: 4.6.2
+Standards-Version: 4.6.1
 Rules-Requires-Root: no
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/libqtxdg-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/libqtxdg-packaging.git

debian/copyright

@@ -3,50 +3,75 @@ Upstream-Name: libqtxdg
 Source: https://github.com/lxqt/libqtxdg
 
 Files: *
-Copyright: 2010-2012 Razor team
+Copyright: 2012-2021, LXQt team
-           2012-2022 LXQt team
+           2010-2012, Razor team
 License: LGPL-2.1+
 
-Copyright: 2013 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+Files: src/qtxdg/desktopenvironment_p.cpp
-           2015 Luís Pereira <luis.artur.pereira@gmail.com>
+       src/qtxdg/xdgdesktopfile_p.h
-Files: cmake/compiler_settings.cmake
+       test/qtxdg_test.cpp
-License: BSD-3-Clause
+       src/xdgiconloader/plugin/xdgiconengineplugin.cpp
+       src/xdgiconloader/plugin/xdgiconengineplugin.h
+       test/qtxdg_test.h
+       test/tst_xdgdirs.cpp
+Copyright: 2013-2017, LXQt team
+License: LGPL-2.1+
 
-Copyright: 2014-2020 Luís Pereira <luis.artur.pereira@gmail.com>
+Files: src/qtxdg/xdgmacros.h
-Files: src/qtxdg/qtxdglogging.cpp
-       src/qtxdg/qtxdglogging.h
-       src/qtxdg/xdgdefaultapps.cpp
-       src/qtxdg/xdgdefaultapps.h
-       src/qtxdg/xdgmacros.h
-       src/qtxdg/xdgmimeappsbackendinterface.cpp
-       src/qtxdg/xdgmimeappsbackendinterface.h
-       src/qtxdg/xdgmimeapps.cpp
-       src/qtxdg/xdgmimeappsglibbackend.cpp
-       src/qtxdg/xdgmimeappsglibbackend.h
-       src/qtxdg/xdgmimeapps.h
-       src/qtxdg/xdgmimeapps_p.h
        src/qtxdg/xdgmimetype.cpp
        src/qtxdg/xdgmimetype.h
        test/tst_xdgdesktopfile.cpp
        test/tst_xdgdesktopfile.h
        util/qtxdg-desktop-file-start.cpp
        util/qtxdg-iconfinder.cpp
+Copyright: 2014-2019, Luís Pereira <luis.artur.pereira@gmail.com>
 License: LGPL-2.1+
 
-Copyright: 2014 Digia Plc and/or its subsidiary(-ies)
+Files: cmake/compiler_settings.cmake
-Files: src/xdgiconloader/xdgiconloader.cpp
+Copyright: 2013, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-       src/xdgiconloader/xdgiconloader_p.h
+           2015, Luís Pereira <luis.artur.pereira@gmail.com>
-License: LGPL-2.1-or-3-with-Digia-1.1-exception
+License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2013-2019 Alf Gaida <agaida@siduction.org>
+Copyright: 2013-2019, Alf Gaida <agaida@siduction.org>
-           2015-2022 Andrew Lee (李健秋) <ajqlee@debian.org>
+           2015-2022, Andrew Lee (李健秋) <ajqlee@debian.org>
-           2014-2016 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
+           2014-2016, ChangZhuo Chen (陳昌倬) <czchen@debian.org>
-           2022      S. 7 <severusseptimius7@gmail.com>
+           2022,      S. 7 <severusseptimius7@gmail.com>
-           2022      Simon Quigley <tsimonq2@debian.org>
-           2023      Aaron Rainbolt <arraybolt3@ubuntu.com>
 License: LGPL-2.1+
 
+Files: src/qtxdg/xdgaction.cpp
+       src/qtxdg/xdgaction.h
+       src/qtxdg/xdgautostart.cpp
+       src/qtxdg/xdgautostart.h
+       src/qtxdg/xdgdesktopfile.cpp
+       src/qtxdg/xdgdesktopfile.h
+       src/qtxdg/xdgdirs.cpp
+       src/qtxdg/xdgdirs.h
+       src/qtxdg/xdgicon.cpp
+       src/qtxdg/xdgicon.h
+       src/qtxdg/xdgmenu.cpp
+       src/qtxdg/xdgmenu.h
+       src/qtxdg/xdgmenu_p.h
+       src/qtxdg/xdgmenuapplinkprocessor.cpp
+       src/qtxdg/xdgmenuapplinkprocessor.h
+       src/qtxdg/xdgmenulayoutprocessor.cpp
+       src/qtxdg/xdgmenulayoutprocessor.h
+       src/qtxdg/xdgmenureader.cpp
+       src/qtxdg/xdgmenureader.h
+       src/qtxdg/xdgmenurules.cpp
+       src/qtxdg/xdgmenurules.h
+       src/qtxdg/xdgmenuwidget.cpp
+       src/qtxdg/xdgmenuwidget.h
+       src/qtxdg/xmlhelper.cpp
+       src/qtxdg/xmlhelper.h
+Copyright: 2010-2012, Razor team
+License: LGPL-2.1+
+
+Files: src/xdgiconloader/xdgiconloader.cpp
+       src/xdgiconloader/xdgiconloader_p.h
+Copyright: 2014, Digia Plc and/or its subsidiary(-ies)
+License: LGPL-2.1-or-3-with-Digia-1.1-exception
+
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions

debian/libqt5xdg3.symbols

@@ -1,5 +1,5 @@
 libQt5Xdg.so.3 libqt5xdg3 #MINVER#
-* Build-Depends-Package: libqt5xdg-dev
+* Build-Depends-Package: libqt5xdg3-dev
  (c++)"XdgAction::XdgAction(QObject*)@Base" 1.0.0
  (c++)"XdgAction::XdgAction(QString const&, QObject*)@Base" 1.0.0
  (c++)"XdgAction::XdgAction(XdgAction const&, QObject*)@Base" 1.0.0

debian/libqt5xdgiconloader3.symbols

@@ -1,5 +1,4 @@
 libQt5XdgIconLoader.so.3 libqt5xdgiconloader3 #MINVER#
-* Build-Depends-Package: libqt5xdgiconloader-dev
  _ZN13XdgIconLoader20setFollowColorSchemeEb@Base 3.8.0
  _ZN13XdgIconLoader8instanceEv@Base 3.8.0
  _ZN19XdgIconLoaderEngine10actualSizeERK5QSizeN5QIcon4ModeENS3_5StateE@Base 3.8.0

debian/patches/ubuntu-gettext-translations.patch

@@ -1,39 +0,0 @@
-Description: Add support for translations defined via X-Ubuntu-Gettext-Domain
-Author: Simon Quigley <tsimonq2@lubuntu.me> 
-Origin: vendor
-Forwarded: https://github.com/lxqt/libqtxdg/pull/292
-Last-Update: 2023-03-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/qtxdg/xdgdesktopfile.cpp
-+++ b/src/qtxdg/xdgdesktopfile.cpp
-@@ -38,6 +38,7 @@
- 
- #include <cstdlib>
- #include <unistd.h>
-+#include <libintl.h>
- 
- #include <QDebug>
- #include <QDBusInterface>
-@@ -921,7 +922,22 @@ QString XdgDesktopFile::localizedKey(con
- 
- QVariant XdgDesktopFile::localizedValue(const QString& key, const QVariant& defaultValue) const
- {
--    return value(localizedKey(key), defaultValue);
-+    // If the file is translated via gettext, override locally-defined translations
-+    if (contains(QLatin1String("X-Ubuntu-Gettext-Domain")))
-+    {
-+        QString domain = value(QLatin1String("X-Ubuntu-Gettext-Domain")).toString();
-+        QString val = value(key, defaultValue).toString().trimmed();
-+        if (!val.isEmpty()) {
-+            QByteArray _domain = domain.toUtf8();
-+            QByteArray _val = val.toUtf8();
-+            char *translated = dgettext(_domain.constData(), _val.constData());
-+            return QVariant(QString::fromUtf8(translated));
-+        } else {
-+            return QVariant();
-+        }
-+    } else {
-+        return value(localizedKey(key), defaultValue);
-+    }
- }