[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'gnome-updates'
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'gnome-updates' |
|
Date: |
Mon, 16 Jan 2017 08:55:37 +0000 (UTC) |
mhw pushed a commit to branch master
in repository guix.
commit a5ff4d65170ccd8156489aa1741a85b94434fba3
Merge: 8afabb2 2d5785a
Author: Mark H Weaver <address@hidden>
Date: Mon Jan 16 03:53:50 2017 -0500
Merge branch 'gnome-updates'
gnu/local.mk | 1 -
gnu/packages/fonts.scm | 6 +-
gnu/packages/freedesktop.scm | 7 +-
gnu/packages/gl.scm | 6 +-
gnu/packages/glib.scm | 24 +-
gnu/packages/gnome.scm | 433 ++++++++++++++-------
gnu/packages/gtk.scm | 69 ++--
gnu/packages/mail.scm | 6 +-
gnu/packages/mate.scm | 2 +-
gnu/packages/patches/totem-debug-format-fix.patch | 11 -
gnu/packages/patches/upower-builddir.patch | 2 +-
11 files changed, 348 insertions(+), 219 deletions(-)
diff --cc gnu/packages/gnome.scm
index 004fefa,a3cbe81..e279ef7
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -8,8 -8,8 +8,8 @@@
;;; Copyright © 2015 Mathieu Lirzin <address@hidden>
;;; Copyright © 2015 Andy Wingo <address@hidden>
;;; Copyright © 2015 David Hashe <address@hidden>
-;;; Copyright © 2015, 2016 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <address@hidden>
- ;;; Copyright © 2015, 2016 Mark H Weaver <address@hidden>
+ ;;; Copyright © 2015, 2016, 2017 Mark H Weaver <address@hidden>
;;; Copyright © 2015 David Thompson <address@hidden>
;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
;;; Copyright © 2016 Rene Saavedra <address@hidden>