retitle -1 awesome: Package new upstream version 4.2
thanks
Hi,
on top of the patches in attached in the first mail, the attached
patches bring the packaging up to date with upstream version 4.2.
Cheers,
Julian
--
() ascii ribbon campaign - against html e-mail
/\ - against proprietary attachments
>From 05f3f1c93ea5a204ab96aeea7ca5319d0e1f6a7c Mon Sep 17 00:00:00 2001
From: Julian Wollrath <jwollr...@web.de>
Date: Thu, 18 May 2017 14:24:04 +0200
Subject: [PATCH 1/4] Provide notification-daemon (Closes: #734645)
With naughty, a notification daemon is provided. Make this clear by
putting it into the provides field on debian/control.
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index a08dd57b..d57cf9de 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Depends: dbus-x11,
menu,
${misc:Depends},
${shlibs:Depends}
-Provides: x-window-manager
+Provides: notification-daemon, x-window-manager
Description: highly configurable X window manager
awesome manages windows dynamically in floating or tiled layouts. It is
primarily targeted at power users, developers, and all those dealing with
--
2.13.2
>From d4011e244070cbb884b180391cb877cbdbd0afd8 Mon Sep 17 00:00:00 2001
From: Julian Wollrath <jwollr...@web.de>
Date: Thu, 18 May 2017 14:36:51 +0200
Subject: [PATCH 2/4] Do not install README.md link (Closes: #856442)
---
debian/docs | 1 -
1 file changed, 1 deletion(-)
delete mode 100644 debian/docs
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index b43bf86b..00000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
--
2.13.2
>From a7c4ace272a74f7e0a30e05c9b20262e615ea159 Mon Sep 17 00:00:00 2001
From: Julian Wollrath <jwollr...@web.de>
Date: Fri, 7 Jul 2017 13:48:20 +0200
Subject: [PATCH 3/4] Unfuzz debian/patches/install-and-debian-menu
---
debian/patches/install-and-debian-menu | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/debian/patches/install-and-debian-menu b/debian/patches/install-and-debian-menu
index ca7adb2a..7cee7d4f 100644
--- a/debian/patches/install-and-debian-menu
+++ b/debian/patches/install-and-debian-menu
@@ -15,10 +15,10 @@ 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
+index eb0da86e..e2bf8d6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -32,8 +32,7 @@ set(AWE_DOC_DIR ${BUILD_DIR}/docs)
+@@ -47,8 +47,7 @@ set(AWE_DOC_DIR ${BUILD_DIR}/docs)
set(AWE_DOC_FILES
${AWE_DOC_DIR}/00-authors.md
${AWE_DOC_DIR}/01-readme.md
@@ -29,12 +29,12 @@ index f963539a..a15c12e3 100644
set(AWE_SRCS
${BUILD_DIR}/awesome.c
diff --git a/awesomerc.lua b/awesomerc.lua
-index 5713b689..72556fe1 100644
+index 00d1b603..90f2a722 100644
--- a/awesomerc.lua
+++ b/awesomerc.lua
-@@ -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")
+@@ -15,6 +15,9 @@ local hotkeys_popup = require("awful.hotkeys_popup").widget
+ -- when client with a matching name is opened:
+ require("awful.hotkeys_popup.keys")
+-- Load Debian menu entries
+require("debian.menu")
@@ -42,7 +42,7 @@ index 5713b689..72556fe1 100644
-- {{{ Error handling
-- @DOC_ERROR_HANDLING@
-- Check if awesome encountered an error during startup and fell back to
-@@ -47,8 +50,8 @@ beautiful.init(awful.util.get_themes_dir() .. "default/theme.lua")
+@@ -48,8 +51,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.
@@ -53,7 +53,7 @@ index 5713b689..72556fe1 100644
editor_cmd = terminal .. " -e " .. editor
-- Default modkey.
-@@ -107,6 +110,7 @@ myawesomemenu = {
+@@ -108,6 +111,7 @@ myawesomemenu = {
}
mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
--
2.13.2
>From 0473d1e118ee687132ddc6776b1da76850ff4b71 Mon Sep 17 00:00:00 2001
From: Julian Wollrath <jwollr...@web.de>
Date: Mon, 17 Jul 2017 11:38:18 +0200
Subject: [PATCH 4/4] Update debian/changelog
---
debian/changelog | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ce6a40c0..f75000c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,14 @@
-awesome (4.2-0~exp0) unstable; urgency=medium
-
- * New upstream snapshot.
- * Provide notification-daemon (Closes: #734645).
- * Do not install README.md link (Closes: #856442).
-
- -- Julian Wollrath <jwollr...@web.de> Sat, 15 Jul 2017 17:08:22 +0200
-
-awesome (4.1-0~exp0) unstable; urgency=medium
+awesome (4.2-0~exp0) UNRELEASED; urgency=medium
* New upstream version: (Closes: #800885, #858170)
- 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.
+ * Provide notification-daemon (Closes: #734645).
+ * Do not install README.md link (Closes: #856442).
- -- Julian Wollrath <jwollr...@web.de> Sun, 19 Mar 2017 11:57:14 +0100
+ -- Julian Wollrath <jwollr...@web.de> Mon, 17 Jul 2017 11:37:46 +0200
awesome (4.0-1) unstable; urgency=medium
--
2.13.2
