Merge ~liushuyu-011/ubuntu/+source/compton-conf:merge-lp2065449 into ubuntu/+source/compton-conf:debian/sid

[Zixing Liu]

This MP merges compton-conf changes from Debian unstable into Ubuntu Oracular.

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

Unmerged commits

0f11a0d... by Zixing Liu on 2024-05-10

finalize changelog

611c29b... by Zixing Liu on 2024-05-10

update-maintainer

2102cb2... by Zixing Liu on 2024-05-10

reconstruct-changelog

b4b0e43... by Zixing Liu on 2024-05-10

merge-changelogs

349cccc... by Zixing Liu on 2024-05-10

    - Lubuntify the package.
    - Add Breaks/Replaces on compton-conf-l10n.
    - Don't recommend compton-conf-l10n.
    - Update copyright.
    - Update upstream's signing key.
    - Run wrap-and-sort.

diff --git a/debian/changelog b/debian/changelog
index 97cad5f..c4199bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+compton-conf (0.16.0-3ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable (LP: #2065449). Remaining changes:
+    - Lubuntify the package.
+    - Add Breaks/Replaces on compton-conf-l10n.
+    - Don't recommend compton-conf-l10n.
+    - Update copyright.
+    - Update upstream's signing key.
+    - Run wrap-and-sort.
+  * Dropped Changes:
+    - debhelper -> debhelper-compat.
+    - Bump Standards-version to 4.5.0, no changes needed. (superseded)
+    - Bump debhelper compat to 12, no changes needed. (superseded)
+
+ -- Zixing Liu <[e-mail]>  Fri, 10 May 2024 15:33:54 -0600
+
 compton-conf (0.16.0-3) unstable; urgency=medium
 
   * Bump Standards-Version to 4.6.2.
@@ -25,6 +41,24 @@ compton-conf (0.16.0-2) unstable; urgency=medium
 
  -- Andrew Lee (李健秋) <[e-mail]>  Fri, 04 Nov 2022 13:25:24 +0800
 
+compton-conf (0.16.0-1ubuntu3) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- William Grant <[e-mail]>  Mon, 01 Apr 2024 16:40:44 +1100
+
+compton-conf (0.16.0-1ubuntu2) noble; urgency=medium
+
+  * No-change rebuild against libqt5core5t64
+
+ -- Steve Langasek <[e-mail]>  Fri, 15 Mar 2024 04:07:36 +0000
+
+compton-conf (0.16.0-1ubuntu1) hirsute; urgency=medium
+
+  * New upstream version.
+
+ -- Raman Sarda <[e-mail]>  Wed, 17 Feb 2021 02:17:23 +0530
+
 compton-conf (0.16.0-1) unstable; urgency=medium
 
   [ Alf Gaida ]
@@ -42,12 +76,30 @@ compton-conf (0.16.0-1) unstable; urgency=medium
 
  -- Andrew Lee (李健秋) <[e-mail]>  Thu, 07 Jan 2021 19:48:45 +0800
 
+compton-conf (0.15.0-0ubuntu1) groovy; urgency=medium
+
+  * New upstream release.
+    - Bump LXQt build depends.
+  * Run wrap-and-sort.
+  * Update upstream's signing key.
+  * Update copyright.
+  * debhelper -> debhelper-compat.
+  * Bump Standards-version to 4.5.0, no changes needed.
+
+ -- Simon Quigley <[e-mail]>  Wed, 03 Jun 2020 23:10:01 -0500
+
 compton-conf (0.14.1-1) unstable; urgency=medium
 
   * Cherry-picked upstream release 0.14.1.
 
  -- Alf Gaida <[e-mail]>  Tue, 26 Feb 2019 00:17:09 +0100
 
+compton-conf (0.14.1-0ubuntu1) disco; urgency=medium
+
+  * New upstream release.
+
+ -- Simon Quigley <[e-mail]>  Sat, 09 Mar 2019 12:35:55 -0600
+
 compton-conf (0.14.0-1) unstable; urgency=medium
 
   * Cherry-picked upstream release 0.14.0.
@@ -61,6 +113,29 @@ compton-conf (0.14.0-1) unstable; urgency=medium
 
  -- Alf Gaida <[e-mail]>  Sun, 27 Jan 2019 14:29:38 +0100
 
+compton-conf (0.14.0-0ubuntu3) disco; urgency=medium
+
+  * Don't recommend compton-conf-l10n.
+
+ -- Simon Quigley <[e-mail]>  Sun, 27 Jan 2019 21:04:19 -0600
+
+compton-conf (0.14.0-0ubuntu2) disco; urgency=medium
+
+  * Add Breaks/Replaces on compton-conf-l10n.
+
+ -- Simon Quigley <[e-mail]>  Sat, 26 Jan 2019 10:11:48 -0600
+
+compton-conf (0.14.0-0ubuntu1) disco; urgency=medium
+
+  * New upstream release.
+    - Bump build dependencies.
+  * Lubuntify the package.
+  * Bump Standards-version to 4.3.0, no changes needed.
+  * Bump debhelper compat to 12, no changes needed.
+  * Wraaaaaaaaaaaaap.
+
+ -- Simon Quigley <[e-mail]>  Fri, 25 Jan 2019 22:52:08 -0600
+
 compton-conf (0.4.0-1) unstable; urgency=medium
 
   * Cherry-picked upstream release 0.4.0
@@ -233,3 +308,4 @@ compton-conf (0.1.0+20150626-1) unstable; urgency=medium
   * Merging upstream version 0.1.0+20150626.
 
  -- Andrew Lee (李健秋) <[e-mail]>  Fri, 14 Aug 2015 15:03:55 +0800
+
diff --git a/debian/compton-conf-l10n.install b/debian/compton-conf-l10n.install
deleted file mode 100644
index 6dcd7b8..0000000
--- a/debian/compton-conf-l10n.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/compton-conf/translations/
diff --git a/debian/compton-conf.install b/debian/compton-conf.install
deleted file mode 100644
index 1e90455..0000000
--- a/debian/compton-conf.install
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/xdg/autostart/lxqt-compton.desktop
-usr/share/applications/compton-conf.desktop
-usr/share/compton-conf/compton.conf.example
-usr/bin/compton-conf
diff --git a/debian/control b/debian/control
index 1e74eb8..b63b982 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: compton-conf
-Maintainer: LXQt Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: LXQt Packaging Team <[e-mail]>
 Uploaders: Alf Gaida <[e-mail]>,
            ChangZhuo Chen (陳昌倬) <[e-mail]>,
            Andrew Lee (李健秋) <[e-mail]>
@@ -13,29 +14,19 @@ Build-Depends: debhelper-compat (= 13),
                libx11-dev,
                lxqt-build-tools (>= 0.8.0~)
 Standards-Version: 4.6.2
-Vcs-Browser: https://salsa.debian.org/lxqt-team/compton-conf
-Vcs-Git: https://salsa.debian.org/lxqt-team/compton-conf.git
+Vcs-Browser: https://phab.lubuntu.me/source/compton-conf/
+Vcs-Git: https://phab.lubuntu.me/source/compton-conf.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/compton-conf
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/compton-conf.git
 Homepage: https://github.com/lxqt/compton-conf
 Rules-Requires-Root: no
 
 Package: compton-conf
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         compton
-Recommends: compton-conf-l10n
-Breaks: lxqt-common (<< 0.12.0)
-Replaces: lxqt-common (<< 0.12.0)
+Depends: compton, ${misc:Depends}, ${shlibs:Depends}
+Breaks: compton-conf-l10n (<< 0.14.0), lxqt-common (<< 0.12.0)
+Replaces: compton-conf-l10n (<< 0.14.0), lxqt-common (<< 0.12.0)
 Description: Compton Configurator for Qt
  Qt configuration tool for X composite manager
  .
  This package contain Compton Configurator.
-
-Package: compton-conf-l10n
-Architecture: all
-Multi-Arch: foreign
-Section: localization
-Depends: ${misc:Depends},
-         qttranslations5-l10n
-Description: Language package for compton-conf
- This package contains the l10n files needed by the compton-conf.
diff --git a/debian/copyright b/debian/copyright
index 3e1a1f6..89fd0b7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: compton-conf
 Source: https://github.com/lxqt/compton-conf
 
 Files: *
-Copyright: 2013-2019 Hong Jen Yee (PCMan) <[e-mail]>
-           2013-2019 LXQt team
+Copyright: 2013-2020 Hong Jen Yee (PCMan) <[e-mail]>
+           2013-2020 LXQt team
 License: LGPL-2.1+
 
 Files: debian/*
diff --git a/debian/rules b/debian/rules
index eaecb97..1fc4ede 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,5 +9,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DUPDATE_TRANSLATIONS=OFF \
+		-DPULL_TRANSLATIONS=OFF\
+		-DUPDATE_TRANSLATIONS=OFF\
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 4936633..2e4d6c7 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -1,50 +1,52 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-=h7ww
+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
+sw==
+=gSIv
 -----END PGP PUBLIC KEY BLOCK-----