aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Stapelberg <michael@stapelberg.de>2018-03-10 18:29:21 +0100
committerMichael Stapelberg <michael@stapelberg.de>2018-03-10 18:29:21 +0100
commitcdf9a8f77e146500205fd8c560be5a7298b9bbe7 (patch)
tree93ac57e3880a8eef4251de7f9b58ab846ddacb66 /debian
parent2eca0f02878d054b32b4f3afbe32bf52848f3e44 (diff)
parentb96529503feed211604c1b264282b0bf0b5fe3d8 (diff)
downloadi3-cdf9a8f77e146500205fd8c560be5a7298b9bbe7.tar.gz
i3-cdf9a8f77e146500205fd8c560be5a7298b9bbe7.zip
Merge branch 'next' into master
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog14
-rw-r--r--debian/i3-wm.install5
-rwxr-xr-xdebian/rules4
3 files changed, 22 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index dae55d7e..8dd823eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+i3-wm (4.14.2-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Michael Stapelberg <stapelberg@debian.org> Mon, 25 Sep 2017 08:55:22 +0200
+
+i3-wm (4.14.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Michael Stapelberg <stapelberg@debian.org> Sun, 24 Sep 2017 19:21:15 +0200
+
i3-wm (4.14-1) unstable; urgency=medium
* New upstream release.
@@ -308,7 +320,7 @@ i3-wm (4.0.2-1) unstable; urgency=low
* Bugfix: Use correct format string in load_layout (fixes crash in restart)
* Bugfix: Fix border rendering (border lines were "cutting" through)
* Bugfix: Raise floating windows immediately when dragging/resizing
- * Bugfix: Make focus switching work accross outputs again
+ * Bugfix: Make focus switching work across outputs again
* Bugfix: migration-script: handle resize top/bottom correctly
* Bugfix: Fix focus issue when moving containers to workspaces
* Bugfix: Warp cursor when changing outputs again
diff --git a/debian/i3-wm.install b/debian/i3-wm.install
index bff5028c..823d4097 100644
--- a/debian/i3-wm.install
+++ b/debian/i3-wm.install
@@ -1,2 +1,7 @@
debian/tmp/etc
debian/tmp/usr
+contrib/dump-asy.pl usr/share/doc/i3-wm/examples/
+contrib/gtk-tree-watch.pl usr/share/doc/i3-wm/examples/
+contrib/i3-wsbar usr/share/doc/i3-wm/examples/
+contrib/per-workspace-layout.pl usr/share/doc/i3-wm/examples/
+contrib/trivial-bar-script.sh usr/share/doc/i3-wm/examples/
diff --git a/debian/rules b/debian/rules
index e4da3db8..d5c30686 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,5 +17,9 @@ override_dh_auto_configure:
# The default is /usr/share/doc/i3
dh_auto_configure -- --docdir=/usr/share/doc/i3-wm
+override_dh_builddeb:
+ # bintray does not support xz currently.
+ dh_builddeb -- -Zgzip
+
%:
dh $@ --parallel --builddirectory=build --with=autoreconf