From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 13 Sep 2009 20:15:38 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/33998c51be27c466fa8d0ccead587ff0b36c0021?hp=-c

Merge branch 'stable'
---

33998c51be27c466fa8d0ccead587ff0b36c0021
diff --combined Makefile
index dc9dffd,44138ea..da2518b
--- a/Makefile
+++ b/Makefile
@@@ -1,11 -1,11 +1,11 @@@
- CGIT_VERSION = v0.8.2.1
+ CGIT_VERSION = v0.8.2.2
  CGIT_SCRIPT_NAME = cgit.cgi
  CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
  CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
  CGIT_CONFIG = /etc/cgitrc
  CACHE_ROOT = /var/cache/cgit
  SHA1_HEADER = <openssl/sha.h>
 -GIT_VER = 1.6.1.1
 +GIT_VER = 1.6.4.3
  GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
  INSTALL = install
  
@@@ -100,8 -100,7 +100,8 @@@ ifdef NEEDS_LIBICON
  endif
  
  
 -.PHONY: all libgit test install uninstall clean force-version get-git
 +.PHONY: all libgit test install uninstall clean force-version get-git \
 +	doc man-doc html-doc clean-doc
  
  all: cgit
  
@@@ -150,22 -149,8 +150,22 @@@ uninstall
  	rm -f $(CGIT_DATA_PATH)/cgit.css
  	rm -f $(CGIT_DATA_PATH)/cgit.png
  
 -clean:
 +doc: man-doc html-doc pdf-doc
 +
 +man-doc: cgitrc.5.txt
 +	a2x -f manpage cgitrc.5.txt
 +
 +html-doc: cgitrc.5.txt
 +	a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt
 +
 +pdf-doc: cgitrc.5.txt
 +	a2x -f pdf cgitrc.5.txt
 +
 +clean: clean-doc
  	rm -f cgit VERSION *.o *.d
  
 +clean-doc:
 +	rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo
 +
  get-git:
  	curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git