From: Andre Noll <maan@systemlinux.org>
Date: Sat, 13 Aug 2011 10:21:18 +0000 (+0200)
Subject: Merge branch 't/smaller_tarball'
X-Git-Tag: v0.4.8~9
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;ds=sidebyside;h=82d08fb6da4dfc7d93d1ee0cce4706721378fe12;p=paraslash.git

Merge branch 't/smaller_tarball'
---

82d08fb6da4dfc7d93d1ee0cce4706721378fe12
diff --cc NEWS
index 49747ccb,c6c2e4db..40c30bf9
--- a/NEWS
+++ b/NEWS
@@@ -16,10 -6,7 +16,13 @@@ are the highlights of this release
  	  writers is now treated as a regular expression. This allows
  	  to replace 5 lines in the config file (one for each audio
  	  format) by one single line. See the manual for details.
++	- The *.cmdline.[ch] files are no longer contained in the released
++	  tarballs. This reduces the size of the tarballs but requires
++	  gengetopt to build the tarball.
  	- Compiles cleanly also with llvm/clang.
 +	- Corrupt mp3 files are handled more gracefully.
 +	- sched: Optimized zero timeouts.
 +	- vss timeout cleanups.
  
  --------------------------------------
  0.4.7 (2011-06-01) "infinite rollback"
diff --cc web/manual.m4
index 7163bb7b,3e95de37..6bddbf11
--- a/web/manual.m4
+++ b/web/manual.m4
@@@ -215,14 -214,16 +215,18 @@@ In any case you'll nee
  	scripts which run during compilation require the EMPH(Bourne
  	again shell).  It is most likely already installed.
  
 -	- XREFERENCE(http://www.openssl.org/, openssl). The EMPH(Secure
 -	Sockets Layer) library is needed for cryptographic routines
 -	on both the server and the client side. It is usually shipped
 -	with the distro, but you might have to install the "development
 -	package" (called libssl-dev on debian systems) as well.
 +	- XREFERENCE(http://www.openssl.org/, openssl) or
 +	XREFERENCE(ftp://ftp.gnupg.org/gcrypt/libgcrypt/, libgcrypt).
 +	At least one of these two libraries is needed as the backend
 +	for cryptographic routines on both the server and the client
 +	side. Both openssl and libgcrypt are usually shipped with the
 +	distro, but you might have to install the development package
 +	(libssl-dev or libgcrypt-dev on debian systems) as well.
  
+ 	- XREFERENCE(ftp://ftp.gnu.org/pub/gnu/gengetopt/, gengetopt)
+ 	is needed to generate the C code for the command line parsers
+ 	of all paraslash executables.
+ 
  	- XREFERENCE(ftp://ftp.gnu.org/pub/gnu/help2man, help2man)
  	is used to create the man pages.