synchronize with trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=29739

pkgs/tools/text/colordiff/default.nix

@@ -9,5 +9,5 @@ stdenv.mkDerivation {
 
   buildInputs = [ perl /* xmlto */ ];
   dontBuild = 1; # do not build doc yet.
-  installPhase = ''make INSTALL_DIR=/bin MAN_DIR=/man DESTDIR="$out" install'';
+  installPhase = ''make INSTALL_DIR=/bin MAN_DIR=/share/man/man1 DESTDIR="$out" install'';
 }

pkgs/tools/text/odt2txt/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "odt2txt-0.4";
+
+  src = fetchurl {
+    url = "${meta.homepage}/${name}.tar.gz";
+    sha256 = "1y36s7w2ng0r4nismxb3hb3zvsim8aimvvblz9hgnanw3kwbvx55";
+  };
+
+  configurePhase="export makeFlags=\"DESTDIR=$out\"";
+
+  buildInputs = [ zlib ];
+
+  meta = {
+    description = "Simple .odt to .txt converter";
+    homepage = http://stosberg.net/odt2txt;
+    platforms = stdenv.lib.platforms.all;
+    lincense = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}