Merge branch 'master' of zekjur:/git/i3

Makefile

@@ -9,7 +9,7 @@ CFLAGS += -Iinclude
 CFLAGS += -I/usr/local/include
 
 LDFLAGS += -lxcb-wm
-LDFLAGS += -lxcb-keysyms
+#LDFLAGS += -lxcb-keysyms
 LDFLAGS += -lxcb-xinerama
 LDFLAGS += -lX11
 LDFLAGS += -L/usr/local/lib -L/usr/pkg/lib

debian/control

@@ -2,7 +2,7 @@ Source: i3
 Section: utils
 Priority: optional
 Maintainer: Michael Stapelberg <michael+i3@stapelberg.de>
-Build-Depends: debhelper (>= 5), libxcb-wm0-dev (>= 0.3.3),  libxcb-aux0-dev (>= 0.3.3)
+Build-Depends: debhelper (>= 5), libxcb-wm0-dev (>= 0.3.3), libxcb-aux0-dev (>= 0.3.3), asciidoc
 Standards-Version: 3.8.0
 Homepage: http://i3.zekjur.net/
 
@@ -12,4 +12,12 @@ Priority: optional
 Section: utils
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: an improved dynamic tiling window manager
- TODO
+ Key features of i3 are correct implementation of Xinerama (workspaces are
+ assigned to virtual screens, i3 does the right thing when attaching new
+ monitors), XrandR support (not done yet), horizontal and vertical columns
+ (think of a table) in tiling. Also, special focus is on writing clean,
+ readable and well documented code. i3 uses xcb for asynchronous
+ communication with X11, and has several measures to be very fast.
+ .
+ Please be aware i3 is primarily targeted at advanced users and developers
+ and that you’re currently trying an alpha version (which may contain bugs).

debian/copyright

@@ -2,6 +2,7 @@ This Debian package is based on a tarball downloaded from
 http://i3.zekjur.net
 
 Copyright: (C) 2009 Michael Stapelberg <michael+i3 at stapelberg dot de>
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

debian/rules

@@ -18,6 +18,7 @@ build:
 
 	# Add here commands to compile the package.
 	$(MAKE)
+	$(MAKE) -C man
 
 	touch $@
 
@@ -39,6 +40,8 @@ install: build
 
 	# Add here commands to install the package into debian/wiipdf
 	$(MAKE) DESTDIR=$(CURDIR)/debian/i3/ install
+	mkdir -p $(CURDIR)/debian/i3/usr/share/man/man1
+	cp man/i3.1 $(CURDIR)/debian/i3/usr/share/man/man1
 
 
 # Build architecture-independent files here.
@@ -65,7 +68,7 @@ binary-arch: build install
 #	dh_installinfo
 	dh_installman
 	dh_link
-	dh_strip
+#	dh_strip
 	dh_compress
 	dh_fixperms
 #	dh_perl