Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk ... Merge conflicts: * unzip (almost trivial) * dvswitch (trivial) * gmp (copied result of `git merge`) The last item introduced gmp-5.0.3, thus full rebuild. +ensureDir->mkdir -p in TeX packages was catched by git but not svn. svn path=/nixpkgs/branches/stdenv-updates/; revision=32091		2012-02-06 23:03:12 +00:00
..
avidemux	Updating avidemux	2010-03-16 21:52:36 +00:00
bangarang	Bangarang: fix deps to get it to compile against kde 4.7	2011-11-09 13:01:51 +00:00
cinelerra	cinelerra-git: let pkgconfig handle freetype and its -I flags	2011-06-22 22:23:57 +00:00
dvb-apps	added dvb-apps	2011-12-06 23:01:22 +00:00
dvdauthor	* Get rid of many instances of "args: with args;", and other coding	2010-07-28 11:55:54 +00:00
dvswitch	Patching the prefix, since it is hardcoded. The application seems to work correctly now, although it does crash with my current gtk theme (oxygen) when adding a stream. Using the gnome gtk-icon-theme does work, but this is probably just a bug in the oxygen gtk theme and should be fixed there.	2012-01-29 13:39:30 +00:00
gnash	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
gnome-mplayer	gnome-mplayer, gnome-mediamplayer updated to 1.0.4	2011-08-09 20:39:43 +00:00
kdenlive	kdenlive builds for kde48 release candidate (and kde47).	2012-01-24 04:50:55 +00:00
kino	Ensure that the shared ffmpeg is used, instead of the one included in the kino source tarball	2011-06-29 19:22:02 +00:00
kmplayer	Merging from trunk. The previous merge took the firefox 3.6 in a bad state.	2010-12-19 20:12:10 +00:00
lxdvdrip	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
mkvtoolnix	fix mkvtoolnix description and homepage	2011-02-12 20:22:55 +00:00
MPlayer	Use meta.platforms	2012-01-28 14:39:56 +00:00
mythtv	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
quvi	Add quvi	2011-12-03 22:21:00 +00:00
RealPlayer	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
vlc	vlc-1.1.13	2012-01-26 08:36:18 +00:00
xawtv	Fix XawTV build	2010-10-13 15:48:37 +00:00
xine-ui	* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.	2012-01-18 20:53:01 +00:00
xvidcap	Adding a patch I forgot needed for the xvidcap expression	2009-05-06 21:03:57 +00:00
zapping	* Get rid of all references to nix.cs.uu.nl.	2008-11-14 16:57:19 +00:00