Merge branch 'debian/experimental' into debian/sid

debian/changelog

@@ -1,3 +1,44 @@
+lxqt-panel (0.12.0-5) experimental; urgency=medium
+
+  * Ported back the config move to /usr/share/xdg (Closes: #883034) 
+
+ -- Alf Gaida <agaida@siduction.org>  Sat, 02 Dec 2017 03:23:04 +0100
+
+lxqt-panel (0.12.0-4) experimental; urgency=medium
+
+  * Ported back some cosmetics (volume % and clock size)
+    (Closes: #880150)
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 05 Nov 2017 01:49:39 +0100
+
+lxqt-panel (0.12.0-3) experimental; urgency=medium
+
+  * Fixed host OS query in rules - we really want to know the system
+    instead of set it
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 29 Oct 2017 21:27:27 +0100
+
+lxqt-panel (0.12.0-2) experimental; urgency=medium
+
+  * Added missed breaks and replaces for lxqt-common << 0.12.0
+    (Closes: #879910) - Thanks Andreas Beckmann <anbe@debian.org>
+  * Time off fixed upstream (Closes: #855379)
+
+ -- Alf Gaida <agaida@siduction.org>  Fri, 27 Oct 2017 23:27:44 +0200
+
+lxqt-panel (0.12.0-1) experimental; urgency=medium
+
+  * Cherry-picking upstream release 0.12.0.
+  * Switched to experimental
+  * Bumped liblxqt0-dev to >= 0.12.0
+  * Bumped liblxqt-globalkeys0-dev to >= 0.12.0
+  * Bumped liblxqt-globalkeys-ui0-dev to >= 0.12.0
+  * Bumped libsysstat-qt5-0-dev to >= 0.4.0
+  * Bumped Standards to 4.1.1 - no changes needed
+  * Removed patches - patch was taken from upstream
+
+ -- Alf Gaida <agaida@siduction.org>  Tue, 24 Oct 2017 22:32:05 +0200
+
 lxqt-panel (0.11.1-4) unstable; urgency=medium
 
   * Removed some not needed versions from build dependencies

debian/control

@@ -12,16 +12,16 @@ Build-Depends: debhelper (>= 10),
                libicu-dev,
                libkf5windowsystem-dev,
                libkf5solid-dev,
-               liblxqt0-dev,
+               liblxqt0-dev (>= 0.12.0),
-               liblxqt-globalkeys0-dev,
+               liblxqt-globalkeys0-dev (>= 0.12.0),
-               liblxqt-globalkeys-ui0-dev,
+               liblxqt-globalkeys-ui0-dev (>= 0.12.0),
                libmenu-cache-dev,
                libpulse-dev,
                libqt5svg5-dev,
                libqt5x11extras5-dev,
                libsensors4-dev [!hurd-any],
                libstatgrab-dev [linux-any],
-               libsysstat-qt5-0-dev,
+               libsysstat-qt5-0-dev (>= 0.4.0),
                libx11-dev,
                libxcomposite-dev,
                libxcb-util0-dev,
@@ -31,9 +31,9 @@ Build-Depends: debhelper (>= 10),
                libxkbcommon-dev,
                libxkbcommon-x11-dev,
                libxrender-dev
-Standards-Version: 4.1.0
+Standards-Version: 4.1.1
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-panel.git/?h=debian/sid
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-panel.git/?h=debian/experimental
-Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-panel.git -b debian/sid
+Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-panel.git -b debian/experimental
 Homepage: https://github.com/lxde/lxqt-panel
 
 Package: lxqt-panel
@@ -52,6 +52,8 @@ Recommends: lxqt-config,
             pavucontrol-qt | pavucontrol,
             qlipper
 Suggests: lxqt | lxqt-core
+Breaks: lxqt-common (<< 0.12.0)
+Replaces: lxqt-common (<< 0.12.0)
 Description: LXQt desktop panel
  The LXQt desktop panel
  .

debian/patches/clock-and-volume.patch

@@ -0,0 +1,31 @@
+Description: some cosmetics backported
+ - display volume percent 
+ - fix worldclock size
+
+Author: Alf Gaida <agaida@siduction.org>
+Last-Update: 2017-11-05
+
+--- lxqt-panel-0.12.0.orig/plugin-volume/lxqtvolume.cpp
++++ lxqt-panel-0.12.0/plugin-volume/lxqtvolume.cpp
+@@ -286,7 +286,7 @@ void LXQtVolume::showNotification(bool f
+             if (m_defaultSink->mute())
+                 m_notification->setSummary(tr("Volume: muted"));
+             else
+-                m_notification->setSummary(tr("Volume: %1").arg(QString::number(m_defaultSink->volume())));
++                m_notification->setSummary(tr("Volume: %1%").arg(QString::number(m_defaultSink->volume())));
+             m_notification->update();
+         }
+     }
+--- lxqt-panel-0.12.0.orig/plugin-worldclock/lxqtworldclock.cpp
++++ lxqt-panel-0.12.0/plugin-worldclock/lxqtworldclock.cpp
+@@ -132,7 +132,10 @@ void LXQtWorldClock::updateTimeText()
+ 
+     if (!isUpToDate)
+     {
++        const QSize old_size = mContent->sizeHint();
+         mContent->setText(tzNow.toString(preformat(mFormat, timeZone, tzNow)));
++        if (old_size != mContent->sizeHint())
++            mRotatedWidget->adjustContentSize();
+         mRotatedWidget->update();
+         updatePopupContent();
+     }

debian/patches/fix-explicit.patch

@@ -1,23 +0,0 @@
-Description: Fixes #873599 FTBFS explicit
- No further action needed, patch was taken with description from
- upstream and can disappear with the next release.
-Last-Update: 2017-09-03
-
---- lxqt-panel-0.11.1.orig/plugin-kbindicator/src/x11/kbdlayout.cpp
-+++ lxqt-panel-0.11.1/plugin-kbindicator/src/x11/kbdlayout.cpp
-@@ -33,8 +33,15 @@
- 
- #include <xkbcommon/xkbcommon-x11.h>
- #include <xcb/xcb.h>
-+
-+// Note: We need to override "explicit" as this is a C++ keyword. But it is
-+// used as variable name in xkb.h. This is causing a failure in C++ compile
-+// time.
-+// Similar bug here: https://bugs.freedesktop.org/show_bug.cgi?id=74080
- #define explicit _explicit
- #include <xcb/xkb.h>
-+#undef explicit
-+
- #include "../kbdinfo.h"
- #include "../controls.h"
- 

debian/patches/move-configs.patch

@@ -0,0 +1,22 @@
+From 9d857d1871b1c9e3b988412d691e9dfba4a14f6d Mon Sep 17 00:00:00 2001
+From: Alf Gaida <agaida@siduction.org>
+Date: Wed, 29 Nov 2017 01:00:07 +0100
+Subject: [PATCH] move panel config to /usr/share/lxqt
+
+---
+ panel/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt
+index 5a322a3e..522c1ffc 100644
+--- a/panel/CMakeLists.txt
++++ b/panel/CMakeLists.txt
+@@ -114,7 +114,7 @@ target_link_libraries(${PROJECT}
+ )
+ 
+ install(TARGETS ${PROJECT} RUNTIME DESTINATION bin)
+-install(FILES ${CONFIG_FILES} DESTINATION ${LXQT_ETC_XDG_DIR}/lxqt)
++install(FILES ${CONFIG_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/lxqt)
+ install(FILES ${PUB_HEADERS} DESTINATION include/lxqt)
+ install(FILES
+     man/lxqt-panel.1

debian/patches/series

@@ -1 +1,2 @@
-fix-explicit.patch
+clock-and-volume.patch
+move-configs.patch

debian/rules

@@ -5,13 +5,13 @@ export LC_ALL=C.UTF-8
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
+WHICH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
 
-ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+ifeq ($(WHICH_OS), kfreebsd)
     NOT_LINUX := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO
 endif
 
-ifeq ($(DEB_HOST_ARCH_OS), hurd)
+ifeq ($(WHICH_OS), hurd)
     NOT_LINUX := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO -DSENSORS_PLUGIN=NO
 endif