[neon/backports-jammy/appstream-jammy2/Neon/unstable] debian: Revert "revert to current stable release"
Jonathan Esk-Riddell
null at kde.org
Tue Oct 3 16:07:16 BST 2023
Git commit f6e6fcfc4e5ea3ccdf32ea6fa1c5f1539452d09f by Jonathan Esk-Riddell.
Committed on 03/10/2023 at 17:07.
Pushed by jriddell into branch 'Neon/unstable'.
Revert "revert to current stable release"
This reverts commit ceb2bfeab575afc103a2d1f675ea8ae526d8941c.
M +1 -1 debian/appstream.install
M +6 -0 debian/changelog
M +50 -6 debian/control
A +1 -0 debian/libappstream5.install
A +1 -0 debian/libappstreamqt-3.install
A +1 -0 debian/libappstreamqt-3.lintian-overrides
M +1 -1 debian/libappstreamqt-dev.install
A +1 -0 debian/libappstreamqt5-3.install
A +3 -0 debian/libappstreamqt5-dev.install
A +71 -0 debian/patches/0001_qt.diff
A +1 -0 debian/patches/series
M +22 -6 debian/rules
https://invent.kde.org/neon/backports-jammy/appstream-jammy2/-/commit/f6e6fcfc4e5ea3ccdf32ea6fa1c5f1539452d09f
diff --git a/debian/appstream.install b/debian/appstream.install
index 929f8cd..83cfdbf 100644
--- a/debian/appstream.install
+++ b/debian/appstream.install
@@ -1,6 +1,6 @@
-etc/appstream.conf
etc/apt/apt.conf.d/*
usr/bin/*
+usr/share/appstream/appstream.conf
usr/share/gettext/*
usr/share/installed-tests/appstream/metainfo-validate.test
usr/share/locale/*
diff --git a/debian/changelog b/debian/changelog
index ec8ba1f..f864644 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+appstream (1.0.0-0neon) jammy; urgency=medium
+
+ * New release
+
+ -- Carlos De Maine <carlosdemaine at gmail.com> Tue, 25 Apr 2023 18:53:54 +1000
+
appstream (0.16.2-0neon) jammy; urgency=medium
* New release
diff --git a/debian/control b/debian/control
index 49aae88..30c4146 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
Maintainer: Matthias Klumpp <mak at debian.org>
Build-Depends: debhelper-compat (= 13),
gettext,
+ gi-docgen,
gobject-introspection,
gperf,
gtk-doc-tools,
@@ -25,6 +26,7 @@ Build-Depends: debhelper-compat (= 13),
libyaml-dev,
meson (>= 0.62),
qtbase5-dev,
+ qt6-base-dev,
valac
Rules-Requires-Root: no
Standards-Version: 4.6.0
@@ -74,7 +76,7 @@ Description: Compose metadata collections from directory trees
This package extends the `appstreamcli` utility with a `compose` subcommand
to generate AppStream metadata and media files from directory trees.
-Package: libappstream4
+Package: libappstream5
Architecture: any
Section: libs
Multi-Arch: same
@@ -99,7 +101,7 @@ Architecture: any
Section: libdevel
Multi-Arch: same
Depends: gir1.2-appstream-1.0 (= ${binary:Version}),
- libappstream4 (= ${binary:Version}),
+ libappstream5 (= ${binary:Version}),
libglib2.0-dev,
${misc:Depends}
Description: Library to access AppStream services (development files)
@@ -117,7 +119,7 @@ Package: gir1.2-appstream-1.0
Architecture: any
Section: introspection
Multi-Arch: same
-Depends: libappstream4 (= ${binary:Version}),
+Depends: libappstream5 (= ${binary:Version}),
${gir:Depends},
${misc:Depends}
Description: Library to access AppStream services (introspection data)
@@ -130,14 +132,16 @@ Description: Library to access AppStream services (introspection data)
.
This package contains introspection data for the AppStream library.
-Package: libappstreamqt2
+Package: libappstreamqt-3
Architecture: any
Section: libs
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
-Description: Qt5 library to access AppStream services
+Breaks: libappstreamqt3, libappstreamqt6-3
+Replaces: libappstreamqt3, libappstreamqt6-3
+Description: Qt6 library to access AppStream services
AppStream is a metadata specification which permits software components to
provide information about themselves to automated systems and end-users
before the software is actually installed.
@@ -152,7 +156,47 @@ Package: libappstreamqt-dev
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: libappstreamqt2 (= ${binary:Version}),
+Depends: libappstreamqt-3 (= ${binary:Version}),
+ qt6-base-dev,
+ ${misc:Depends}
+Breaks: libappstreamqt6-dev
+Replaces: libappstreamqt6-dev
+Description: Qt6 library to access AppStream services (development files)
+ AppStream is a metadata specification which permits software components to
+ provide information about themselves to automated systems and end-users
+ before the software is actually installed.
+ This permits informative displays of new applications to users in software
+ centers, as well as allowing a system to make decisions on which new software
+ a user might want to install (e.g. missing firmware or media handlers).
+ .
+ This package contains development files necessary to develop
+ software management tools which use the Qt-based AppStream library.
+
+Package: libappstreamqt5-3
+Architecture: any
+Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: libappstreamqt2,
+Replaces: libappstreamqt2,
+Description: Qt5 library to access AppStream services
+ AppStream is a metadata specification which permits software components to
+ provide information about themselves to automated systems and end-users
+ before the software is actually installed.
+ This permits informative displays of new applications to users in software
+ centers, as well as allowing a system to make decisions on which new software
+ a user might want to install (e.g. missing firmware or media handlers).
+ .
+ This package contains a Qt-based library to access AppStream
+ services, like the software component metadata pool.
+
+Package: libappstreamqt5-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Depends: libappstreamqt5-3 (= ${binary:Version}),
qtbase5-dev,
${misc:Depends}
Description: Qt5 library to access AppStream services (development files)
diff --git a/debian/libappstream5.install b/debian/libappstream5.install
new file mode 100644
index 0000000..4d61156
--- /dev/null
+++ b/debian/libappstream5.install
@@ -0,0 +1 @@
+usr/lib/*/libappstream.so.*
diff --git a/debian/libappstreamqt-3.install b/debian/libappstreamqt-3.install
new file mode 100644
index 0000000..89bdc8f
--- /dev/null
+++ b/debian/libappstreamqt-3.install
@@ -0,0 +1 @@
+usr/lib/*/libAppStreamQt.so.*
diff --git a/debian/libappstreamqt-3.lintian-overrides b/debian/libappstreamqt-3.lintian-overrides
new file mode 100644
index 0000000..3aa3a28
--- /dev/null
+++ b/debian/libappstreamqt-3.lintian-overrides
@@ -0,0 +1 @@
+libappstreamqt-3: package-name-doesnt-match-sonames libAppStreamQt3
diff --git a/debian/libappstreamqt-dev.install b/debian/libappstreamqt-dev.install
index 741d64e..ea4479b 100644
--- a/debian/libappstreamqt-dev.install
+++ b/debian/libappstreamqt-dev.install
@@ -1,3 +1,3 @@
-usr/include/AppStreamQt/*
+usr/include/AppStreamQt/
usr/lib/*/cmake/AppStreamQt/*
usr/lib/*/libAppStreamQt.so
diff --git a/debian/libappstreamqt5-3.install b/debian/libappstreamqt5-3.install
new file mode 100644
index 0000000..709185f
--- /dev/null
+++ b/debian/libappstreamqt5-3.install
@@ -0,0 +1 @@
+usr/lib/*/libAppStreamQt5.so.*
diff --git a/debian/libappstreamqt5-dev.install b/debian/libappstreamqt5-dev.install
new file mode 100644
index 0000000..b4b9d1c
--- /dev/null
+++ b/debian/libappstreamqt5-dev.install
@@ -0,0 +1,3 @@
+usr/include/AppStreamQt5/
+usr/lib/*/cmake/AppStreamQt5/*
+usr/lib/*/libAppStreamQt5.so
diff --git a/debian/patches/0001_qt.diff b/debian/patches/0001_qt.diff
new file mode 100644
index 0000000..b4b9f2b
--- /dev/null
+++ b/debian/patches/0001_qt.diff
@@ -0,0 +1,71 @@
+diff --git a/qt/component-box.cpp b/qt/component-box.cpp
+index 06ad5dfd..866c22e1 100644
+--- a/qt/component-box.cpp
++++ b/qt/component-box.cpp
+@@ -30,7 +30,7 @@ class AppStream::ComponentBoxData : public QSharedData
+ public:
+ ComponentBoxData(ComponentBox::Flags flags)
+ {
+- m_cbox = as_component_box_new(static_cast<AsComponentBoxFlags>(flags.toInt()));
++ m_cbox = as_component_box_new(static_cast<AsComponentBoxFlags>(flags==int()));
+ }
+
+ ComponentBoxData(AsComponentBox *cbox)
+diff --git a/qt/pool.cpp b/qt/pool.cpp
+index ec56a109..6f0da4b0 100644
+--- a/qt/pool.cpp
++++ b/qt/pool.cpp
+@@ -24,6 +24,7 @@
+
+ #include <QStringList>
+ #include <QUrl>
++#include <QVariant>
+ #include <QLoggingCategory>
+ #include "chelpers.h"
+
+@@ -212,17 +213,17 @@ Pool::Flags Pool::flags() const
+
+ void Pool::setFlags(Pool::Flags flags)
+ {
+- as_pool_set_flags(d->pool, (AsPoolFlags) flags.toInt());
++ as_pool_set_flags(d->pool, (AsPoolFlags) (flags==int()));
+ }
+
+ void Pool::addFlags(Pool::Flags flags)
+ {
+- as_pool_add_flags(d->pool, (AsPoolFlags) flags.toInt());
++ as_pool_add_flags(d->pool, (AsPoolFlags) (flags==int()));
+ }
+
+ void Pool::removeFlags(Pool::Flags flags)
+ {
+- as_pool_remove_flags(d->pool, (AsPoolFlags) flags.toInt());
++ as_pool_remove_flags(d->pool, (AsPoolFlags) (flags==int()));
+ }
+
+ void Pool::resetExtraDataLocations()
+diff --git a/qt/relation.h b/qt/relation.h
+index 6b95777c..87f98087 100644
+--- a/qt/relation.h
++++ b/qt/relation.h
+@@ -22,7 +22,7 @@
+ #include <QSharedDataPointer>
+ #include <QString>
+ #include <QObject>
+-
++#include <optional>
+ #include "appstreamqt_export.h"
+ #include "relation-check-result.h"
+
+diff --git a/qt/release.h b/qt/release.h
+index e377fa21..db008949 100644
+--- a/qt/release.h
++++ b/qt/release.h
+@@ -25,6 +25,7 @@
+ #include <QString>
+ #include <QObject>
+ #include <QCryptographicHash>
++#include <optional>
+ #include "appstreamqt_export.h"
+
+ struct _AsRelease;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8f28c24
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001_qt.diff
diff --git a/debian/rules b/debian/rules
index 33533a1..08b1e1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,16 +8,32 @@ else
ENABLE_COMPOSE=-Dcompose=false
endif
-AS_CONFIGURE_ARGS = -Dqt=true \
- -Dapt-support=true \
- $(ENABLE_COMPOSE) \
- -Dvapi=true
-
%:
dh $@ --with gir
+execute_after_dh_auto_clean:
+ rm -rf build-qt5
+
override_dh_auto_configure:
- dh_auto_configure -- $(AS_CONFIGURE_ARGS)
+ dh_auto_configure -- -Dqt=true -Dapt-support=true $(ENABLE_COMPOSE) -Dvapi=true
+ dh_auto_configure --builddirectory=build-qt5 -- -Dqt5=true
+
+override_dh_auto_build:
+ dh_auto_build
+ dh_auto_build --builddirectory=build-qt5
+
+override_dh_auto_install:
+ dh_auto_install
+ dh_auto_install --builddirectory=build-qt5
override_dh_missing:
dh_missing --fail-missing
+ dh_missing --fail-missing
+
+override_dh_test:
+ :
+ :
+
+override_dh_auto_test:
+ :
+ :
More information about the Neon-commits
mailing list