Commit 4558f8edc5ee4135deb1d46f1150af58763738d4 - magit

+8

-3

debian/changelog less more

0	0	magit (3.0.0-1) UNRELEASED; urgency=medium
1	1
2	2	* New upstream version
3		* adapt watch file
4
5		-- Rémi Vanicat <vanicat@debian.org> Tue, 25 May 2021 12:23:52 +0200
	3	* Adapt watch file
	4	* Adapt patches
	5	- 0002-Do-not-require-async.patch not needed anymore
	6	- 0005-Update-version-and-require-of-git-commit.patch: most is
	7	integrated upstream, the rest in:
	8	0004-Signal-in-the-documentation-there-are-Debian-patches.patch
	9
	10	-- Rémi Vanicat <vanicat@debian.org> Tue, 25 May 2021 12:52:58 +0200
6	11
7	12	magit (2.99.0.git0957.ge8c7bd03-1) unstable; urgency=medium
8	13

+0

-29

~~debian/patches/0002-Do-not-require-async.patch~~ less more

0		From: =?utf-8?q?R=C3=A9mi_Vanicat?= <vanicat@debian.org>
1		Date: Tue, 3 Apr 2018 05:47:10 +0200
2		Subject: Do not require async.
3
4		It is not needed for debian package.
5		---
6		lisp/magit-pkg.el \| 11 +++++------
7		1 file changed, 5 insertions(+), 6 deletions(-)
8
9		diff --git a/lisp/magit-pkg.el b/lisp/magit-pkg.el
10		index ee981ce..cef324a 100644
11		--- a/lisp/magit-pkg.el
12		+++ b/lisp/magit-pkg.el
13		@@ -1,10 +1,9 @@
14		-(define-package "magit" "2.90.1"
15		+(define-package "magit" "2.99.0"
16		"A Git porcelain inside Emacs."
17		'((emacs "25.1")
18		- (async "20180527")
19		- (dash "20180910")
20		- (git-commit "20181104")
21		- (transient "20190812")
22		- (with-editor "20181103"))
23		+ (dash "2.17.0")
24		+ (git-commit "2.90.1")
25		+ (transient "0.2.0")
26		+ (with-editor "2.9.1"))
27		:keywords
28		'("git" "tools" "vc"))

+2

-2

debian/patches/0003-Remove-magit-version.el-from-autogenerated-files.patch less more

8	8	1 file changed, 1 insertion(+), 1 deletion(-)
9	9
10	10	diff --git a/default.mk b/default.mk
11		index e493959..a7a5d1c 100644
	11	index 8c93fd0..5d1e257 100644
12	12	--- a/default.mk
13	13	+++ b/default.mk
14		@@ -97,7 +97,7 @@ ELS += magit-imenu.el
	14	@@ -98,7 +98,7 @@ ELS += magit-imenu.el
15	15	ELS += magit-bookmark.el
16	16	ELCS = $(ELS:.el=.elc)
17	17	ELMS = magit.el $(filter-out $(addsuffix .el,$(PACKAGES)),$(ELS))

+53

-0

debian/patches/0004-Signal-in-the-documentation-there-are-Debian-patches.patch less more

	0	From: =?utf-8?q?R=C3=A9mi_Vanicat?= <vanicat@debian.org>
	1	Date: Tue, 25 May 2021 12:44:46 +0200
	2	Subject: Signal in the documentation there are Debian patches.
	3
	4	---
	5	Documentation/magit.org \| 4 ++--
	6	Documentation/magit.texi \| 4 ++--
	7	2 files changed, 4 insertions(+), 4 deletions(-)
	8
	9	diff --git a/Documentation/magit.org b/Documentation/magit.org
	10	index edfa0c6..9e33bfe 100644
	11	--- a/Documentation/magit.org
	12	+++ b/Documentation/magit.org
	13	@@ -8,7 +8,7 @@
	14	#+TEXINFO_DIR_CATEGORY: Emacs
	15	#+TEXINFO_DIR_TITLE: Magit: (magit).
	16	#+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
	17	-#+SUBTITLE: for version 3.0.0
	18	+#+SUBTITLE: for version 3.0.0 (with debian Patches)
	19
	20	#+TEXINFO_DEFFN: t
	21	#+OPTIONS: H:4 num:3 toc:2
	22	@@ -25,7 +25,7 @@
	23	Magit and Git itself deserve to be called porcelains.
	24
	25	#+TEXINFO: @noindent
	26	-This manual is for Magit version 3.0.0.
	27	+This manual is for Magit version 3.0.0 (with debian Patches)
	28
	29	#+BEGIN_QUOTE
	30	Copyright (C) 2015-2021 Jonas Bernoulli <jonas@bernoul.li>
	31	diff --git a/Documentation/magit.texi b/Documentation/magit.texi
	32	index 34ce8f0..b57f85e 100644
	33	--- a/Documentation/magit.texi
	34	+++ b/Documentation/magit.texi
	35	@@ -31,7 +31,7 @@ General Public License for more details.
	36	@finalout
	37	@titlepage
	38	@title Magit User Manual
	39	-@subtitle for version 3.0.0
	40	+@subtitle for version 3.0.0 (with Debian patches)
	41	@author Jonas Bernoulli
	42	@page
	43	@vskip 0pt plus 1filll
	44	@@ -53,7 +53,7 @@ directly from within Emacs. While many fine Git clients exist, only
	45	Magit and Git itself deserve to be called porcelains.
	46
	47	@noindent
	48	-This manual is for Magit version 3.0.0.
	49	+This manual is for Magit version 3.0.0 (with Debian patches)
	50
	51	@quotation
	52	Copyright (C) 2015-2021 Jonas Bernoulli <jonas@@bernoul.li>

+5

-5

debian/patches/0004-tramp-test-overide.patch less more

7	7	1 file changed, 14 insertions(+), 13 deletions(-)
8	8
9	9	diff --git a/t/magit-tests.el b/t/magit-tests.el
10		index 1982133..96566d2 100644
	10	index 523cc51..d414333 100644
11	11	--- a/t/magit-tests.el
12	12	+++ b/t/magit-tests.el
13		@@ -71,19 +71,20 @@
14		(list shell-file-name))
	13	@@ -83,19 +83,20 @@
	14	shell-file-name)))
15	15	((cdr (assq 'tramp-login-args sudo-method)) nil))
16	16	(magit-with-test-directory
17	17	- (setq default-directory
18	18	- (concat (format "/sudo:%s@localhost:" (user-login-name))
19	19	- default-directory))
20		- (magit-git "init" "repo")
	20	- (magit-test-init-repo "repo")
21	21	- (magit-test-magit-toplevel)
22	22	- (should (equal (magit-toplevel "repo/.git/")
23	23	- (expand-file-name "repo/")))

31	31	+ (setq default-directory
32	32	+ (concat (format "/sudo:%s@localhost:" (user-login-name))
33	33	+ default-directory))
34		+ (magit-git "init" "repo")
	34	+ (magit-test-init-repo "repo")
35	35	+ (magit-test-magit-toplevel)
36	36	+ (should (equal (magit-toplevel "repo/.git/")
37	37	+ (expand-file-name "repo/")))

+0

-24

~~debian/patches/0005-Update-version-and-require-of-git-commit.patch~~ less more

0		From: =?utf-8?q?R=C3=A9mi_Vanicat?= <vanicat@debian.org>
1		Date: Mon, 6 Jul 2020 15:41:00 +0200
2		Subject: Update version and require of git-commit
3
4		---
5		lisp/git-commit.el \| 3 ++-
6		1 file changed, 2 insertions(+), 1 deletion(-)
7
8		diff --git a/lisp/git-commit.el b/lisp/git-commit.el
9		index 4ed2072..063601e 100644
10		--- a/lisp/git-commit.el
11		+++ b/lisp/git-commit.el
12		@@ -11,9 +11,10 @@
13		;; Marius Vollmer <marius.vollmer@gmail.com>
14		;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
15
16		-;; Package-Requires: ((emacs "25.1") (dash "20180910") (transient "20190812") (with-editor "20181103"))
17		+;; Package-Requires: ((emacs "25.1") (dash "2.17.0") (transient "0.2.0") (with-editor "2.9.1"))
18		;; Keywords: git tools vc
19		;; Homepage: https://github.com/magit/magit
20		+;; Version: 2.99.0
21
22		;; This file is not part of GNU Emacs.
23

+1

-2

debian/patches/series less more

0	0	0004-tramp-test-overide.patch
1	1	0003-Remove-magit-version.el-from-autogenerated-files.patch
2		0002-Do-not-require-async.patch
3	2	0001-add-config.mk
4		0005-Update-version-and-require-of-git-commit.patch
	3	0004-Signal-in-the-documentation-there-are-Debian-patches.patch