Merge ~liushuyu-011/ubuntu/+source/gammaray:merge-lp2064976 into ubuntu/+source/gammaray:debian/sid

[Zixing Liu]

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

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

[Simon Quigley (tsimonq2)]

review: Approve

[Simon Quigley (tsimonq2)]

review: Approve

Unmerged commits

021b431... by Zixing Liu on 2024-05-07

finalize changelog

abe2823... by Zixing Liu on 2024-05-07

update-maintainer

7be5e56... by Zixing Liu on 2024-05-07

reconstruct-changelog

aba1896... by Zixing Liu on 2024-05-07

merge-changelogs

afa3f6c... by Rik Mills on 2022-06-23

    - Disable LauncherTest and ClientConnectionTest that fail on Ubuntu
      because of ptrace protection.

diff --git a/debian/changelog b/debian/changelog
index 8d2fd35..002cfd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gammaray (2.11.3-4ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable (LP: #2064976). Remaining changes:
+    - Disable LauncherTest and ClientConnectionTest that fail on Ubuntu
+      because of ptrace protection.
+
+ -- Zixing Liu <[e-mail]>  Mon, 06 May 2024 19:15:28 -0600
+
 gammaray (2.11.3-4) unstable; urgency=medium
 
   * Team upload.
@@ -26,6 +34,68 @@ gammaray (2.11.3-2) unstable; urgency=medium
 
  -- Dmitry Shachnev <[e-mail]>  Sat, 24 Dec 2022 19:06:21 +0300
 
+gammaray (2.11.3-1ubuntu10) noble; urgency=medium
+
+  * No-change rebuild against Qt 5.15.13.
+
+ -- Dmitry Shachnev <[e-mail]>  Thu, 04 Apr 2024 23:13:47 +0300
+
+gammaray (2.11.3-1ubuntu9) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <[e-mail]>  Sun, 31 Mar 2024 05:32:11 +0000
+
+gammaray (2.11.3-1ubuntu8) noble; urgency=medium
+
+  * No-change rebuild against libqt5core5t64
+
+ -- Steve Langasek <[e-mail]>  Fri, 15 Mar 2024 04:27:10 +0000
+
+gammaray (2.11.3-1ubuntu7) noble; urgency=medium
+
+  * No-change rebuild against Qt 5.15.12.
+
+ -- Dmitry Shachnev <[e-mail]>  Sat, 30 Dec 2023 19:56:26 +0300
+
+gammaray (2.11.3-1ubuntu6) mantic; urgency=medium
+
+  * No-change rebuild against Qt 5.15.10.
+
+ -- Dmitry Shachnev <[e-mail]>  Wed, 21 Jun 2023 11:54:33 +0300
+
+gammaray (2.11.3-1ubuntu5) mantic; urgency=medium
+
+  * No-change rebuild against Qt 5.15.9.
+
+ -- Dmitry Shachnev <[e-mail]>  Wed, 17 May 2023 17:17:50 +0300
+
+gammaray (2.11.3-1ubuntu4) lunar; urgency=medium
+
+  * No-change rebuild against Qt 5.15.8.
+
+ -- Dmitry Shachnev <[e-mail]>  Sat, 14 Jan 2023 14:16:49 +0300
+
+gammaray (2.11.3-1ubuntu3) lunar; urgency=medium
+
+  * No-change rebuild against Qt 5.15.7.
+
+ -- Dmitry Shachnev <[e-mail]>  Sat, 10 Dec 2022 21:36:42 +0300
+
+gammaray (2.11.3-1ubuntu2) kinetic; urgency=medium
+
+  * No-change rebuild against Qt 5.15.6.
+
+ -- Dmitry Shachnev <[e-mail]>  Sun, 18 Sep 2022 10:51:02 +0300
+
+gammaray (2.11.3-1ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Disable LauncherTest and ClientConnectionTest that fail on Ubuntu
+      because of ptrace protection.
+
+ -- Rik Mills <[e-mail]>  Thu, 23 Jun 2022 07:00:46 +0100
+
 gammaray (2.11.3-1) unstable; urgency=medium
 
   * Team upload.
@@ -35,6 +105,26 @@ gammaray (2.11.3-1) unstable; urgency=medium
 
  -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Thu, 21 Apr 2022 18:53:33 -0300
 
+gammaray (2.11.2-2ubuntu3) kinetic; urgency=medium
+
+  * No-change rebuild against Qt 5.15.4.
+
+ -- Dmitry Shachnev <[e-mail]>  Thu, 19 May 2022 23:27:07 +0300
+
+gammaray (2.11.2-2ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild against Qt 5.15.3.
+
+ -- Dmitry Shachnev <[e-mail]>  Sat, 19 Mar 2022 21:57:30 +0300
+
+gammaray (2.11.2-2ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable, remaining change:
+    - Disable LauncherTest and ClientConnectionTest that fail on Ubuntu
+      because of ptrace protection.
+
+ -- Dmitry Shachnev <[e-mail]>  Sat, 28 Nov 2020 12:15:29 +0300
+
 gammaray (2.11.2-2) unstable; urgency=medium
 
   * Team upload.
@@ -42,6 +132,14 @@ gammaray (2.11.2-2) unstable; urgency=medium
 
  -- Dmitry Shachnev <[e-mail]>  Sat, 31 Oct 2020 18:09:56 -0300
 
+gammaray (2.11.2-1ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable, remaining change:
+    - Disable LauncherTest and ClientConnectionTest that fail on Ubuntu
+      because of ptrace protection.
+
+ -- Dmitry Shachnev <[e-mail]>  Fri, 30 Oct 2020 20:24:06 +0300
+
 gammaray (2.11.2-1) unstable; urgency=medium
 
   * New upstream release.
@@ -68,6 +166,13 @@ gammaray (2.11.1-1) unstable; urgency=medium
 
  -- Dmitry Shachnev <[e-mail]>  Tue, 19 May 2020 14:21:07 +0300
 
+gammaray (2.11.0-2ubuntu1) focal; urgency=medium
+
+  * Disable LauncherTest and ClientConnectionTest that fail on Ubuntu because
+    of ptrace protection.
+
+ -- Dmitry Shachnev <[e-mail]>  Sat, 11 Apr 2020 12:38:21 +0300
+
 gammaray (2.11.0-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 66d9fa8..59f3554 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: gammaray
 Priority: optional
 Section: devel
-Maintainer: Debian KDE Extras Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian KDE Extras Team <[e-mail]>
 Uploaders: Jakub Adam <[e-mail]>
 Build-Depends: cmake,
                debhelper-compat (= 13),
diff --git a/debian/patches/disable-ptrace-tests.patch b/debian/patches/disable-ptrace-tests.patch
new file mode 100644
index 0000000..b6bd48c
--- /dev/null
+++ b/debian/patches/disable-ptrace-tests.patch
@@ -0,0 +1,28 @@
+Description: disable LauncherTest and ClientConnectionTest
+ These tests fail on Ubuntu because of ptrace protection, see:
+ - https://wiki.ubuntu.com/SecurityTeam/Roadmap/KernelHardening#ptrace_Protection
+ - https://github.com/KDAB/GammaRay/wiki/Known-Issues#gdb-method-fails-to-attach-to-running-process
+Author: Dmitry Shachnev <[e-mail]>
+Forwarded: not-needed
+Last-Update: 2020-04-11
+
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -288,17 +288,6 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD AND NO
+   gammaray_add_test(earlyexittest earlyexittest.cpp)
+   target_include_directories(earlyexittest PRIVATE ${CMAKE_BINARY_DIR}/launcher)
+   target_link_libraries(earlyexittest gammaray_core gammaray_launcher)
+-
+-  if(HAVE_QT_WIDGETS)
+-    gammaray_add_test(launchertest launchertest.cpp)
+-    target_include_directories(launchertest PRIVATE ${CMAKE_BINARY_DIR}/launcher)
+-    target_link_libraries(launchertest gammaray_core gammaray_launcher)
+-  endif()
+-
+-  if(TARGET gammaray_client)
+-    gammaray_add_test(clientconnectiontest clientconnectiontest.cpp)
+-    target_link_libraries(clientconnectiontest gammaray_core gammaray_launcher gammaray_client)
+-  endif()
+ endif()
+ 
+ #
diff --git a/debian/patches/series b/debian/patches/series
index 5cfe15f..093a2b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 debian-archs-fix-build.patch
 qt-system-paths.patch
 increase-test-timeout.patch
+disable-ptrace-tests.patch