Merge branch 'next' into master

This commit is contained in:
Michael Stapelberg
2016-11-08 19:54:14 +01:00
262 changed files with 5974 additions and 2436 deletions

18
debian/changelog vendored
View File

@ -1,9 +1,27 @@
i3-wm (4.12.1-1) unstable; urgency=medium
* New upstream release.
* Move to debhelper 9
* Bump Standards-Version to 3.9.7 (no changes necessary)
* debian/watch: verify signature, use https
-- Michael Stapelberg <stapelberg@debian.org> Fri, 01 Apr 2016 16:34:35 +0200
i3-wm (4.12-2) unstable; urgency=medium
* Override lintian warning desktop-entry-contains-unknown-key for
DesktopNames, gdm needs that key.
* Remove i3-wm.menu to conform to the tech-ctte decision on #741573.
-- Michael Stapelberg <stapelberg@debian.org> Fri, 01 Apr 2016 15:51:23 +0200
i3-wm (4.12-1) unstable; urgency=medium
* New upstream release.
* Move to debhelper 9
* Bump Standards-Version to 3.9.7 (no changes necessary)
* debian/watch: verify signature, use https
* Enable full hardening
-- Michael Stapelberg <stapelberg@debian.org> Sun, 06 Mar 2016 14:20:38 +0100

8
debian/control vendored
View File

@ -3,6 +3,7 @@ Section: x11
Priority: extra
Maintainer: Michael Stapelberg <stapelberg@debian.org>
Build-Depends: debhelper (>= 9),
dh-autoreconf,
libx11-dev,
libxcb-util0-dev (>= 0.3.8),
libxcb-keysyms1-dev,
@ -10,6 +11,7 @@ Build-Depends: debhelper (>= 9),
libxcb-randr0-dev,
libxcb-icccm4-dev,
libxcb-cursor-dev,
libxcb-xrm-dev,
libxcb-xkb-dev,
libxkbcommon-dev (>= 0.4.0),
libxkbcommon-x11-dev (>= 0.4.0),
@ -19,12 +21,12 @@ Build-Depends: debhelper (>= 9),
pkg-config,
libev-dev (>= 1:4.04),
libyajl-dev (>= 2.0.4),
libpcre3-dev,
libpcre3-dev (>= 1:8.10),
libstartup-notification0-dev (>= 0.10),
libcairo2-dev,
libcairo2-dev (>= 1.14.4),
libpango1.0-dev,
libpod-simple-perl
Standards-Version: 3.9.7
Standards-Version: 3.9.8
Homepage: http://i3wm.org/
Package: i3

View File

@ -1,2 +1,2 @@
etc
usr
debian/tmp/etc
debian/tmp/usr

5
debian/i3-wm.menu vendored
View File

@ -1,5 +0,0 @@
?package(i3-wm): \
needs="wm" \
section="Window Managers" \
title="i3" \
command="/usr/bin/i3"

12
debian/rules vendored
View File

@ -4,14 +4,18 @@
export V:=1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
override_dh_auto_build:
dh_auto_build -- all docs mans
override_dh_installchangelogs:
dh_installchangelogs RELEASE-NOTES-*
override_dh_strip:
dh_strip --dbg-package=i3-wm-dbg
override_dh_auto_test:
# TODO: enable tests
override_dh_auto_configure:
# The default is /usr/share/doc/i3
dh_auto_configure -- --docdir=/usr/share/doc/i3-wm
%:
dh $@ --parallel
dh $@ --parallel --builddirectory=build --with=autoreconf