Package: awesome Version: 4.0-1 Severity: wishlist Tags: patch Dear Maintainer,
upstream has released version 4.1. The attached patches update the debian packaging for that version. Best regards, Julian Wollrath -- System Information: Debian Release: 9.0 APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 -- () ascii ribbon campaign - against html e-mail /\ - against proprietary attachments
From b23927006592b80b83541c274c00c092d56ffaf2 Mon Sep 17 00:00:00 2001 From: Julian Wollrath <jwollr...@web.de> Date: Sun, 19 Mar 2017 10:51:51 +0100 Subject: [PATCH 1/6] Run wrap-and-sort --- debian/awesome.install | 2 +- debian/control | 72 +++++++++++++++++++++++++------------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/debian/awesome.install b/debian/awesome.install index e50e2c74..7ff29bf2 100644 --- a/debian/awesome.install +++ b/debian/awesome.install @@ -1,2 +1,2 @@ -debian/awesome.xpm usr/share/pixmaps debian/55awesome-javaworkaround /etc/X11/Xsession.d +debian/awesome.xpm usr/share/pixmaps diff --git a/debian/control b/debian/control index 43fb79f1..7a6c1ed3 100644 --- a/debian/control +++ b/debian/control @@ -3,34 +3,34 @@ Section: x11 Priority: optional Maintainer: Julien Danjou <a...@debian.org> Uploaders: Arnaud Fontaine <ar...@debian.org> -Build-Depends: debhelper (>= 9), - libcairo2-dev, - xmlto, - asciidoc, - cmake (>= 2.6.0), - lua5.1, - lua-ldoc, - libxcb-xtest0-dev, - libxcb-icccm4-dev (>= 0.3.8), - libxcb-randr0-dev (>= 0.3.0), - libxcb-keysyms1-dev (>= 0.3.4), - libxcb-xinerama0-dev, - liblua5.1-dev, - libdbus-1-dev, - libxdg-basedir-dev (>= 1.0.0), - libstartup-notification0-dev (>= 0.10), - imagemagick, - libxcb1-dev (>= 1.6), - libxcb-shape0-dev, - libxcb-util0-dev, - libxcb-cursor-dev (>= 0.1.0-2), - libgdk-pixbuf2.0-dev, - libglib2.0-dev, - libxcb-xrm-dev, - libxcb-xkb-dev, - libxkbcommon-x11-dev, - libxkbcommon-dev, - lua-lgi (>= 0.7.0), +Build-Depends: asciidoc, + cmake (>= 2.6.0), + debhelper (>= 9), + imagemagick, + libcairo2-dev, + libdbus-1-dev, + libgdk-pixbuf2.0-dev, + libglib2.0-dev, + liblua5.1-dev, + libstartup-notification0-dev (>= 0.10), + libxcb-cursor-dev (>= 0.1.0-2), + libxcb-icccm4-dev (>= 0.3.8), + libxcb-keysyms1-dev (>= 0.3.4), + libxcb-randr0-dev (>= 0.3.0), + libxcb-shape0-dev, + libxcb-util0-dev, + libxcb-xinerama0-dev, + libxcb-xkb-dev, + libxcb-xrm-dev, + libxcb-xtest0-dev, + libxcb1-dev (>= 1.6), + libxdg-basedir-dev (>= 1.0.0), + libxkbcommon-dev, + libxkbcommon-x11-dev, + lua-ldoc, + lua-lgi (>= 0.7.0), + lua5.1, + xmlto Standards-Version: 3.9.7 Homepage: http://awesome.naquadah.org Vcs-Git: git://anonscm.debian.org/collab-maint/awesome.git @@ -38,14 +38,14 @@ Vcs-Browser: http://anonscm.debian.org/git/collab-maint/awesome.git Package: awesome Architecture: any -Recommends: x11-xserver-utils, rlwrap, feh -Depends: ${shlibs:Depends}, - ${misc:Depends}, - menu, - dbus-x11, - lua-lgi (>= 0.7.0), - gir1.2-freedesktop, - gir1.2-pango-1.0 +Recommends: feh, rlwrap, x11-xserver-utils +Depends: dbus-x11, + gir1.2-freedesktop, + gir1.2-pango-1.0, + lua-lgi (>= 0.7.0), + menu, + ${misc:Depends}, + ${shlibs:Depends} Provides: x-window-manager Description: highly configurable X window manager awesome manages windows dynamically in floating or tiled layouts. It is -- 2.11.0
From 4540e01a36973244413e14a282afd5f756349a31 Mon Sep 17 00:00:00 2001
From: Julian Wollrath <jwollr...@web.de>
Date: Sun, 19 Mar 2017 11:14:28 +0100
Subject: [PATCH 2/6] Update build dependencies
---
debian/control | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index 7a6c1ed3..3287d0a2 100644
--- a/debian/control
+++ b/debian/control
@@ -12,24 +12,27 @@ Build-Depends: asciidoc,
libgdk-pixbuf2.0-dev,
libglib2.0-dev,
liblua5.1-dev,
+ libpango1.0-dev,
libstartup-notification0-dev (>= 0.10),
- libxcb-cursor-dev (>= 0.1.0-2),
+ libx11-xcb-dev,
+ libxcb-cursor-dev,
libxcb-icccm4-dev (>= 0.3.8),
libxcb-keysyms1-dev (>= 0.3.4),
- libxcb-randr0-dev (>= 0.3.0),
+ libxcb-randr0-dev,
libxcb-shape0-dev,
- libxcb-util0-dev,
+ libxcb-util0-dev (>= 0.3.8),
libxcb-xinerama0-dev,
libxcb-xkb-dev,
libxcb-xrm-dev,
libxcb-xtest0-dev,
- libxcb1-dev (>= 1.6),
libxdg-basedir-dev (>= 1.0.0),
libxkbcommon-dev,
libxkbcommon-x11-dev,
+ lua-discount,
lua-ldoc,
- lua-lgi (>= 0.7.0),
+ lua-lgi (>= 0.8.0),
lua5.1,
+ x11proto-core-dev (>= 7.0.15),
xmlto
Standards-Version: 3.9.7
Homepage: http://awesome.naquadah.org
--
2.11.0
From bd5c408ad03baaa6278e60486011bd418c2eeb9d Mon Sep 17 00:00:00 2001
From: Julian Wollrath <jwollr...@web.de>
Date: Sun, 19 Mar 2017 11:55:00 +0100
Subject: [PATCH 3/6] Bump required lua-lgi version to at least 0.8.0
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 3287d0a2..a08dd57b 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Recommends: feh, rlwrap, x11-xserver-utils
Depends: dbus-x11,
gir1.2-freedesktop,
gir1.2-pango-1.0,
- lua-lgi (>= 0.7.0),
+ lua-lgi (>= 0.8.0),
menu,
${misc:Depends},
${shlibs:Depends}
--
2.11.0
From 00b06ae91c05a03244fb4ce884c3b55630644b83 Mon Sep 17 00:00:00 2001
From: Julian Wollrath <jwollr...@web.de>
Date: Sun, 19 Mar 2017 11:21:25 +0100
Subject: [PATCH 4/6] Drop remove_useless_build_lgi_check.patch
---
debian/patches/remove_useless_build_lgi_check.patch | 19 -------------------
debian/patches/series | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 debian/patches/remove_useless_build_lgi_check.patch
diff --git a/debian/patches/remove_useless_build_lgi_check.patch b/debian/patches/remove_useless_build_lgi_check.patch
deleted file mode 100644
index e5122d31..00000000
--- a/debian/patches/remove_useless_build_lgi_check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Disable lgi check at build time (only used at runtime)
- Another solution would be to AWESOME_IGNORE_LGI=1 at all targets, but
- it would cluttered unnecessarily debian/rules.
-Forwarded: not-needed
-Author: Arnaud Fontaine <ar...@debian.org>
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -134,10 +134,6 @@
- ${AWESOME_REQUIRED_LDFLAGS}
- ${AWESOME_OPTIONAL_LDFLAGS})
-
--# check for lgi and the needed gobject introspection files
--add_custom_target(lgi-check ALL
-- COMMAND ${SOURCE_DIR}/build-utils/lgi-check.sh)
--
- # {{{ Generated sources
- # atoms
- file(MAKE_DIRECTORY ${BUILD_DIR}/common)
diff --git a/debian/patches/series b/debian/patches/series
index 73bd3dd5..02201e1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
install-and-debian-menu
-remove_useless_build_lgi_check.patch
--
2.11.0
From e330713785c8be3be11ac2e4346c86844a01f6c6 Mon Sep 17 00:00:00 2001
From: Julian Wollrath <jwollr...@web.de>
Date: Sun, 19 Mar 2017 11:01:40 +0100
Subject: [PATCH 5/6] Refresh install-and-debian-menu
---
debian/patches/install-and-debian-menu | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/debian/patches/install-and-debian-menu b/debian/patches/install-and-debian-menu
index eb26218d..ca7adb2a 100644
--- a/debian/patches/install-and-debian-menu
+++ b/debian/patches/install-and-debian-menu
@@ -14,9 +14,11 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f963539a..a15c12e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -35,8 +35,7 @@
+@@ -32,8 +32,7 @@ set(AWE_DOC_DIR ${BUILD_DIR}/docs)
set(AWE_DOC_FILES
${AWE_DOC_DIR}/00-authors.md
${AWE_DOC_DIR}/01-readme.md
@@ -26,11 +28,13 @@ Last-Update: <YYYY-MM-DD>
set(AWE_SRCS
${BUILD_DIR}/awesome.c
+diff --git a/awesomerc.lua b/awesomerc.lua
+index 5713b689..72556fe1 100644
--- a/awesomerc.lua
+++ b/awesomerc.lua
-@@ -12,6 +12,9 @@
- local menubar = require("menubar")
- local hotkeys_popup = require("awful.hotkeys_popup").widget
+@@ -14,6 +14,9 @@ local hotkeys_popup = require("awful.hotkeys_popup").widget
+ -- Enable VIM help for hotkeys widget when client with matching name is opened:
+ require("awful.hotkeys_popup.keys.vim")
+-- Load Debian menu entries
+require("debian.menu")
@@ -38,7 +42,7 @@ Last-Update: <YYYY-MM-DD>
-- {{{ Error handling
-- @DOC_ERROR_HANDLING@
-- Check if awesome encountered an error during startup and fell back to
-@@ -45,8 +48,8 @@
+@@ -47,8 +50,8 @@ beautiful.init(awful.util.get_themes_dir() .. "default/theme.lua")
-- @DOC_DEFAULT_APPLICATIONS@
-- This is used later as the default terminal and editor to run.
@@ -49,7 +53,7 @@ Last-Update: <YYYY-MM-DD>
editor_cmd = terminal .. " -e " .. editor
-- Default modkey.
-@@ -105,6 +108,7 @@
+@@ -107,6 +110,7 @@ myawesomemenu = {
}
mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
--
2.11.0
From 3332b2cc443397530bb38c85fbc3ef86f73d70e8 Mon Sep 17 00:00:00 2001 From: Julian Wollrath <jwollr...@web.de> Date: Sun, 19 Mar 2017 11:16:05 +0100 Subject: [PATCH 6/6] Update changelog for 4.1-0~exp0 --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index b8b5f7dd..43884596 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +awesome (4.1-0~exp0) unstable; urgency=medium + + * New upstream version: + - Refresh install-and-debian-menu. + - Drop remove_useless_build_lgi_check.patch. + - Update build dependencies. + - Bump required lua-lgi version to at least 0.8.0. + + -- Julian Wollrath <jwollr...@web.de> Sun, 19 Mar 2017 11:57:14 +0100 + awesome (4.0-1) unstable; urgency=medium * New upstream release. Closes: #850701, #851791. -- 2.11.0
pgp9tjBbvID4_.pgp
Description: Digitale Signatur von OpenPGP
