Merge branch 'master' into core-updates

Conflicts:
	build-aux/download.scm
	distro/packages/autotools.scm
	distro/packages/base.scm
	distro/packages/bootstrap.scm
	distro/packages/lsh.scm
	distro/packages/make-bootstrap.scm
	distro/packages/ncurses.scm
	distro/packages/perl.scm
	tests/derivations.scm
	tests/union.scm

diff --cc Makefile.am
Simple merge

diff --cc build-aux/download.scm
index aad4fe3,1d5f22c..97a74b1
--- 1/build-aux/download.scm
--- 2/build-aux/download.scm
+++ b/build-aux/download.scm
@@@ -1,9 -1,9 +1,9 @@@
- ;;; Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
- ;;; Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+ ;;; GNU Guix --- Functional package management for GNU
 -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
++;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
  ;;;
- ;;; This file is part of Guix.
+ ;;; This file is part of GNU Guix.
  ;;;
- ;;; Guix is free software; you can redistribute it and/or modify it
+ ;;; GNU Guix is free software; you can redistribute it and/or modify it
  ;;; under the terms of the GNU General Public License as published by
  ;;; the Free Software Foundation; either version 3 of the License, or (at
  ;;; your option) any later version.

diff --cc distro/packages/acl.scm
Simple merge

diff --cc distro/packages/attr.scm
Simple merge

diff --cc distro/packages/autotools.scm
index 32e50a5,a472ce1..06568b2
--- 1/distro/packages/autotools.scm
--- 2/distro/packages/autotools.scm
+++ b/distro/packages/autotools.scm
@@@ -1,10 -1,10 +1,10 @@@
- ;;; Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
- ;;; Copyright (C) 2012 Nikita Karetnikov <nikita@karetnikov.org>
- ;;; Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+ ;;; GNU Guix --- Functional package management for GNU
+ ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
++;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
  ;;;
- ;;; This file is part of Guix.
+ ;;; This file is part of GNU Guix.
  ;;;
- ;;; Guix is free software; you can redistribute it and/or modify it
+ ;;; GNU Guix is free software; you can redistribute it and/or modify it
  ;;; under the terms of the GNU General Public License as published by
  ;;; the Free Software Foundation; either version 3 of the License, or (at
  ;;; your option) any later version.

diff --cc distro/packages/base.scm
index 63eea60,0f60e98..cb0cb0f
--- 1/distro/packages/base.scm
--- 2/distro/packages/base.scm
+++ b/distro/packages/base.scm
@@@ -1,10 -1,10 +1,10 @@@
- ;;; Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
- ;;; Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org>
- ;;; Copyright (C) 2012 Nikita Karetnikov <nikita@karetnikov.org>
+ ;;; GNU Guix --- Functional package management for GNU
 -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
++;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+ ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
  ;;;
- ;;; This file is part of Guix.
+ ;;; This file is part of GNU Guix.
  ;;;
- ;;; Guix is free software; you can redistribute it and/or modify it
+ ;;; GNU Guix is free software; you can redistribute it and/or modify it
  ;;; under the terms of the GNU General Public License as published by
  ;;; the Free Software Foundation; either version 3 of the License, or (at
  ;;; your option) any later version.

diff --cc distro/packages/bash.scm
Simple merge

diff --cc distro/packages/bootstrap.scm
index 2d35d3c,8d1d1e9..9bf815b
--- 1/distro/packages/bootstrap.scm
--- 2/distro/packages/bootstrap.scm
+++ b/distro/packages/bootstrap.scm
@@@ -1,9 -1,9 +1,9 @@@
- ;;; Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
- ;;; Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+ ;;; GNU Guix --- Functional package management for GNU
 -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
++;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
  ;;;
- ;;; This file is part of Guix.
+ ;;; This file is part of GNU Guix.
  ;;;
- ;;; Guix is free software; you can redistribute it and/or modify it
+ ;;; GNU Guix is free software; you can redistribute it and/or modify it
  ;;; under the terms of the GNU General Public License as published by
  ;;; the Free Software Foundation; either version 3 of the License, or (at
  ;;; your option) any later version.

diff --cc distro/packages/compression.scm
Simple merge

diff --cc distro/packages/gawk.scm
Simple merge

diff --cc distro/packages/gettext.scm
Simple merge

diff --cc distro/packages/guile.scm
Simple merge

diff --cc distro/packages/linux.scm
index bbb5834,62bdefb..a40cc27
--- 1/distro/packages/linux.scm
--- 2/distro/packages/linux.scm
+++ b/distro/packages/linux.scm
@@@ -176,3 -172,25 +177,25 @@@ providing the system administrator wit
      ;; explicitly defined license.
      (license '(gpl3+ gpl2+ gpl2 lgpl2.0+
                 bsd-4 public-domain))))
 -    (license gpl2+)))
+ 
+ (define-public usbutils
+   (package
+     (name "usbutils")
+     (version "006")
+     (source
+      (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kernel.org/linux/utils/usb/usbutils/"
+                           "usbutils-" version ".tar.xz"))
+       (sha256
+        (base32
+         "03pd57vv8c6x0hgjqcbrxnzi14h8hcghmapg89p8k5zpwpkvbdfr"))))
+     (build-system gnu-build-system)
+     (inputs
+      `(("libusb" ,libusb) ("pkg-config" ,pkg-config)))
+     (home-page "http://www.linux-usb.org/")
+     (synopsis
+      "Tools for working with USB devices, such as lsusb")
+     (description
+      "Tools for working with USB devices, such as lsusb.")
++    (license gpl2+)))

diff --cc distro/packages/lsh.scm
index 8f44967,fa19d3e..d2c2d90
--- 1/distro/packages/lsh.scm
--- 2/distro/packages/lsh.scm
+++ b/distro/packages/lsh.scm
@@@ -1,9 -1,9 +1,9 @@@
- ;;; Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
- ;;; Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+ ;;; GNU Guix --- Functional package management for GNU
 -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
++;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
  ;;;
- ;;; This file is part of Guix.
+ ;;; This file is part of GNU Guix.
  ;;;
- ;;; Guix is free software; you can redistribute it and/or modify it
+ ;;; GNU Guix is free software; you can redistribute it and/or modify it
  ;;; under the terms of the GNU General Public License as published by
  ;;; the Free Software Foundation; either version 3 of the License, or (at
  ;;; your option) any later version.

diff --cc distro/packages/m4.scm
Simple merge

diff --cc distro/packages/make-bootstrap.scm
index ea889d0,09b8c69..b1d74ec
--- 1/distro/packages/make-bootstrap.scm
--- 2/distro/packages/make-bootstrap.scm
+++ b/distro/packages/make-bootstrap.scm
@@@ -1,9 -1,9 +1,9 @@@
- ;;; Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
- ;;; Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+ ;;; GNU Guix --- Functional package management for GNU
 -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
++;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
  ;;;
- ;;; This file is part of Guix.
+ ;;; This file is part of GNU Guix.
  ;;;
- ;;; Guix is free software; you can redistribute it and/or modify it
+ ;;; GNU Guix is free software; you can redistribute it and/or modify it
  ;;; under the terms of the GNU General Public License as published by
  ;;; the Free Software Foundation; either version 3 of the License, or (at
  ;;; your option) any later version.

diff --cc distro/packages/multiprecision.scm
Simple merge

diff --cc distro/packages/ncurses.scm
index 62f957e,f8641c7..938d1dc
--- 1/distro/packages/ncurses.scm
--- 2/distro/packages/ncurses.scm
+++ b/distro/packages/ncurses.scm
@@@ -1,9 -1,9 +1,9 @@@
- ;;; Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
- ;;; Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+ ;;; GNU Guix --- Functional package management for GNU
 -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
++;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
  ;;;
- ;;; This file is part of Guix.
+ ;;; This file is part of GNU Guix.
  ;;;
- ;;; Guix is free software; you can redistribute it and/or modify it
+ ;;; GNU Guix is free software; you can redistribute it and/or modify it
  ;;; under the terms of the GNU General Public License as published by
  ;;; the Free Software Foundation; either version 3 of the License, or (at
  ;;; your option) any later version.

diff --cc distro/packages/perl.scm
index c4bfb6b,9f8de3d..b635787
--- 1/distro/packages/perl.scm
--- 2/distro/packages/perl.scm
+++ b/distro/packages/perl.scm
@@@ -1,9 -1,9 +1,9 @@@
- ;;; Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
- ;;; Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+ ;;; GNU Guix --- Functional package management for GNU
 -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
++;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
  ;;;
- ;;; This file is part of Guix.
+ ;;; This file is part of GNU Guix.
  ;;;
- ;;; Guix is free software; you can redistribute it and/or modify it
+ ;;; GNU Guix is free software; you can redistribute it and/or modify it
  ;;; under the terms of the GNU General Public License as published by
  ;;; the Free Software Foundation; either version 3 of the License, or (at
  ;;; your option) any later version.

diff --cc distro/packages/readline.scm
Simple merge

diff --cc guix/build-system/gnu.scm
Simple merge

diff --cc guix/build/download.scm
Simple merge

diff --cc release.nix
Simple merge

diff --cc tests/derivations.scm
Simple merge

diff --cc tests/union.scm
index b2242a8,317d49d..58c0a30
--- 1/tests/union.scm
--- 2/tests/union.scm
+++ b/tests/union.scm
@@@ -1,9 -1,9 +1,9 @@@
- ;;; Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
- ;;; Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+ ;;; GNU Guix --- Functional package management for GNU
 -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
++;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
  ;;;
- ;;; This file is part of Guix.
+ ;;; This file is part of GNU Guix.
  ;;;
- ;;; Guix is free software; you can redistribute it and/or modify it
+ ;;; GNU Guix is free software; you can redistribute it and/or modify it
  ;;; under the terms of the GNU General Public License as published by
  ;;; the Free Software Foundation; either version 3 of the License, or (at
  ;;; your option) any later version.