[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'wip-gobject-introspection'
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'wip-gobject-introspection' |
|
Date: |
Mon, 26 Jan 2015 02:21:19 +0000 |
mhw pushed a commit to branch master
in repository guix.
commit 5ade90ba6976a5ce8715de07344985c70c0eda8b
Merge: 06aac93 94987eb
Author: Mark H Weaver <address@hidden>
Date: Sun Jan 25 21:15:13 2015 -0500
Merge branch 'wip-gobject-introspection'
gnu/packages/glib.scm | 22 ++++++++-----
gnu/packages/gnome.scm | 34 +++++++++++++++-----
gnu/packages/gtk.scm | 26 ++++++++-------
gnu/packages/linux.scm | 18 +++++++++--
...gobject-introspection-absolute-shlib-path.patch | 30 +++++++++++++++++
.../gobject-introspection-girepository.patch | 25 ++++++++++++++
gnu/packages/python.scm | 33 +++----------------
gnu/packages/xorg.scm | 3 +-
8 files changed, 131 insertions(+), 60 deletions(-)
diff --cc gnu/packages/gnome.scm
index 0a6c1d4,0f33880..535913b
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -1,8 -1,9 +1,9 @@@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Andreas Enge <address@hidden>
-;;; Copyright © 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2015 Andreas Enge <address@hidden>
+;;; Copyright © 2014, 2015 Ludovic Courtès <address@hidden>
;;; Copyright © 2014 Ian Denhardt <address@hidden>
;;; Copyright © 2014 Eric Bavier <address@hidden>
+ ;;; Copyright © 2014, 2015 Federico Beffa <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/gtk.scm
index b03cf76,f48815a..6bd4e36
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@@ -1,8 -1,9 +1,9 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <address@hidden>
-;;; Copyright © 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
;;; Copyright © 2014 Eric Bavier <address@hidden>
+ ;;; Copyright © 2015 Federico Beffa <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/python.scm
index 5555acf,2f518d9..4b30695
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -1,10 -1,10 +1,10 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Nikita Karetnikov <address@hidden>
;;; Copyright © 2013, 2014 Ludovic Courtès <address@hidden>
-;;; Copyright © 2013, 2014 Andreas Enge <address@hidden>
+;;; Copyright © 2013, 2014, 2015 Andreas Enge <address@hidden>
;;; Copyright © 2014 Mark H Weaver <address@hidden>
;;; Copyright © 2014 Eric Bavier <address@hidden>
- ;;; Copyright © 2014 Federico Beffa <address@hidden>
+ ;;; Copyright © 2014, 2015 Federico Beffa <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;