From db215a1d94590db015cedd34ec0ca78b056ede81 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 26 Apr 2011 20:57:04 +0000
Subject: [PATCH] xapian: gplv2 -> gpl (according to homepage), added myself as
 maintainer

svn path=/nixpkgs/trunk/; revision=26978
---
 pkgs/development/libraries/xapian/bindings/default.nix | 3 ++-
 pkgs/development/libraries/xapian/default.nix          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix
index 10128788aff7..5e902f74ffff 100644
--- a/pkgs/development/libraries/xapian/bindings/default.nix
+++ b/pkgs/development/libraries/xapian/bindings/default.nix
@@ -68,6 +68,7 @@ composableDerivation.composableDerivation {} rec {
   meta = { 
     description = "Bindings for the Xapian library";
     homepage = xapian.meta.homepage;
-    license = "GPLv2";
+    license = "GPL";
+    maintainers = [ stdenv.lib.maintainers.chaoflow ];
   };
 }
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index e8a8e39e062b..e2354cd6abfd 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation {
   meta = { 
     description = "Xapian Probabilistic Information Retrieval library";
     homepage = "http://xapian.org";
-    license = "GPLv2";
+    license = "GPL";
+    maintainers = [ stdenv.lib.maintainers.chaoflow ];
   };
 }