update debian/ to include all documentation/bump standars version

Conflicts:

	debian/control

diff --git a/debian/changelog b/debian/changelog
index 4eff0f88cbb62ffdf226a6f923ecdf5648891072..e20d269076db470822e3815dcda2aeb04809ebc3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+i3-wm (3.e-bf1-3) unstable; urgency=low
+
+  * include keyboard-layer{1,2}.png in docs (Closes: #595295)
+
+ -- Michael Stapelberg <michael@stapelberg.de>  Wed, 03 Nov 2010 20:32:42 +0100
+
 i3-wm (3.e-bf1-2) unstable; urgency=low
 
   * debian: call dh_installwm to register as alternative for x-window-manager

diff --git a/debian/control b/debian/control
index ba99e322719125efd10ad0d994b0c9edbcc5bd2e..b35f43ec9e95e998ad0b0bb26cc393efa0fa4482 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: utils
 Priority: extra
 Maintainer: Michael Stapelberg <michael@stapelberg.de>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5), libx11-dev, libxcb-util0-dev (>= 0.3.8), libxcb-keysyms1-dev, libxcb-xinerama0-dev (>= 1.1), libxcb-randr0-dev, libxcb-icccm4-dev, libxcursor-dev, asciidoc (>= 8.4.4), xmlto, docbook-xml, pkg-config, libev-dev, flex, bison, libyajl-dev
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 6), libx11-dev, libxcb-util0-dev (>= 0.3.8), libxcb-keysyms1-dev, libxcb-xinerama0-dev (>= 1.1), libxcb-randr0-dev, libxcb-icccm4-dev, libxcursor-dev, asciidoc (>= 8.4.4), xmlto, docbook-xml, pkg-config, libev-dev, flex, bison, libyajl-dev, perl
+Standards-Version: 3.9.1
 Homepage: http://i3.zekjur.net/
 
 Package: i3

diff --git a/debian/i3-wm.docs b/debian/i3-wm.docs
index f283829c2a7c6ef41c15f8999fe4df60c160276d..d59c57367353fc2c7078e45e4d2baadedccefe01 100644 (file)
--- a/debian/i3-wm.docs
+++ b/debian/i3-wm.docs
@@ -12,3 +12,5 @@ docs/ipc.html
 docs/multi-monitor.html
 docs/wsbar.html
 docs/wsbar.png
+docs/keyboard-layer1.png
+docs/keyboard-layer2.png