diff -pruN 1.2.0-1/debian/changelog 1.2.0-0ubuntu1/debian/changelog --- 1.2.0-1/debian/changelog 2022-12-14 15:34:14.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/changelog 2022-11-18 23:09:36.000000000 +0000 @@ -1,44 +1,49 @@ -lxqt-config (1.2.0-1) unstable; urgency=medium +lxqt-config (1.2.0-0ubuntu1) lunar; urgency=medium - * New upstream release. - * Remove unnecessary patch. - * Update d/control indent. - * Update d/copyright format and indent. - * Update d/watch for GitHub. + * New upstream version. + * Fix the watch file, for real this time. + * Lubuntuify the package slightly, to make debhelper happy. + * Bump Standards-version, no changes needed. + * Bump build dependencies in debian/control. + * Drop reverse-applicable patch. + + -- Simon Quigley Fri, 18 Nov 2022 17:09:36 -0600 + +lxqt-config (1.1.0-0ubuntu2) kinetic; urgency=medium - -- ChangZhuo Chen (陳昌倬) Wed, 14 Dec 2022 23:34:14 +0800 + * Enhancements to the theme list. -lxqt-config (1.1.0-3) unstable; urgency=medium + -- Simon Quigley Sat, 11 Jun 2022 14:22:35 -0400 - * Merge to unstable. +lxqt-config (1.1.0-0ubuntu1) kinetic; urgency=medium - -- ChangZhuo Chen (陳昌倬) Sat, 19 Nov 2022 00:08:26 +0800 + * New upstream release. + * Bump build dependencies. + * Remove old Breaks/Replaces since we're past the LTS. + * Add a new entry to the install file. + + -- Simon Quigley Wed, 01 Jun 2022 15:00:38 -0500 -lxqt-config (1.1.0-2) experimental; urgency=medium +lxqt-config (0.17.1-0ubuntu1) impish; urgency=medium - * Upstreamed compatible changes from Ubuntu, modifying the following files: - - control - - copyright - - lintian-overrides - - lxqt-config.install - - patches directory - - README.source - - rules - - upstream/* + * New upstream release 0.17.1 + * Update debian/control + - Bump Standards-Version to 4.5.1 + - Use liblxqt0-dev 0.17.0 + * Rename tag for lintian override + * Update debian/copyright + * Run wrap-and-sort - -- Aaron Rainbolt Thu, 14 Jul 2022 14:22:12 -0500 + -- apt-ghetto Thu, 12 Aug 2021 17:03:12 +0200 -lxqt-config (1.1.0-1) experimental; urgency=medium +lxqt-config (0.16.1-1ubuntu1) hirsute; urgency=medium - * Add debian/salsa-ci.yml file. - * Update debian/upstream/signing-key.asc. - * New upstream version 1.0.0 - * New upstream version 1.1.0 - * Build-deps on liblxqt1-dev (>= 1.1.0~). - * Drop lxqt-config (<< 0.11.0) from Breaks and Replaces. - * lxqt-config.install: ship lxqt-settings-other.directory file. + * New upstream version. + * Updated recommends. + * Bumped debhelper-compat requirement to 13. + * Fixed manpage errors about files existing in debian/tmp but not installed anywhere. - -- Andrew Lee (李健秋) Wed, 13 Jul 2022 23:17:48 +0800 + -- Raman Sarda Sun, 21 Feb 2021 22:44:21 +0530 lxqt-config (0.16.1-1) unstable; urgency=medium @@ -50,6 +55,17 @@ lxqt-config (0.16.1-1) unstable; urgency -- Andrew Lee (李健秋) Wed, 06 Jan 2021 16:09:45 +0800 +lxqt-config (0.15.0-0ubuntu1) groovy; urgency=medium + + * New upstream release. + - Update upstream signing key. + - Bump LXQt build dependencies. + - Add build dependency on libxcb-randr0-dev (Closes: #952266). + * Bump Standards-version to 4.5.0, no changes needed. + * debhelper -> debhelper-compat. + + -- Simon Quigley Thu, 04 Jun 2020 00:42:32 -0500 + lxqt-config (0.14.1-4) unstable; urgency=medium * Added build dependency libxcb-randr0-dev to fix FTBFS in testing and sid. @@ -81,6 +97,13 @@ lxqt-config (0.14.1-1) unstable; urgency -- Alf Gaida Sun, 24 Feb 2019 20:35:48 +0100 +lxqt-config (0.14.1-0ubuntu1) disco; urgency=medium + + * New upstream release. + * Run wrap-and-sort. + + -- Simon Quigley Sat, 09 Mar 2019 12:54:59 -0600 + lxqt-config (0.14.0-1) unstable; urgency=medium * Cherry-picking new upstream version 0.14.0. @@ -98,6 +121,38 @@ lxqt-config (0.14.0-1) unstable; urgency -- Alf Gaida Sun, 27 Jan 2019 17:15:29 +0100 +lxqt-config (0.14.0-0ubuntu1) disco; urgency=medium + + * New upstream release. + - Bump build dependencies. + - Remove unneeded patches. + * Bump debhelper compat to 12, no changes needed. + * Add new lxqt-config-l10n package. + + -- Simon Quigley Sat, 26 Jan 2019 00:07:14 -0600 + +lxqt-config (0.13.0+git20181226-0ubuntu3) disco; urgency=medium + + * Don't recommend lxqt-config-l10n and conflict it at the same time. + + -- Simon Quigley Sat, 05 Jan 2019 15:08:01 -0600 + +lxqt-config (0.13.0+git20181226-0ubuntu2) disco; urgency=medium + + * Add Conflicts/Replaces for lxqt-config-l10n. + + -- Simon Quigley Sun, 30 Dec 2018 17:42:43 -0600 + +lxqt-config (0.13.0+git20181226-0ubuntu1) disco; urgency=medium + + * New upstream Git snapshot. + - Remove reverse-applicable patches. + - Add a patch lowering the LXQt version required. + - Add missing build dependencies. + * Bump Standards-version to 4.3.0, no changes needed. + + -- Simon Quigley Sun, 30 Dec 2018 17:21:31 -0600 + lxqt-config (0.13.0-1) unstable; urgency=medium * Cherry-picking new upstream version 0.13.0. @@ -106,6 +161,42 @@ lxqt-config (0.13.0-1) unstable; urgency -- Alf Gaida Thu, 24 May 2018 20:43:08 +0200 +lxqt-config (0.13.0-0ubuntu5) cosmic; urgency=medium + + * Set default GTK theme if rc file doesn't exists. + + -- Hans P. Möller Thu, 04 Oct 2018 14:44:03 -0300 + +lxqt-config (0.13.0-0ubuntu4) cosmic; urgency=medium + + * Make a path for GTK settings if it does not exist. + + -- Walter Lapchynski Mon, 03 Sep 2018 00:43:25 -7000 + +lxqt-config (0.13.0-0ubuntu3) cosmic; urgency=medium + + * Run wrap-and-sort. + * Demote qt5-style-plugins to a Suggests, because some of the themes are not + working (LP: #1785401). + + -- Simon Quigley Thu, 09 Aug 2018 14:24:44 -0500 + +lxqt-config (0.13.0-0ubuntu2) cosmic; urgency=medium + + * Bump Standards-version to 4.1.5, no changes needed. + * Change Uploaders to Ubuntu uploaders. + * Add support for modifying GTK themes. + + -- Simon Quigley Mon, 30 Jul 2018 16:35:02 -0500 + +lxqt-config (0.13.0-0ubuntu1) cosmic; urgency=medium + + * New upstream release. + * Update Vcs-* and Maintainer to Lubuntu values. + * Update build dependencies. + + -- Simon Quigley Tue, 22 May 2018 23:25:36 -0500 + lxqt-config (0.12.0-4) unstable; urgency=medium * Bumped compat to 11 @@ -276,3 +367,4 @@ lxqt-config (0.9.0+20150806-1) unstable; * Added README.source -- mention for License. -- Yukiharu YABUKI Fri, 21 Aug 2015 19:40:47 +0900 + diff -pruN 1.2.0-1/debian/control 1.2.0-0ubuntu1/debian/control --- 1.2.0-1/debian/control 2022-12-10 04:25:15.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/control 2022-11-18 21:04:23.000000000 +0000 @@ -1,17 +1,13 @@ Source: lxqt-config -Maintainer: LXQt Packaging Team -Uploaders: Alf Gaida , - ChangZhuo Chen (陳昌倬) , - Andrew Lee (李健秋) , - Yukiharu YABUKI , - Simon Quigley , - Aaron Rainbolt +Maintainer: Lubuntu Developers +XSBC-Original-Maintainer: LXQt Packaging Team +Uploaders: Simon Quigley Section: x11 Priority: optional Build-Depends: debhelper-compat (= 13), libkf5screen-dev, libkf5windowsystem-dev, - liblxqt1-dev (>= 1.2.0~), + liblxqt1-dev (>= 1.2.0), libqt5svg5-dev, libqt5x11extras5-dev, libx11-dev, @@ -23,36 +19,34 @@ Build-Depends: debhelper-compat (= 13), xserver-xorg-input-libinput-dev, zlib1g-dev Standards-Version: 4.6.1 -Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-config -Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-config.git +Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-config-packaging +Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-config-packaging.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-config +XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-config.git Homepage: https://github.com/lxqt/lxqt-config -Rules-Requires-Root: no Package: lxqt-config Architecture: any -Depends: ${misc:Depends}, - ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: galternatives, lxqt-config-l10n, lxqt-policykit, lxqt-powermanagement, lxqt-qtplugin, lxqt-session, - qt5-style-plugins, - system-config-printer, - xsettingsd + system-config-printer Suggests: adwaita-qt, + cmst [linux-any] | network-manager-gnome [linux-any], faenza-icon-theme, gnome-themes-standard, gparted | partitionmanager [linux-any], - cmst [linux-any] | network-manager-gnome [linux-any], - lxqt | lxqt-core, lxappearance, + lxqt | lxqt-core, obconf-qt, + qt5-style-plugins, synaptic Description: LXQt system settings center - The LXQt system settings center which summarizes all configuration tools as - well as counterparts of other LXQt components or third-party applications. + The LXQt system settings center . This package contain the LXQt configuration ui. @@ -60,9 +54,6 @@ Package: lxqt-config-l10n Architecture: all Multi-Arch: foreign Section: localization -Depends: ${misc:Depends}, qttranslations5-l10n +Depends: qttranslations5-l10n, ${misc:Depends} Description: Language package for lxqt-config - The LXQt system settings center which summarizes all configuration tools as - well as counterparts of other LXQt components or third-party applications. - . - This package contains the l10n files needed by the lxqt-config. + This package contains the l10n files needed by lxqt-config. diff -pruN 1.2.0-1/debian/copyright 1.2.0-0ubuntu1/debian/copyright --- 1.2.0-1/debian/copyright 2022-12-10 04:22:07.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/copyright 2022-11-18 20:43:20.000000000 +0000 @@ -3,11 +3,11 @@ Upstream-Name: lxqt-config Source: https://github.com/lxqt/lxqt-config Files: * -Copyright: 2010-2012 Razor team - 2012-2022 LXQt team - 2013 Christian Surlykke - 2014 Hong Jen Yee (PCMan) - 2014 Luís Pereira +Copyright: 2012-2020, LXQt team + 2010-2012, Razor team + 2013, Christian Surlykke + 2014, Hong Jen Yee (PCMan) + 2014, Luís Pereira License: LGPL-2.1+ Files: lxqt-config-appearance/iconthemeinfo.cpp @@ -65,17 +65,17 @@ Files: lxqt-config-input/touchpadconfig. lxqt-config-input/touchpadconfig.h lxqt-config-input/touchpaddevice.cpp lxqt-config-input/touchpaddevice.h -Copyright: 2016-2018 Chih-Hsuan Yen +Copyright: 2016-2018, Chih-Hsuan Yen License: GPL-2.0+ Files: lxqt-config-locale/combobox.h -Copyright: 2018 Pedram Pourang +Copyright: 2018, Pedram Pourang License: GPL-2.0+ Files: lxqt-config-locale/localeconfig.cpp lxqt-config-locale/localeconfig.h -Copyright: 2014 LXQt team - 2014 Sebastian Kügler +Copyright: 2014, LXQt team + 2014, Sebastian Kügler License: GPL-2.0+ Files: lxqt-config-monitor/fastmenu.cpp @@ -98,7 +98,7 @@ Files: lxqt-config-monitor/fastmenu.cpp lxqt-config-monitor/settingsdialog.h lxqt-config-monitor/timeoutdialog.cpp lxqt-config-monitor/timeoutdialog.h -Copyright: 2014-2016, 2019 P.L. Lucas +Copyright: 2014-2016, 2019, P.L. Lucas 2014 Hong Jen Yee (PCMan) License: GPL-2.0+ @@ -112,7 +112,7 @@ License: LGPL-2.1+ Files: lxqt-config-brightness/brightnesswatcher.cpp lxqt-config-brightness/brightnesswatcher.h -Copyright: 2020 Luís Pereira +Copyright: 2020, Luís Pereira License: GPL-2.0+ Files: lxqt-config-brightness/xrandrbrightness.* @@ -123,7 +123,6 @@ License: LGPL-2.0+ Files: debian/* Copyright: 2014-2018 Alf Gaida 2015 Andrew Lee (李健秋) - 2022 Lubuntu Developers License: LGPL-2.1+ License: LGPL-2.0+ diff -pruN 1.2.0-1/debian/gbp.conf 1.2.0-0ubuntu1/debian/gbp.conf --- 1.2.0-1/debian/gbp.conf 2022-12-10 04:03:42.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -[DEFAULT] -debian-branch = debian/sid -upstream-branch = upstream/latest -pristine-tar = True -compression = xz - diff -pruN 1.2.0-1/debian/lintian-overrides 1.2.0-0ubuntu1/debian/lintian-overrides --- 1.2.0-1/debian/lintian-overrides 2022-12-10 04:03:42.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/lintian-overrides 2022-11-18 20:43:20.000000000 +0000 @@ -1,24 +1,15 @@ # there will be no man-pages in a foreseeable future -lxqt-config: no-manual-page [usr/bin/lxqt-config-brightness] -lxqt-config: no-manual-page [usr/bin/lxqt-config-file-associations] -lxqt-config: no-manual-page [usr/bin/lxqt-config-input] -lxqt-config: no-manual-page [usr/bin/lxqt-config-locale] -lxqt-config: no-manual-page [usr/bin/lxqt-config-monitor] +lxqt-config: no-manual-page usr/bin/lxqt-config-brightness +lxqt-config: no-manual-page usr/bin/lxqt-config-file-associations +lxqt-config: no-manual-page usr/bin/lxqt-config-input +lxqt-config: no-manual-page usr/bin/lxqt-config-locale +lxqt-config: no-manual-page usr/bin/lxqt-config-monitor # not a bug, LXQt has not reached free-desktop yet -lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-appearance.desktop] -lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-brightness.desktop] -lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-file-associations.desktop] -lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-input.desktop] -lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-locale.desktop] -lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-monitor.desktop] -lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config.desktop] - -# there's no need for a keywords entry in the desktop files -lxqt-config: desktop-entry-lacks-keywords-entry [usr/share/applications/lxqt-config-appearance.desktop] -lxqt-config: desktop-entry-lacks-keywords-entry [usr/share/applications/lxqt-config-brightness.desktop] -lxqt-config: desktop-entry-lacks-keywords-entry [usr/share/applications/lxqt-config-file-associations.desktop] -lxqt-config: desktop-entry-lacks-keywords-entry [usr/share/applications/lxqt-config-input.desktop] -lxqt-config: desktop-entry-lacks-keywords-entry [usr/share/applications/lxqt-config-locale.desktop] -lxqt-config: desktop-entry-lacks-keywords-entry [usr/share/applications/lxqt-config-monitor.desktop] -lxqt-config: desktop-entry-lacks-keywords-entry [usr/share/applications/lxqt-config.desktop] +lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-appearance.desktop +lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-brightness.desktop +lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-file-associations.desktop +lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-input.desktop +lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-locale.desktop +lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-monitor.desktop +lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config.desktop diff -pruN 1.2.0-1/debian/manpages 1.2.0-0ubuntu1/debian/manpages --- 1.2.0-1/debian/manpages 2022-12-10 04:03:42.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/manpages 2022-11-18 20:43:20.000000000 +0000 @@ -1,3 +1,3 @@ -usr/share/man/man1/lxqt-config.1 usr/share/man/man1/lxqt-config-appearance.1 usr/share/man/man1/lxqt-config-mouse.1 +usr/share/man/man1/lxqt-config.1 diff -pruN 1.2.0-1/debian/rules 1.2.0-0ubuntu1/debian/rules --- 1.2.0-1/debian/rules 2022-12-10 04:03:42.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/rules 2022-11-18 20:43:20.000000000 +0000 @@ -2,30 +2,17 @@ # export DH_VERBOSE=1 export LC_ALL=C.UTF-8 +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed export DEB_BUILD_MAINT_OPTIONS = hardening=+all -include /usr/share/dpkg/architecture.mk - -ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) - CONF_FLAGS += -DWITH_TOUCHPAD=NO -endif - -ifeq ($(DEB_HOST_ARCH_OS), hurd) - CONF_FLAGS += -DWITH_TOUCHPAD=NO -endif - - %: dh ${@} --buildsystem cmake -override_dh_missing: - dh_missing --fail-missing - -override_dh_makeshlibs: - dh_makeshlibs -Xlxqt-config - override_dh_auto_configure: dh_auto_configure -- \ + -DPULL_TRANSLATIONS=OFF \ -DUPDATE_TRANSLATIONS=OFF \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - $(CONF_FLAGS) + -DCMAKE_BUILD_TYPE=RelWithDebInfo + +override_dh_makeshlibs: + dh_makeshlibs -Xlxqt-config diff -pruN 1.2.0-1/debian/salsa-ci.yml 1.2.0-0ubuntu1/debian/salsa-ci.yml --- 1.2.0-1/debian/salsa-ci.yml 2022-12-10 04:03:42.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -# For more information on what jobs are run see: -# https://salsa.debian.org/salsa-ci-team/pipeline -# -# To enable the jobs, go to your repository (at salsa.debian.org) -# and click over Settings > CI/CD > Expand (in General pipelines). -# In "Custom CI config path" write debian/salsa-ci.yml and click -# in "Save Changes". The CI tests will run after the next commit. ---- -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml - diff -pruN 1.2.0-1/debian/upstream/metadata 1.2.0-0ubuntu1/debian/upstream/metadata --- 1.2.0-1/debian/upstream/metadata 2022-12-10 04:03:42.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -Name: lxqt-config -Bug-Database: https://github.com/lxqt/lxqt-config/issues -Bug-Submit: https://github.com/lxqt/lxqt-config/issues/new -Changelog: https://github.com/lxqt/lxqt-config/blob/master/CHANGELOG -Repository: https://github.com/lxqt/lxqt-config diff -pruN 1.2.0-1/debian/watch 1.2.0-0ubuntu1/debian/watch --- 1.2.0-1/debian/watch 2022-12-10 04:22:07.000000000 +0000 +++ 1.2.0-0ubuntu1/debian/watch 2022-11-18 20:45:08.000000000 +0000 @@ -1,6 +1,5 @@ version=4 - -# See https://davesteele.github.io/development/2015/05/02/debian-watch-file-format-for-signed-github-source-tars/ for GitHub workaround for releases page. - -opts="downloadurlmangle=s/archive\/refs\/tags\/(.*)\.tar\.gz/releases\/download\/$1\/@PACKAGE@-$1\.tar\.xz/,filenamemangle=s/([\d\.]+)\.tar\.gz/@PACKAGE@-$1\.tar\.xz/,pgpsigurlmangle=s/$/.asc/" \ -https://github.com/lxqt/@PACKAGE@/tags .*/([\d\.]+)\.tar\.gz +opts="searchmode=plain, \ +pgpsigurlmangle=s/$/.asc/, \ +uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \ + https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz