Merge ~liushuyu-011/ubuntu/+source/ayatana-indicator-session:ubuntu/devel into ubuntu/+source/ayatana-indicator-session:ubuntu/devel

[Zixing Liu]

This merge proposal fixes the build issues with GCC 13.

A corresponding merge request has also been filed in Debian: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-session/-/merge_requests/3.

[Brian Murray (brian-murray)]

Trying to build the package locally I encountered an error:

 $ debuild -i -I -S -d
...
dpkg-source: error: Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu address
dpkg-source: info: using source format '3.0 (quilt)'
dpkg-buildpackage: error: dpkg-source -i.pc* -I.bzr -I.svn -ICVS -I.pc -i -I -b . subprocess returned exit status 25
debuild: fatal error at line 1182:
dpkg-buildpackage -us -uc -ui -i.pc* -I.bzr -I.svn -ICVS -I.pc -i -I -S -d failed

Running update-maintainer isn't enough though:

 $ update-maintainer
The package targets Debian. Doing nothing.

Please modify the debian/changelog entry so that the release is mantic and run update-maintainer.

Thanks!

review: Needs Fixing

[Zixing Liu (liushuyu-011)]

Hi Brian,

I have fixed the issue you mentioned. Now the changelog indicates the release targets mantic and the maintainer information was updated as well.

[Lukas Märdian (slyon)]

I fixed some trailing whitespace in you d/changelog file.

Also, it would be nice if you could add DEP-3 headers to your patches in the future, so it's easier to correlate in the future when we can drop that patch: https://dep-team.pages.debian.net/deps/dep3/
=> I added some, too.

Sponsoring with those little fixes applied... (no need to do another round-trip for this)

review: Approve

diff --git a/debian/changelog b/debian/changelog
index aa67c35..d3f9c15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ayatana-indicator-session (22.9.2-1ubuntu1) mantic; urgency=medium
+
+  * debian/patches:
+    + Add 2000-fix-build-on-gcc13.patch to fix the missing header issue when
+      building with GCC 13. The patch has been forwarded to the upstream.
+ 
+ -- Zixing Liu <[e-mail]>  Fri, 21 Jul 2023 10:57:53 +0800 
+
 ayatana-indicator-session (22.9.2-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 64dd133..21dc15d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ayatana-indicator-session
 Section: misc
 Priority: optional
-Maintainer: Ayatana Packagers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Ayatana Packagers <[e-mail]>
 Uploaders: Mike Gabriel <[e-mail]>,
            Debian UBports Team <[e-mail]>,
 Build-Depends: cmake,
diff --git a/debian/patches/2000-fix-build-on-gcc13.patch b/debian/patches/2000-fix-build-on-gcc13.patch
new file mode 100644
index 0000000..0a2ec82
--- /dev/null
+++ b/debian/patches/2000-fix-build-on-gcc13.patch
@@ -0,0 +1,21 @@
+From 8cf9538f456416d0be501edc20381b0bec2acd61 Mon Sep 17 00:00:00 2001
+From: liushuyu <[e-mail]>
+Date: Fri, 21 Jul 2023 10:50:29 +0800
+Subject: [PATCH] tests/backend-dbus/mock-login1-seat.cc: fix build with GCC 13
+
+---
+ tests/backend-dbus/mock-login1-seat.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/backend-dbus/mock-login1-seat.cc b/tests/backend-dbus/mock-login1-seat.cc
+index 49d7fb6d..c60b065a 100644
+--- a/tests/backend-dbus/mock-login1-seat.cc
++++ b/tests/backend-dbus/mock-login1-seat.cc
+@@ -17,6 +17,7 @@
+  * with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include <cstdint>
+ #include "mock-login1-seat.h"
+ 
+ #include "mock-object.h"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5f8e917
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+2000-fix-build-on-gcc13.patch