[neon/backports-jammy/snapd-glib/Neon/stable] debian: we need libsoup-2.4-dev

Fri Apr 26 00:03:37 BST 2024

Git commit 22855e74f42395b98abc37798fd2260fe75fa812 by Carlos De Maine.
Committed on 25/04/2024 at 23:03.
Pushed by carlosdem into branch 'Neon/stable'.

we need libsoup-2.4-dev


(cherry picked from commit 02b3e3a0c17c68aa9c6452121ffad3d2ed783151)

e05003ab we need libsoup-2.4-dev
3592c68a New release
19ee5b85 New release
910ae532 New release
278d6165 drop patches && libsoup2.4-dev
cd3fe7bc Merge remote-tracking branch 'refs/remotes/origin/Neon/release_jammy' into Neon/unstable_jammy
2ad71c3a Merge branch 'refs/heads/Neon/unstable_jammy' into Neon/stable_jammy
b5c16f1d Merge branch 'refs/heads/Neon/release' into Neon/release_jammy
d0213ff7 Tell meson to build with soup2
2bbe96cf gain to force soup2
ad4845e4 Update installs
a571e3a8 Remove missing qml
995813f1 Add correct qml files.
9646af4b enames to match SO version.

M  +7    -7    debian/control
R  +0    -0    debian/gir1.2-snapd-1.install [from: debian/gir1.2-snapd-2.install - 100% similarity]
D  +0    -1    debian/libsnapd-glib-2-1.install
M  +3    -3    debian/libsnapd-glib-dev.install
A  +1    -0    debian/libsnapd-glib1.install
R  +0    -0    debian/libsnapd-glib1.symbols [from: debian/libsnapd-glib-2-1.symbols - 100% similarity]
D  +0    -1    debian/libsnapd-qt-2-1.install
M  +3    -3    debian/libsnapd-qt-dev.install
A  +1    -0    debian/libsnapd-qt1.install
M  +2    -2    debian/qml6-module-snapd.install
M  +4    -0    debian/rules

https://invent.kde.org/neon/backports-jammy/snapd-glib/-/commit/22855e74f42395b98abc37798fd2260fe75fa812

diff --git a/debian/control b/debian/control
index 6e42581..915d580 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Homepage: https://github.com/snapcore/snapd-glib
 Vcs-Git: https://salsa.debian.org/debian-ayatana-team/snapd-glib.git
 Vcs-Browser: https://salsa.debian.org/debian-ayatana-team/snapd-glib
 
-Package: libsnapd-glib-2-1
+Package: libsnapd-glib1
 Architecture: linux-any kfreebsd-any
 Multi-Arch: same
 Depends: ${misc:Depends},
@@ -39,13 +39,13 @@ Description: GLib snapd library
  systems, enabling secure distribution of the latest apps and utilities
  for cloud, servers, desktops and the internet of things.
 
-Package: gir1.2-snapd-2
+Package: gir1.2-snapd-1
 Section: introspection
 Architecture: linux-any kfreebsd-any
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${gir:Depends},
-         libsnapd-glib-2-1 (= ${binary:Version})
+         libsnapd-glib1 (= ${binary:Version})
 Description: Typelib file for libsnapd-glib1
  snapd-glib is a library to allow GLib based applications access to snapd,
  the daemon that controls Snaps.
@@ -64,8 +64,8 @@ Section: libdevel
 Architecture: linux-any kfreebsd-any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         libsnapd-glib-2-1 (= ${binary:Version}),
-         gir1.2-snapd-2 (= ${binary:Version}),
+         libsnapd-glib1 (= ${binary:Version}),
+         gir1.2-snapd-1 (= ${binary:Version}),
          libglib2.0-dev,
          libsoup2.4-dev,
          libjson-glib-dev
@@ -80,7 +80,7 @@ Description: GLib snapd library (development files)
  This package contains header files and development information, which
  is useful for building applications that need to communicate with snapd.
 
-Package: libsnapd-qt-2-1
+Package: libsnapd-qt1
 Architecture: linux-any kfreebsd-any
 Multi-Arch: same
 Depends: ${misc:Depends},
@@ -119,7 +119,7 @@ Section: libdevel
 Architecture: linux-any kfreebsd-any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         libsnapd-qt-2-1 (= ${binary:Version}),
+         libsnapd-qt1 (= ${binary:Version}),
          qt6-base-dev,
 Breaks: libsnapd-glib-dev (<< 1.46)
 Replaces: libsnapd-glib-dev (<< 1.46)
diff --git a/debian/gir1.2-snapd-2.install b/debian/gir1.2-snapd-1.install
similarity index 100%
rename from debian/gir1.2-snapd-2.install
rename to debian/gir1.2-snapd-1.install
diff --git a/debian/libsnapd-glib-2-1.install b/debian/libsnapd-glib-2-1.install
deleted file mode 100644
index 3a61bd6..0000000
--- a/debian/libsnapd-glib-2-1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libsnapd-glib-2.so.*
diff --git a/debian/libsnapd-glib-dev.install b/debian/libsnapd-glib-dev.install
index 62f505f..f1b50a2 100644
--- a/debian/libsnapd-glib-dev.install
+++ b/debian/libsnapd-glib-dev.install
@@ -1,6 +1,6 @@
-usr/include/snapd-glib-2
-usr/lib/*/pkgconfig/snapd-glib-2.pc
-usr/lib/*/libsnapd-glib*.so
+usr/include/snapd-glib
+usr/lib/*/pkgconfig/snapd-glib.pc
+usr/lib/*/libsnapd-glib.so
 usr/share/gir-1.0
 usr/share/doc/libsnapd-glib-dev/html
 usr/share/vala
diff --git a/debian/libsnapd-glib1.install b/debian/libsnapd-glib1.install
new file mode 100644
index 0000000..0ca3340
--- /dev/null
+++ b/debian/libsnapd-glib1.install
@@ -0,0 +1 @@
+usr/lib/*/libsnapd-glib.so.*
diff --git a/debian/libsnapd-glib-2-1.symbols b/debian/libsnapd-glib1.symbols
similarity index 100%
rename from debian/libsnapd-glib-2-1.symbols
rename to debian/libsnapd-glib1.symbols
diff --git a/debian/libsnapd-qt-2-1.install b/debian/libsnapd-qt-2-1.install
deleted file mode 100644
index b75980c..0000000
--- a/debian/libsnapd-qt-2-1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libsnapd-qt-2.so.*
diff --git a/debian/libsnapd-qt-dev.install b/debian/libsnapd-qt-dev.install
index 95fec3a..df759a4 100644
--- a/debian/libsnapd-qt-dev.install
+++ b/debian/libsnapd-qt-dev.install
@@ -1,4 +1,4 @@
-usr/include/snapd-qt-2
+usr/include/snapd-qt
 usr/lib/*/cmake
-usr/lib/*/pkgconfig/snapd-qt-2.pc
-usr/lib/*/libsnapd-qt*.so
+usr/lib/*/pkgconfig/snapd-qt.pc
+usr/lib/*/libsnapd-qt.so
diff --git a/debian/libsnapd-qt1.install b/debian/libsnapd-qt1.install
new file mode 100644
index 0000000..a172247
--- /dev/null
+++ b/debian/libsnapd-qt1.install
@@ -0,0 +1 @@
+usr/lib/*/libsnapd-qt.so.*
diff --git a/debian/qml6-module-snapd.install b/debian/qml6-module-snapd.install
index 548b8d4..b4381fc 100644
--- a/debian/qml6-module-snapd.install
+++ b/debian/qml6-module-snapd.install
@@ -1,2 +1,2 @@
-usr/lib/*/qt6/qml/Snapd2/*.so
-usr/lib/*/qt6/qml/Snapd2/qmldir
+usr/lib/*/qt6/qml/Snapd/qmldir
+usr/lib/*/qt6/qml/Snapd/libSnapd.so
diff --git a/debian/rules b/debian/rules
index 8100030..f98cba4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,10 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 %:
 	dh $@
 
+
+override_dh_auto_configure:
+	dh_auto_configure -- -Dsoup2=true
+
 override_dh_auto_test:
 	dh_auto_test --no-parallel
 
