Merge ~liushuyu-011/ubuntu/+source/libcec:merge-lp2065138 into ubuntu/+source/libcec:debian/sid

[Zixing Liu]

This MP merges libcec changes from Debian unstable into Ubuntu Oracular.

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/16126436/+listing-archive-extra

[Graham Inggs (ginggs)]

Per LP: #2065138 this merge is no longer needed

review: Disapprove

Unmerged commits

311c6e3... by Zixing Liu on 2024-05-08

update-maintainer

ad307a0... by Zixing Liu on 2024-05-08

reconstruct-changelog

81de369... by Zixing Liu on 2024-05-08

merge-changelogs

1f916dd... by Zixing Liu on 2024-05-08

    - Build-depend on libraspberrypi-dev on arm64 and armhf.
      This enables Raspberry Pi support. (Closes: #921878)

diff --git a/debian/changelog b/debian/changelog
index 6d135bb..61df2d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libcec (6.0.2-5ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable (LP: #2065138). Remaining changes:
+    - Build-depend on libraspberrypi-dev on arm64 and armhf.
+      This enables Raspberry Pi support. (Closes: #921878)
+
+ -- Zixing Liu <[e-mail]>  Tue, 07 May 2024 23:19:55 -0600
+
 libcec (6.0.2-5) unstable; urgency=medium
 
   * Update standards version to 4.6.2, no changes needed.
@@ -45,6 +53,43 @@ libcec (6.0.2-2) unstable; urgency=medium
 
  -- Balint Reczey <[e-mail]>  Mon, 01 Mar 2021 08:10:46 +0100
 
+libcec (6.0.2-1ubuntu6) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <[e-mail]>  Sun, 31 Mar 2024 18:54:33 +0000
+
+libcec (6.0.2-1ubuntu5) noble; urgency=medium
+
+  * No-change rebuild for python3.12 t64.
+
+ -- Matthias Klose <[e-mail]>  Sat, 02 Mar 2024 21:10:52 +0100
+
+libcec (6.0.2-1ubuntu4) noble; urgency=medium
+
+  * No-change rebuild with Python 3.12 as default
+
+ -- Graham Inggs <[e-mail]>  Fri, 19 Jan 2024 19:52:24 +0000
+
+libcec (6.0.2-1ubuntu3) lunar; urgency=medium
+
+  * No-change rebuild with Python 3.11 as default
+
+ -- Graham Inggs <[e-mail]>  Sun, 25 Dec 2022 20:06:31 +0000
+
+libcec (6.0.2-1ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild with Python 3.10 as default version
+
+ -- Graham Inggs <[e-mail]>  Thu, 13 Jan 2022 19:33:54 +0000
+
+libcec (6.0.2-1ubuntu1) hirsute; urgency=medium
+
+  * Build-depend on libraspberrypi-dev on arm64 and armhf.
+    This enables Raspberry Pi support. (Closes: #921878)
+
+ -- Balint Reczey <[e-mail]>  Thu, 17 Dec 2020 20:28:24 +0100
+
 libcec (6.0.2-1) unstable; urgency=medium
 
   [ Debian Janitor ]
diff --git a/debian/control b/debian/control
index a01f58e..1d064fa 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: libcec
-Maintainer: Barak A. Pearlmutter <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Barak A. Pearlmutter <[e-mail]>
 Section: libs
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
@@ -11,6 +12,7 @@ Build-Depends: debhelper-compat (= 13),
                dh-python,
                cmake,
                swig,
+               libraspberrypi-dev [arm64 armhf],
                libxrandr-dev,
                x11proto-core-dev,
                libncurses-dev