diff -Nru herbstluftwm-0.6.2/CMakeLists.txt herbstluftwm-0.7.0/CMakeLists.txt
--- herbstluftwm-0.6.2/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000
+++ herbstluftwm-0.7.0/CMakeLists.txt 2015-10-14 13:27:40.000000000 +0000
@@ -0,0 +1,335 @@
+# vim: set ts=4 sw=4 et:
+
+cmake_minimum_required(VERSION 3.1)
+
+set(CMAKE_BUILD_TYPE_INIT "Release")
+
+cmake_policy(SET CMP0005 NEW) # Escape preprocessor strings
+cmake_policy(SET CMP0010 NEW) # So syntax problems are errors
+
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_CXX_STANDARD 11)
+
+# redirect output
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE)
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
+
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+ message(FATAL_ERROR "In-source builds aren't supported. Remove the CMakeCache.txt and run from another directory.")
+endif()
+
+project(Herbstluftwm)
+
+
+# ----------------------------------------------------------------------------
+# Options
+
+option(WITH_DOCUMENTATION "Build with documentation" ON)
+option(WITH_XINERAMA "Use multi-monitor support" ON)
+
+set(DESTDIR "" CACHE PATH "Root directory, prefix for CMAKE_INSTALL_PREFIX and CMAKE_INSTALL_SYSCONF_PREFIX when set")
+set(CMAKE_INSTALL_SYSCONF_PREFIX "/etc" CACHE PATH "Directory to install configuration files")
+
+set(SYSCONFDIR "${DESTDIR}/etc")
+set(CONFIGDIR "${SYSCONFDIR}/xdg/herbstluftwm")
+
+
+if(CMAKE_COMPILER_IS_GNUCC)
+ set(CMAKE_C_FLAGS "-pedantic -Wall")
+ set(CMAKE_CXX_FLAGS "-pedantic -Wall -Wno-sign-compare -Wno-narrowing -Wno-deprecated-register")
+endif()
+
+
+# ----------------------------------------------------------------------------
+# Find Libraries
+
+include(FindPkgConfig)
+pkg_check_modules(GLIB2 REQUIRED glib-2.0)
+
+if(WITH_XINERAMA)
+ find_package(X11 REQUIRED)
+
+ if(NOT X11_Xinerama_FOUND)
+ set(WITH_XINERAMA OFF)
+ endif()
+endif()
+
+
+# ----------------------------------------------------------------------------
+# Find Vars
+
+# VERSION_GIT
+set(VERSION_GIT " (unknown)")
+if(EXISTS ${CMAKE_SOURCE_DIR}/.git)
+ find_package(Git)
+ if(GIT_FOUND)
+ execute_process(
+ COMMAND git rev-parse --short HEAD
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ OUTPUT_VARIABLE VERSION_GIT
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ set(VERSION_GIT " (${VERSION_GIT})")
+ endif()
+endif()
+
+# VERSION_* from 'version.mk'
+file(STRINGS "${CMAKE_SOURCE_DIR}/version.mk" _contents REGEX "^VERSION_.*$")
+string(REGEX REPLACE ".*VERSION_MAJOR[ \t]*=[ \t]*([0-9]+).*" "\\1" VERSION_MAJOR "${_contents}")
+string(REGEX REPLACE ".*VERSION_MINOR[ \t]*=[ \t]*([0-9]+).*" "\\1" VERSION_MINOR "${_contents}")
+string(REGEX REPLACE ".*VERSION_PATCH[ \t]*=[ \t]*([0-9]+).*" "\\1" VERSION_PATCH "${_contents}")
+string(REGEX REPLACE ".*VERSION_SUFFIX[ \t]*=[ \t]*\"(.*)\".*" "\\1" VERSION_SUFFIX "${_contents}")
+set(SHORTVERSION "${VERSION_MAJOR}\.${VERSION_MINOR}\.${VERSION_PATCH}${VERSION_SUFFIX}")
+set(VERSION "${SHORTVERSION}${VERSION_GIT}")
+unset(_contents)
+
+
+# ----------------------------------------------------------------------------
+# Program: 'herbstluftwm'
+
+set(SRC
+ src/clientlist.cpp src/clientlist.h
+ src/command.cpp src/command.h
+ src/decoration.cpp src/decoration.h
+ src/desktopwindow.cpp src/desktopwindow.h
+ src/ewmh.cpp src/ewmh.h
+ src/floating.cpp src/floating.h
+ src/glib-backports.h
+ src/globals.h
+ src/hook.cpp src/hook.h
+ src/ipc-protocol.h
+ src/ipc-server.cpp src/ipc-server.h
+ src/key.cpp src/key.h
+ src/layout.cpp src/layout.h
+ src/main.cpp
+ src/monitor.cpp src/monitor.h
+ src/mouse.cpp src/mouse.h
+ src/object.cpp src/object.h
+ src/rules.cpp src/rules.h
+ src/settings.cpp src/settings.h
+ src/stack.cpp src/stack.h
+ src/tag.cpp src/tag.h
+ src/utils.cpp src/utils.h
+ src/x11-types.h
+ src/x11-utils.cpp src/x11-utils.h
+)
+
+set(INC_SYS
+ ${X11_X11_INCLUDE_PATH}
+ ${GLIB2_INCLUDE_DIRS}
+)
+
+set(DEF
+ -D_XOPEN_SOURCE=600
+ -DHERBSTLUFT_VERSION=\"${VERSION}\"
+ -DHERBSTLUFT_VERSION_MAJOR=\"${VERSION_MAJOR}\"
+ -DHERBSTLUFT_VERSION_MINOR=\"${VERSION_MINOR}\"
+ -DHERBSTLUFT_VERSION_PATCH=\"${VERSION_PATCH}\"
+ -DHERBSTLUFT_GLOBAL_AUTOSTART="${CONFIGDIR}/autostart"
+)
+
+set(LIB
+ ${X11_X11_LIB}
+ # for Xshape
+ ${X11_Xext_LIB}
+ ${GLIB2_LIBRARIES}
+)
+
+if(WITH_XINERAMA)
+ list(APPEND INC_SYS ${X11_Xinerama_INCLUDE_PATH})
+ list(APPEND DEF -DXINERAMA)
+ list(APPEND LIB ${X11_Xinerama_LIB})
+endif()
+
+add_executable(herbstluftwm ${SRC})
+
+target_include_directories(herbstluftwm SYSTEM PUBLIC ${INC_SYS})
+target_compile_definitions(herbstluftwm PUBLIC ${DEF})
+target_link_libraries(herbstluftwm ${LIB})
+
+
+# ----------------------------------------------------------------------------
+# Program: 'herbstclient'
+
+set(INC_SYS
+ ${X11_X11_INCLUDE_PATH}
+ ${GLIB2_INCLUDE_DIRS}
+)
+
+set(DEF
+ -D_XOPEN_SOURCE=600
+ -DHERBSTLUFT_VERSION=\"${VERSION}\"
+ -DHERBSTLUFT_VERSION_MAJOR=\"${VERSION_MAJOR}\"
+ -DHERBSTLUFT_VERSION_MINOR=\"${VERSION_MINOR}\"
+ -DHERBSTLUFT_VERSION_PATCH=\"${VERSION_PATCH}\"
+)
+
+set(LIB
+ ${X11_X11_LIB}
+ ${GLIB2_LIBRARIES}
+)
+
+set(SRC
+ ipc-client/client-utils.c ipc-client/client-utils.h
+ ipc-client/ipc-client.c ipc-client/ipc-client.h
+ ipc-client/main.c
+)
+
+add_executable(herbstclient ${SRC})
+
+target_include_directories(herbstclient SYSTEM PUBLIC ${INC_SYS})
+target_compile_definitions(herbstclient PUBLIC ${DEF})
+target_link_libraries(herbstclient ${LIB})
+
+
+# ----------------------------------------------------------------------------
+# Install
+
+set(BINDIR ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)
+set(DATADIR ${DESTDIR}${CMAKE_INSTALL_PREFIX}/share)
+set(MANDIR ${DATADIR}/man)
+set(DOCDIR ${DATADIR}/doc/herbstluftwm)
+set(EXAMPLESDIR ${DOCDIR}/examples)
+set(LICENSEDIR ${DOCDIR})
+set(XSESSIONSDIR ${DATADIR}/xsessions)
+set(ZSHCOMPLETIONDIR ${DATADIR}/zsh/functions/Completion/X)
+set(BASHCOMPLETIONDIR ${SYSCONFDIR}/bash_completion.d)
+
+
+install(
+ TARGETS
+ herbstluftwm
+ herbstclient
+ DESTINATION
+ ${BINDIR}
+)
+install(
+ PROGRAMS
+ ${CMAKE_SOURCE_DIR}/share/dmenu_run_hlwm
+ DESTINATION
+ ${BINDIR}
+)
+
+install(
+ FILES
+ ${CMAKE_SOURCE_DIR}/BUGS
+ ${CMAKE_SOURCE_DIR}/NEWS
+ ${CMAKE_SOURCE_DIR}/INSTALL
+ DESTINATION
+ ${DOCDIR}
+)
+
+install(
+ FILES
+ ${CMAKE_SOURCE_DIR}/LICENSE
+ DESTINATION
+ ${LICENSEDIR}
+)
+
+install(
+ PROGRAMS
+ ${CMAKE_SOURCE_DIR}/share/autostart
+ ${CMAKE_SOURCE_DIR}/share/panel.sh
+ ${CMAKE_SOURCE_DIR}/share/restartpanels.sh
+ DESTINATION
+ ${CONFIGDIR}
+)
+
+install(
+ FILES
+ ${CMAKE_SOURCE_DIR}/share/herbstclient-completion
+ DESTINATION
+ ${BASHCOMPLETIONDIR}
+)
+install(
+ FILES
+ ${CMAKE_SOURCE_DIR}/share/_herbstclient
+ DESTINATION
+ ${ZSHCOMPLETIONDIR}
+)
+install(
+ FILES
+ ${CMAKE_SOURCE_DIR}/share/herbstluftwm.desktop
+ DESTINATION
+ ${XSESSIONSDIR}
+)
+
+
+install(
+ FILES
+ ${CMAKE_SOURCE_DIR}/scripts/README
+ DESTINATION
+ ${EXAMPLESDIR}
+)
+install(
+ PROGRAMS
+ ${CMAKE_SOURCE_DIR}/scripts/dmenu.sh
+ ${CMAKE_SOURCE_DIR}/scripts/dumpbeautify.sh
+ ${CMAKE_SOURCE_DIR}/scripts/exec_on_tag.sh
+ ${CMAKE_SOURCE_DIR}/scripts/execwith.sh
+ ${CMAKE_SOURCE_DIR}/scripts/floatmon.sh
+ ${CMAKE_SOURCE_DIR}/scripts/herbstcommander.sh
+ ${CMAKE_SOURCE_DIR}/scripts/keychain.sh
+ ${CMAKE_SOURCE_DIR}/scripts/lasttag.sh
+ ${CMAKE_SOURCE_DIR}/scripts/layout.sh
+ ${CMAKE_SOURCE_DIR}/scripts/loadstate.sh
+ ${CMAKE_SOURCE_DIR}/scripts/q3terminal.sh
+ ${CMAKE_SOURCE_DIR}/scripts/savestate.sh
+ ${CMAKE_SOURCE_DIR}/scripts/scratchpad.sh
+ ${CMAKE_SOURCE_DIR}/scripts/wselect.sh
+ DESTINATION
+ ${EXAMPLESDIR}
+)
+
+if(WITH_DOCUMENTATION)
+ find_program(ASCIIDOC_A2X NAMES a2x DOC "Path to AsciiDoc a2x command")
+ find_program(ASCIIDOC NAMES asciidoc DOC "Path to AsciiDoc command")
+
+ function(doc_manpage_gen sourcefile man_nr)
+ set(sourcefile_target "doc_man_${sourcefile}")
+
+ set(src_orig "${CMAKE_SOURCE_DIR}/doc/${sourcefile}.txt")
+ set(src "${CMAKE_BINARY_DIR}/doc/${sourcefile}.txt")
+ set(dst "${CMAKE_BINARY_DIR}/doc/${sourcefile}.${man_nr}")
+
+ add_custom_target(${sourcefile_target} ALL DEPENDS ${dst})
+ add_custom_command(
+ OUTPUT ${dst}
+ COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/doc/"
+ # asciidoc doesn't support destination directory for manpages
+ COMMAND ${CMAKE_COMMAND} -E copy ${src_orig} ${src}
+ COMMAND ${ASCIIDOC_A2X}
+ -f manpage
+ -a \"herbstluftwmversion=herbstluftwm ${VERSION}\"
+ -a \"date=`date +%Y-%m-%d`\"
+ ${src}
+ DEPENDS ${src_orig}
+ )
+ install(FILES ${dst} DESTINATION "${MANDIR}/man${man_nr}")
+ endfunction()
+
+ function(doc_html_gen sourcefile)
+ set(sourcefile_target "doc_html_${sourcefile}")
+
+ set(src "${CMAKE_SOURCE_DIR}/doc/${sourcefile}.txt")
+ set(dst "${CMAKE_BINARY_DIR}/doc/${sourcefile}.html")
+
+ add_custom_target(${sourcefile_target} ALL DEPENDS ${dst})
+ add_custom_command(
+ OUTPUT ${dst}
+ COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/doc/"
+ COMMAND ${ASCIIDOC} -o ${dst} ${src}
+ DEPENDS ${src}
+ )
+ install(FILES ${dst} DESTINATION ${DOCDIR})
+ endfunction()
+
+ doc_manpage_gen(herbstclient 1)
+ doc_manpage_gen(herbstluftwm 1)
+ doc_manpage_gen(herbstluftwm-tutorial 7)
+
+ doc_html_gen(herbstclient)
+ doc_html_gen(herbstluftwm)
+ doc_html_gen(herbstluftwm-tutorial)
+endif()
+
diff -Nru herbstluftwm-0.6.2/config.mk herbstluftwm-0.7.0/config.mk
--- herbstluftwm-0.6.2/config.mk 2013-12-22 12:35:42.000000000 +0000
+++ herbstluftwm-0.7.0/config.mk 2015-10-14 13:27:40.000000000 +0000
@@ -2,12 +2,14 @@
X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib
+PKG_CONFIG ?= pkg-config
+
# Xinerama
-XINERAMALIBS = `pkg-config --silence-errors --libs xinerama`
-XINERAMAFLAGS = `pkg-config --exists xinerama && echo -DXINERAMA`
+XINERAMALIBS = `$(PKG_CONFIG) --silence-errors --libs xinerama`
+XINERAMAFLAGS = `$(PKG_CONFIG) --exists xinerama && echo -DXINERAMA`
-INCS = -Isrc/ -I/usr/include -I${X11INC} `pkg-config --cflags glib-2.0`
-LIBS = -lc -L${X11LIB} -lXext -lX11 $(XINERAMALIBS) `pkg-config --libs glib-2.0`
+INCS = -Isrc/ -I/usr/include -I${X11INC} `$(PKG_CONFIG) --cflags glib-2.0`
+LIBS = -lc -L${X11LIB} -lXext -lX11 $(XINERAMALIBS) `$(PKG_CONFIG) --libs glib-2.0`
ifeq ($(shell uname),Linux)
LIBS += -lrt
@@ -16,8 +18,11 @@
# FLAGS
CC ?= gcc
LD = $(CC)
+LDXX ?= g++
CFLAGS ?= -g
CFLAGS += -pedantic -Wall -std=c99
+CXXFLAGS ?= -g
+CXXFLAGS += -pedantic -Wall -std=c++11 -Wno-sign-compare -Wno-narrowing -Wno-deprecated-register
VERSIONFLAGS = \
-D HERBSTLUFT_VERSION=\"$(VERSION)\" \
-D HERBSTLUFT_VERSION_MAJOR=$(VERSION_MAJOR) \
diff -Nru herbstluftwm-0.6.2/debian/changelog herbstluftwm-0.7.0/debian/changelog
--- herbstluftwm-0.6.2/debian/changelog 2014-03-27 23:42:49.000000000 +0000
+++ herbstluftwm-0.7.0/debian/changelog 2016-02-22 15:26:09.000000000 +0000
@@ -1,3 +1,20 @@
+herbstluftwm (0.7.0-1~ubuntu15.10.1) wily; urgency=medium
+
+ * No-change backport to wily
+
+ -- Christoph Egger Mon, 22 Feb 2016 16:26:09 +0100
+
+herbstluftwm (0.7.0-1) unstable; urgency=medium
+
+ * New upstream release
+ * Add GPG key to uscan mechanism
+ * Enable hardening
+ * install bash completion to /usr/share (See #776954)
+ * enable parallel build
+ * Do not install redundant INSTALL file
+
+ -- Christoph Egger Mon, 08 Feb 2016 22:31:16 +0100
+
herbstluftwm (0.6.2-1) unstable; urgency=medium
* New upstream bugfix release
diff -Nru herbstluftwm-0.6.2/debian/rules herbstluftwm-0.7.0/debian/rules
--- herbstluftwm-0.6.2/debian/rules 2014-01-01 20:18:36.000000000 +0000
+++ herbstluftwm-0.7.0/debian/rules 2016-02-08 21:51:46.000000000 +0000
@@ -1,18 +1,21 @@
#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
%:
- dh $@
+ dh $@ --parallel
override_dh_auto_clean:
dh_auto_clean -- VERBOSE= COLOR=0
override_dh_auto_build:
- dh_auto_build -- VERBOSE= COLOR=0
+ dh_auto_build -- VERBOSE= COLOR=0 LDXXFLAGS="$(LDFLAGS)"
override_dh_auto_install:
- $(MAKE) PREFIX=/usr DESTDIR=$(CURDIR)/debian/herbstluftwm/ install
+ $(MAKE) PREFIX=/usr DESTDIR=$(CURDIR)/debian/herbstluftwm/ BASHCOMPLETIONDIR=/usr/share/bash-completion/completions install
rm -rf $(CURDIR)/debian/herbstluftwm/usr/share/licenses \
- $(CURDIR)/debian/herbstluftwm/usr/share/doc/herbstluftwm/LICENSE
+ $(CURDIR)/debian/herbstluftwm/usr/share/doc/herbstluftwm/LICENSE \
+ $(CURDIR)/debian/herbstluftwm/usr/share/doc/herbstluftwm/INSTALL
override_dh_installwm:
dh_installwm --priority=20 herbstluftwm
diff -Nru herbstluftwm-0.6.2/debian/upstream/signing-key.asc herbstluftwm-0.7.0/debian/upstream/signing-key.asc
--- herbstluftwm-0.6.2/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000
+++ herbstluftwm-0.7.0/debian/upstream/signing-key.asc 2016-02-08 21:30:48.000000000 +0000
@@ -0,0 +1,163 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+=ytYb
+-----END PGP PUBLIC KEY BLOCK-----
diff -Nru herbstluftwm-0.6.2/debian/watch herbstluftwm-0.7.0/debian/watch
--- herbstluftwm-0.6.2/debian/watch 2014-01-01 20:19:02.000000000 +0000
+++ herbstluftwm-0.7.0/debian/watch 2016-02-08 21:30:48.000000000 +0000
@@ -1,3 +1,4 @@
version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
http://herbstluftwm.org/tarballs/herbstluftwm-([\d.]+).tar.gz
diff -Nru herbstluftwm-0.6.2/doc/herbstclient.1 herbstluftwm-0.7.0/doc/herbstclient.1
--- herbstluftwm-0.6.2/doc/herbstclient.1 2014-03-27 01:54:20.000000000 +0000
+++ herbstluftwm-0.7.0/doc/herbstclient.1 2016-02-04 17:00:31.000000000 +0000
@@ -1,13 +1,13 @@
'\" t
.\" Title: herbstclient
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 2014-03-27
+.\" Generator: DocBook XSL Stylesheets v1.79.1
+.\" Date: 2016-02-04
.\" Manual: \ \&
-.\" Source: \ \& herbstluftwm 0.6.2\e \e(80c5fe4\e)
+.\" Source: \ \& herbstluftwm 0.7.0\e \e(c179281\e)
.\" Language: English
.\"
-.TH "HERBSTCLIENT" "1" "2014\-03\-27" "\ \& herbstluftwm 0\&.6\&.2\e" "\ \&"
+.TH "HERBSTCLIENT" "1" "2016\-02\-04" "\ \& herbstluftwm 0\&.7\&.0\e" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -48,6 +48,19 @@
Do not print a newline if output does not end with a newline\&.
.RE
.PP
+\fB\-0\fR, \fB\-\-print0\fR
+.RS 4
+Use the null character as delimiter between the output of hooks\&.
+.RE
+.PP
+\fB\-l\fR, \fB\-\-last\-arg\fR
+.RS 4
+When using
+\fB\-i\fR
+or
+\fB\-w\fR, only print the last argument of the hook\&.
+.RE
+.PP
\fB\-i\fR, \fB\-\-idle\fR
.RS 4
Wait for hooks instead of executing commands\&.
@@ -127,7 +140,7 @@
.sp
Homepage: http://herbstluftwm\&.org
.sp
-Gitweb: http://git\&.cs\&.fau\&.de/?p=re06huxa/herbstluftwm
+Github page: http://github\&.com/herbstluftwm/herbstluftwm
.sp
Patch submission and bug reporting:
.sp
diff -Nru herbstluftwm-0.6.2/doc/herbstclient.html herbstluftwm-0.7.0/doc/herbstclient.html
--- herbstluftwm-0.6.2/doc/herbstclient.html 2014-03-27 01:54:22.000000000 +0000
+++ herbstluftwm-0.7.0/doc/herbstclient.html 2016-02-04 17:00:31.000000000 +0000
@@ -778,6 +778,22 @@
+-0, --print0
+
+
+
+ Use the null character as delimiter between the output of hooks.
+
+
+
+-l, --last-arg
+
+
+
+ When using -i or -w, only print the last argument of the hook.
+
+
+
-i, --idle
@@ -895,7 +911,7 @@
RESOURCES
-
+
Patch submission and bug reporting: