From b9214d9c8ca40c36392a939cd88b1ef607e09b00 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Nov 2011 13:48:16 +0000
Subject: [PATCH] * Move libcgroup from libcg/ to libcgroup/.

svn path=/nixpkgs/trunk/; revision=30547
---
 pkgs/os-specific/linux/{libcg => libcgroup}/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
 rename pkgs/os-specific/linux/{libcg => libcgroup}/default.nix (66%)

diff --git a/pkgs/os-specific/linux/libcg/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix
similarity index 66%
rename from pkgs/os-specific/linux/libcg/default.nix
rename to pkgs/os-specific/linux/libcgroup/default.nix
index 14f96eb15aef..aa73867122f1 100644
--- a/pkgs/os-specific/linux/libcg/default.nix
+++ b/pkgs/os-specific/linux/libcgroup/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pam, yacc, flex}:
+{ stdenv, fetchurl, pam, yacc, flex }:
 
 stdenv.mkDerivation rec {
   name = "libcgroup-0.37.1";
@@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ pam ];
 
   buildNativeInputs = [ yacc flex ];
+  
   meta = {
-    description = "library that abstracts the control group file system in Linux";
-    homepage = "http://libcg.sourceforge.net";
+    description = "Library and tools to manage Linux's cgroup resource management system";
+    homepage = http://libcg.sourceforge.net/;
     license = "LGPL";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63171c0f8a47..ef1bae599226 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5261,7 +5261,7 @@ let
 
   libatasmart = callPackage ../os-specific/linux/libatasmart { };
 
-  libcgroup = callPackage ../os-specific/linux/libcg { };
+  libcgroup = callPackage ../os-specific/linux/libcgroup { };
 
   libnl = callPackage ../os-specific/linux/libnl { };