Add docbook-xml as build dependency, revert last commit

diff --git a/DEPENDS b/DEPENDS
index 5285cc9b38be84fecb810ce6183486bdd2787ce7..6d56e1326317e5a39ace5e79a60768a56a6f0387 100644 (file)
--- a/DEPENDS
+++ b/DEPENDS
@@ -5,8 +5,11 @@ In that case, please try using the versions mentioned below until a fix is provi
  * xcb-proto-1.3 (2008-12-10)
  * libxcb-1.1.93 (2008-12-11)
  * xcb-util-0.3.3 (2009-01-31)
- * Xlib, the one that comes with your X-Server
  * asciidoc >= 8.3.0 for docs/hacking-howto
+ * asciidoc, xmlto, docbook-xml for man/i3.man
+ * Xlib, the one that comes with your X-Server
+
+Recommendations:
  * i3lock for locking your screen
  * dmenu for launching applications
 
@@ -15,5 +18,5 @@ http://xcb.freedesktop.org/dist/xcb-proto-1.3.tar.bz2
 http://xcb.freedesktop.org/dist/libxcb-1.1.93.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-0.3.3.tar.bz2
 
-git://code.stapelberg.de/i3lock
+http://i3.zekjur.net/i3lock/
 http://tools.suckless.org/dmenu

diff --git a/debian/control b/debian/control
index db7bb3b1e53fb061e30acca75838ad69e5cfd185..9c2df2feb7f3d22b5c504c7f7f64f665cf2352e7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: i3-wm
 Section: utils
 Priority: optional
 Maintainer: Michael Stapelberg <michael+i3@stapelberg.de>
-Build-Depends: debhelper (>= 5), libx11-dev, libxcb-wm0-dev (>= 0.3.3), libxcb-aux0-dev (>= 0.3.3), libxcb-keysyms0-dev (>= 0.3.3), libxcb-xinerama0-dev (>= 1.1), asciidoc, xmlto
+Build-Depends: debhelper (>= 5), libx11-dev, libxcb-wm0-dev (>= 0.3.3), libxcb-aux0-dev (>= 0.3.3), libxcb-keysyms0-dev (>= 0.3.3), libxcb-xinerama0-dev (>= 1.1), asciidoc, xmlto, docbook-xml
 Standards-Version: 3.8.0
 Homepage: http://i3.zekjur.net/
 

diff --git a/man/Makefile b/man/Makefile
index e7dec5725234748c0c58925fef813b42c328e125..cd977dd6d7aa9adaedb72cc5d5872218c40295d2 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,2 +1,2 @@
 all:
-       a2x -L -f manpage --asciidoc-opts="-f asciidoc.conf" i3.man
+       a2x -f manpage --asciidoc-opts="-f asciidoc.conf" i3.man