Lubuntu/lxqt-panel-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some fixes and debian $foo

Browse Source 
* Ported back USE_MENU_CACHE handling
* Removed build dependency on libmenu-cache-dev (Closes: #896512)
* Ported back USE_MENU_CACHE handling
* Moved lxqt-about from dependencies to recommends (Closes: #894640)
* Bumped debhelper version to 11~
* Bumped compat to 11
* Bumped Standards to 4.1.4, no changes needed
* Fixed VCS fields for salsa
* Removed trailing whitespaces
This commit is contained in:
Alf Gaida 2018-04-23 19:47:50 +02:00
parent 09e311a9a7
commit 95428aed4d
6 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
debian/changelog vendored
View File

@ -1,6 +1,20 @@
lxqt-panel (0.12.0-9) unstable; urgency=medium
* Ported back USE_MENU_CACHE handling
* Removed build dependency on libmenu-cache-dev (Closes: #896512)
* Ported back USE_MENU_CACHE handling
* Moved lxqt-about from dependencies to recommends (Closes: #894640)
* Bumped debhelper version to 11~
* Bumped compat to 11
* Bumped Standards to 4.1.4, no changes needed
* Fixed VCS fields for salsa
* Removed trailing whitespaces
-- Alf Gaida <agaida@siduction.org> Mon, 23 Apr 2018 19:47:29 +0200
lxqt-panel (0.12.0-8) unstable; urgency=medium
* Fix plugin-volume, use pavucontrol-qt (Closes: #884547)
* Fix plugin-volume, use pavucontrol-qt (Closes: #884547)
-- Alf Gaida <agaida@siduction.org> Sat, 16 Dec 2017 18:36:45 +0100
@ -20,7 +34,7 @@ lxqt-panel (0.12.0-6) unstable; urgency=medium
lxqt-panel (0.12.0-5) experimental; urgency=medium
* Ported back the config move to /usr/share/xdg (Closes: #883034)
* Ported back the config move to /usr/share/xdg (Closes: #883034)
-- Alf Gaida <agaida@siduction.org> Sat, 02 Dec 2017 03:23:04 +0100

2
debian/compat vendored
View File

@ -1 +1 @@
10
11

15
debian/control vendored
View File

@ -5,7 +5,7 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
Andrew Lee (李健秋) <ajqlee@debian.org>
Section: x11
Priority: optional
Build-Depends: debhelper (>= 10),
Build-Depends: debhelper (>= 11~),
libasound2-dev,
libdbusmenu-qt5-dev,
libglib2.0-dev,
@ -15,7 +15,6 @@ Build-Depends: debhelper (>= 10),
liblxqt0-dev (>= 0.12.0),
liblxqt-globalkeys0-dev (>= 0.12.0),
liblxqt-globalkeys-ui0-dev (>= 0.12.0),
libmenu-cache-dev,
libpulse-dev,
libqt5svg5-dev,
libqt5x11extras5-dev,
@ -31,19 +30,19 @@ Build-Depends: debhelper (>= 10),
libxkbcommon-dev,
libxkbcommon-x11-dev,
libxrender-dev
Standards-Version: 4.1.2
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-panel.git
Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-panel.git
Homepage: https://github.com/lxde/lxqt-panel
Standards-Version: 4.1.4
Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-panel
Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-panel.git
Homepage: https://github.com/lxqt/lxqt-panel
Package: lxqt-panel
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
lxmenu-data,
lxqt-about,
lxqt-policykit
Recommends: lxqt-config,
Recommends: lxqt-about,
lxqt-config,
lxqt-notificationd,
lxqt-panel-l10n,
lxqt-qtplugin,

2
debian/copyright vendored
View File

@ -8,7 +8,7 @@ Copyright: 2012-2017 LXQt team
License: LGPL-2.1+
Files: debian/*
Copyright: 2014-2017 Alf Gaida <agaida@siduction.org>
Copyright: 2014-2018 Alf Gaida <agaida@siduction.org>
2015 Andrew Lee (李健秋) <ajqlee@debian.org>
License: LGPL-2.1+

1
debian/patches/series vendored
View File

@ -1,3 +1,4 @@
clock-and-volume.patch
move-configs.patch
plugin-volume-mixer.patch
use-menu-cache.patch

28
debian/patches/use-menu-cache.patch vendored Normal file
View File

@ -0,0 +1,28 @@
Description: Make menu-cache optional
Backport from upstream
Last-Update: 2018-04-23
--- lxqt-panel-0.12.0.orig/CMakeLists.txt
+++ lxqt-panel-0.12.0/CMakeLists.txt
@@ -4,6 +4,9 @@ project(lxqt-panel)
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
option(PULL_TRANSLATIONS "Pull translations" ON)
option(WITH_SCREENSAVER_FALLBACK "Include support for converting the deprecated 'screensaver' plugin to 'quicklaunch'. This requires the lxqt-leave (lxqt-session) to be installed in runtime." ON)
+# plugin-mainmenu
+option(USE_MENU_CACHE "Use menu-cached (no noticable penalty even on a 2004 single core pentium if not used)" OFF)
+
# additional cmake files
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
--- lxqt-panel-0.12.0.orig/plugin-mainmenu/CMakeLists.txt
+++ lxqt-panel-0.12.0/plugin-mainmenu/CMakeLists.txt
@@ -20,7 +20,7 @@ set(UIS
# optionally use libmenu-cache to generate the application menu
-if(NOT WITHOUT_MENU_CACHE)
+if(USE_MENU_CACHE)
find_package(MenuCache "0.3.3")
endif()