Merge commit '50b28edc865a506c6cce9bf2055867a0abce242f' into lgpl

.gitignore

@@ -1,6 +1,7 @@
 TAGS
 tags
 .project
+*.d
 *.a
 *.o
 *.so
@@ -17,3 +18,4 @@ notion/preload.c
 utils/ion-completeman
 utils/ion-statusd/ion-statusd
 utils/ion-completefile/ion-completefile
+cscope.*

CHANGELOG

@@ -0,0 +1,16 @@
+Version 20140528:
+* Improvement: 'windows' key is now the default META key
+
+* Bugfix: seldomly triggered crash in memory pool
+* Bugfix: save the session atomically
+* Bugfix: various fixes to contributed scripts, notably more lua5.2 support
+
+* Improvement: various code cleanups (thanks to Campbell Barton)
+* Improvement: various build/packaging improvements (thanks to Dima Kogan)
+
+* Feature: Workspace indicator (thanks to Dima Kogan)
+* Feature: Delayed population of the focuslist (thanks to Dima Kogan)
+
+* Improvement: improved kludges/focus behavior (IntelliJ IDEA, xeyes)
+* Improvement: expose 'warp_pointer' to lua
+* Improvement: lock using i3lock when available

LICENSE

@@ -1,4 +1,3 @@
-
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 

Makefile

@@ -16,7 +16,7 @@ INSTALL_SUBDIRS=\
 
 SUBDIRS = $(LIBS_SUBDIRS) $(INSTALL_SUBDIRS)
 
-DOCS = README LICENSE ChangeLog RELNOTES
+DOCS = README LICENSE CHANGELOG
 
 TO_REALCLEAN = build/ac/system-ac.mk
 
@@ -50,12 +50,12 @@ dist:
 	DIR=`basename "$$PWD"` ;\
 	RELEASE=`./nextversion.sh` ;\
 	perl -p -i -e "s/^#define NOTION_RELEASE.*/#define NOTION_RELEASE \"$$RELEASE\"/" version.h ;\
-	git tag $$RELEASE ; git push --tags ;\
-	cd .. ;\
-	tar --exclude-vcs -czf notion-$$RELEASE-src.tar.gz $$DIR ;\
-	tar --exclude-vcs -cjf notion-$$RELEASE-src.tar.bz2 $$DIR ;\
-	cd $$DIR ;\
-	git checkout version.h
+	git add version.h; git commit -m "Releasing version $$RELEASE" ;\
+	git tag -s -m "Release $$RELEASE" $$RELEASE ; git push --tags ;\
+	git archive --prefix notion-$$RELEASE/ --format=tar.gz $$RELEASE > ../notion-$$RELEASE-src.tar.gz ;\
+	git archive --prefix notion-$$RELEASE/ --format=tar $$RELEASE | bzip2 > ../notion-$$RELEASE-src.tar.bz2 ;\
+	perl -p -i -e "s/^#define NOTION_RELEASE.*/#define NOTION_RELEASE \"snapshot\"/" version.h ;\
+	git add version.h; git commit -m "Released version $$RELEASE" ; git push 
 
 .PHONY: test
 

README

@@ -2,7 +2,7 @@
 Notion
 ===
 
-Copyright (c) the Notion team 2010-2011.
+Copyright (c) the Notion team 2010-2014.
 Copyright (c) Tuomo Valkonen 1999-2009.
 
 http://notion.sf.net
@@ -15,11 +15,8 @@ See also:
 
   https://sourceforge.net/apps/mediawiki/notion/index.php?title=Development
 
-1. Get the source code.  Make sure all submodules are present and up to date.
+1. Get the source code.
     git clone git://notion.git.sourceforge.net/gitroot/notion/notion
-    cd notion
-    git submodule init
-    git submodule update
 
 2. In addition to the standard C library headers and the GNU toolchain, you 
    will need the following tools and libraries for building Notion.
@@ -70,9 +67,6 @@ See also:
    a `.xinitrc` should usually do much more setup than simply start a few
    programs of your choice.
 
-Please see the file `RELNOTES` for additional release-specific installation
-and configuration notes.
-
 
 Some optional installation steps
 --------------------------------