Lluís Batlle i Rossell 9183f21f7e Merging from trunk. ... I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages. Also a small conflict in all-packages about making openssl overridable. And I some linux 2.6.31-zen kernel files also marked in conflict. svn path=/nixpkgs/branches/stdenv-updates/; revision=19438		2010-01-14 14:49:31 +00:00
..
dico	Add GNU Dico, a DICT server and client.	2009-04-01 17:31:44 +00:00
dict	* Removed selectVersion. There's no good reason to write	2009-11-18 09:39:59 +00:00
dns/bind	* Removed selectVersion. There's no good reason to write	2009-11-18 09:39:59 +00:00
fingerd/bsd-fingerd
ftp/vsftpd	vsftpd userlist options added	2009-03-22 15:32:28 +00:00
gpm	* Fix the GPM URL.	2009-11-18 12:47:58 +00:00
gpsd	gpsd: Fix client programs.	2009-06-01 00:03:08 +00:00
http	Update CouchDB; add Apache-related snippets to update-upstream-data.	2009-12-09 12:59:23 +00:00
irc/ircd-hybrid
mail	Fix old typo	2009-05-09 15:37:50 +00:00
monitoring
openafs-client	Rename kernel*' to linux*'.	2009-12-21 14:12:00 +00:00
portmap	* Removed makePortmap; use makeOverridable.	2009-03-20 16:17:08 +00:00
pulseaudio	PulseAudio: Add maintainer and platform.	2009-12-13 21:14:45 +00:00
sabnzbd	Added par2, unzip/rar as dependencies so they are not picked up from PATH	2009-11-08 23:37:49 +00:00
samba	samba: Use /etc/samba as default configuration directory	2009-04-26 11:06:41 +00:00
sql	enable max-nondb plugins for mysql 5.1.41	2009-12-17 20:15:02 +00:00
squid	Updated Squid	2009-03-08 12:29:34 +00:00
x11/xorg	Merging from trunk.	2010-01-14 14:49:31 +00:00
xinetd	Adding the xinetd package.	2009-08-19 20:19:17 +00:00
xmpp	Upgraded ejabberd to the latest stable 2.1.0 and also claimed maintainership since I really need this for one of my experiments	2009-11-17 16:54:04 +00:00