diff --git a/debian/changelog b/debian/changelog index e297ff4..d039fcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +lxqt-panel (0.16.1-1ubuntu1) hirsute; urgency=medium + + * New upstream version. Merge from debian unstable. + * Tighten debhelper-compat requirement. + * Updated dependencies. + * Updated debian/rules. + + -- Raman Sarda Mon, 22 Feb 2021 02:37:32 +0530 + +lxqt-panel (0.16.1-1) unstable; urgency=medium + + [ Alf Gaida ] + * Switched to gbp + * Bumped Standards-Version to 4.4.0, no changes needed + * improved debian/rules + + [ Andrew Lee (李健秋) ] + * New upstream release. (Closes: #916105, #953154, #978204) + + -- Andrew Lee (李健秋) Wed, 06 Jan 2021 18:30:22 +0800 + lxqt-panel (0.15.0-0ubuntu1) groovy; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 6cf5a44..9826f16 100644 --- a/debian/control +++ b/debian/control @@ -4,22 +4,23 @@ XSBC-Original-Maintainer: LXQt Packaging Team Section: x11 Priority: optional -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), libasound2-dev, libdbusmenu-qt5-dev, libglib2.0-dev, libicu-dev, libkf5solid-dev, libkf5windowsystem-dev, - liblxqt-globalkeys-ui0-dev (>= 0.15.0), - liblxqt-globalkeys0-dev (>= 0.15.0), liblxqt0-dev (>= 0.15.0), + libkf5solid-dev, + liblxqt-globalkeys0-dev (>= 0.16.0~), + liblxqt-globalkeys-ui0-dev (>= 0.16.0~), libpulse-dev, libqt5svg5-dev, libqt5x11extras5-dev, libsensors4-dev [!hurd-any], libstatgrab-dev [linux-any], - libsysstat-qt5-0-dev (>= 0.4.3), + libsysstat-qt5-0-dev (>= 0.4.4~), libx11-dev, libxcb-damage0-dev, libxcb-util0-dev, diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..8957fee --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,6 @@ +[DEFAULT] +debian-branch = debian/sid +upstream-branch = upstream/latest +pristine-tar = True +compression = xz + diff --git a/debian/rules b/debian/rules index 8889c1e..ccd9c70 100755 --- a/debian/rules +++ b/debian/rules @@ -5,16 +5,17 @@ export LC_ALL=C.UTF-8 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed export DEB_BUILD_MAINT_OPTIONS = hardening=+all -WHICH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) +include /usr/share/dpkg/architecture.mk -ifeq ($(WHICH_OS), kfreebsd) - NOT_LINUX := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO +ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) + CONF_FLAGS := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO endif -ifeq ($(WHICH_OS), hurd) - NOT_LINUX := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO -DSENSORS_PLUGIN=NO +ifeq ($(DEB_HOST_ARCH_OS), hurd) + CONF_FLAGS := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO -DSENSORS_PLUGIN=NO endif + %: dh ${@} --buildsystem cmake @@ -27,4 +28,4 @@ override_dh_auto_configure: -DUPDATE_TRANSLATIONS=OFF \ -DDOM_PLUGIN=YES \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - $(NOT_LINUX) + $(CONF_FLAGS)