Release version 2.12.02.12.0

7 files changed, 75 insertions, 21 deletions

diff --git a/Documentation/RelNotes/2.12.0.txt b/Documentation/RelNotes/2.12.0.txt
index 7379fe0..b54ebf7 100644
--- a/Documentation/RelNotes/2.12.0.txt
+++ b/Documentation/RelNotes/2.12.0.txt
@@ -1,5 +1,22 @@
-Magit v2.12.0 Release Notes (unreleased)
-========================================
+It's Magit!  A Git Porcelain inside Emacs
+=========================================
+
+Magit is a text-based Git user interface that puts an unmatched focus
+on streamlining workflows. Commands are invoked using short mnemonic
+key sequences that take the cursor’s position in the highly actionable
+interface into account to provide context-sensitive behavior.
+
+With Magit you can do nearly everything that you can do when using Git
+on the command-line, but at greater speed and while taking advantage
+of advanced features that previously seemed too daunting to use on a
+daily basis. Many users will find that by using Magit they can become
+more effective Git user.
+
+For more information about Magit, see https://magit.vc
+and https://emacsair.me/2017/09/01/campaign-articles.
+
+Magit v2.12.0 Release Notes
+===========================
 
 Upcoming breaking changes
 -------------------------
@@ -598,3 +615,40 @@ c9689c670 magit-popup: locally set another display-buffer variable
 
 * Buffers listing repositories using `tabulated-list-mode' did not
   preserve point when being refreshed.  2f0302635
+
+This release also contains other minor improvements, bug fixes, typo
+fixes, and documentation fixes.
+
+Authors
+-------
+
+   500  Jonas Bernoulli
+    26  Kyle Meyer
+    15  Phil Sainty
+    13  Alexander Gramiak
+    13  Noam Postavsky
+     7  Sean Allred
+     4  Basil L. Contovounesios
+     3  Bastian Beischer
+     3  Damien Cassou
+     3  Štěpán Němec
+     2  Bar Magal
+     2  Daniel Mai
+     2  Matthew Fluet
+     1  Chris LaRose
+     1  Daniel Gröber
+     1  Daniel Kraus
+     1  David Ellison
+     1  Fritz Stelzer
+     1  Jim Blandy
+     1  John Mastro
+     1  Kenny Ballou
+     1  Matthieu Hauglustaine
+     1  Matus Goljer
+     1  Orivej Desh
+     1  Philipp Stephani
+     1  Radon Rosborough
+     1  Vladimir Panteleev
+     1  Wilfred Hughes
+     1  Wouter Bolsterlee
+     1  Xu Chunyang
diff --git a/Documentation/magit.org b/Documentation/magit.org
index 25682de..b02c511 100644
--- a/Documentation/magit.org
+++ b/Documentation/magit.org
@@ -7,7 +7,7 @@
 #+TEXINFO_DIR_CATEGORY: Emacs
 #+TEXINFO_DIR_TITLE: Magit: (magit).
 #+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
-#+SUBTITLE: for version 2.11.0 (2.11.0-594-g6258dd92c+1)
+#+SUBTITLE: for version 2.12.0
 #+BIND: ox-texinfo+-before-export-hook ox-texinfo+-update-version-strings
 
 #+TEXINFO_DEFFN: t
@@ -22,7 +22,7 @@ directly from within Emacs.  While many fine Git clients exist, only
 Magit and Git itself deserve to be called porcelains.
 
 #+TEXINFO: @noindent
-This manual is for Magit version 2.11.0 (2.11.0-594-g6258dd92c+1).
+This manual is for Magit version 2.12.0.
 
 #+BEGIN_QUOTE
 Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index 2abbd35..9e8a74d 100644
--- a/Documentation/magit.texi
+++ b/Documentation/magit.texi
@@ -30,7 +30,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit User Manual
-@subtitle for version 2.11.0 (2.11.0-594-g6258dd92c+1)
+@subtitle for version 2.12.0
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -52,7 +52,7 @@ directly from within Emacs.  While many fine Git clients exist, only
 Magit and Git itself deserve to be called porcelains.
 
 @noindent
-This manual is for Magit version 2.11.0 (2.11.0-594-g6258dd92c+1).
+This manual is for Magit version 2.12.0.
 
 @quotation
 Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
diff --git a/Makefile b/Makefile
index ff77780..60e9c56 100644
--- a/Makefile
+++ b/Makefile
@@ -166,7 +166,7 @@ dist: magit-$(VERSION).tar.gz
 versionlib:
 	@$(MAKE) -C lisp versionlib
 
-DIST_ROOT_FILES = COPYING default.mk Makefile README.md
+DIST_ROOT_FILES = LICENSE default.mk Makefile README.md
 DIST_LISP_FILES = $(addprefix lisp/,$(ELS) magit-version.el Makefile)
 DIST_DOCS_FILES = $(addprefix Documentation/,$(TEXIPAGES) AUTHORS.md Makefile)
 ifneq ("$(wildcard Documentation/RelNotes/$(VERSION).txt)","")
diff --git a/default.mk b/default.mk
index eafa6f6..4dd6245 100644
--- a/default.mk
+++ b/default.mk
@@ -94,17 +94,17 @@ VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0)
 ASYNC_VERSION       = 1.9.2
 DASH_VERSION        = 2.13.0
 GHUB_VERSION        = 2.0.0
-GIT_COMMIT_VERSION  = 2.10.3
+GIT_COMMIT_VERSION  = 2.11.0
 LET_ALIST_VERSION   = 1.0.5
-MAGIT_POPUP_VERSION = 2.13.0
-WITH_EDITOR_VERSION = 2.6.0
+MAGIT_POPUP_VERSION = 2.13.3
+WITH_EDITOR_VERSION = 2.7.2
 
 ASYNC_MELPA_SNAPSHOT       = 20170823
 DASH_MELPA_SNAPSHOT        = 20170810
-GHUB_MELPA_SNAPSHOT        = 20171207
-GIT_COMMIT_MELPA_SNAPSHOT  = 20170823
-MAGIT_POPUP_MELPA_SNAPSHOT = 20171121
-WITH_EDITOR_MELPA_SNAPSHOT = 20170817
+GHUB_MELPA_SNAPSHOT        = 20180328
+GIT_COMMIT_MELPA_SNAPSHOT  = 20180329
+MAGIT_POPUP_MELPA_SNAPSHOT = 20180329
+WITH_EDITOR_MELPA_SNAPSHOT = 20180318
 
 EMACS_VERSION = 24.4
 
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 99d2230..072150b 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -11,7 +11,7 @@
 ;;	Marius Vollmer <marius.vollmer@gmail.com>
 ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
 
-;; Package-Requires: ((emacs "24.4") (dash "20170810") (with-editor "20170817"))
+;; Package-Requires: ((emacs "24.4") (dash "2.13.0") (with-editor "2.7.2"))
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
 
diff --git a/lisp/magit-pkg.el b/lisp/magit-pkg.el
index ac229bd..d53f16e 100644
--- a/lisp/magit-pkg.el
+++ b/lisp/magit-pkg.el
@@ -1,10 +1,10 @@
 (define-package "magit" "2.12.0"
   "A Git porcelain inside Emacs."
   '((emacs "24.4")
-    (async "20170823")
-    (dash "20170810")
-    (ghub "20171207")
-    (git-commit "20170823")
+    (async "1.9.2")
+    (dash "2.13.0")
+    (ghub "2.0.0")
+    (git-commit "2.11.0")
     (let-alist "1.0.5")
-    (magit-popup "20171121")
-    (with-editor "20170817")))
+    (magit-popup "2.13.3")
+    (with-editor "2.7.2")))