Commit 0fcc6472216942c3c229e6df19e8b1558cbb52f1 - magit

+3

-3

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 5af4493..1d2d6d4 100644
	11	index ad6abbb9..b2c1eddf 100644
12	12	--- a/default.mk
13	13	+++ b/default.mk
14		@@ -51,7 +51,7 @@ ELS += magit-extras.el
	14	@@ -72,7 +72,7 @@ ELS += magit-extras.el
15	15	ELS += git-rebase.el
16	16	ELCS = $(ELS:.el=.elc)
17	17	ELMS = magit.el $(filter-out $(addsuffix .el,$(PACKAGES)),$(ELS))
18	18	-ELGS = magit-autoloads.el magit-version.el
19	19	+ELGS = magit-autoloads.el
20	20
21		EMACS_VERSION = 24.4
	21	## Versions ##########################################################
22	22

+4

-4

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

8	8	2 files changed, 2 insertions(+), 2 deletions(-)
9	9
10	10	diff --git a/lisp/magit-popup.el b/lisp/magit-popup.el
11		index 287d46b..68161a6 100644
	11	index 68c58a0c..4c90d492 100644
12	12	--- a/lisp/magit-popup.el
13	13	+++ b/lisp/magit-popup.el
14	14	@@ -12,7 +12,7 @@

21	21	;; Homepage: https://github.com/magit/magit
22	22
23	23	diff --git a/lisp/magit.el b/lisp/magit.el
24		index 748545f..ad1ed25 100644
	24	index 6abc346d..386dbdf0 100644
25	25	--- a/lisp/magit.el
26	26	+++ b/lisp/magit.el
27	27	@@ -16,7 +16,7 @@
28	28	;; Rémi Vanicat <vanicat@debian.org>
29	29	;; Yann Hodique <yann.hodique@gmail.com>
30	30
31		-;; Package-Requires: ((emacs "24.4") (async "1.9") (dash "2.13.0") (with-editor "2.5.1") (git-commit "2.7.0") (magit-popup "2.7.0"))
32		+;; Package-Requires: ((emacs "24.4") (dash "2.13.0") (with-editor "2.5.1") (git-commit "2.7.0") (magit-popup "2.7.0"))
	31	-;; Package-Requires: ((emacs "24.4") (async "1.9") (dash "2.13.0") (with-editor "2.5.8") (git-commit "2.8.0") (magit-popup "2.8.0"))
	32	+;; Package-Requires: ((emacs "24.4") (dash "2.13.0") (with-editor "2.5.8") (git-commit "2.8.0") (magit-popup "2.8.0"))
33	33	;; Keywords: git tools vc
34	34	;; Homepage: https://github.com/magit/magit
35	35

+7

-7

debian/patches/0005-Remove-dependency-on-dash-elpa-package.patch less more

10	10	3 files changed, 3 insertions(+), 3 deletions(-)
11	11
12	12	diff --git a/lisp/git-commit.el b/lisp/git-commit.el
13		index 38e4e94..623fd6b 100644
	13	index 6e5a87c3..b6b84818 100644
14	14	--- a/lisp/git-commit.el
15	15	+++ b/lisp/git-commit.el
16	16	@@ -11,7 +11,7 @@
17	17	;; Marius Vollmer <marius.vollmer@gmail.com>
18	18	;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
19	19
20		-;; Package-Requires: ((emacs "24.4") (dash "2.13.0") (with-editor "2.5.1"))
21		+;; Package-Requires: ((emacs "24.4") (with-editor "2.5.1"))
	20	-;; Package-Requires: ((emacs "24.4") (dash "2.13.0") (with-editor "2.5.8"))
	21	+;; Package-Requires: ((emacs "24.4") (with-editor "2.5.8"))
22	22	;; Keywords: git tools vc
23	23	;; Homepage: https://github.com/magit/magit
24	24
25	25	diff --git a/lisp/magit-popup.el b/lisp/magit-popup.el
26		index 68161a6..fda24da 100644
	26	index 4c90d492..4f73520f 100644
27	27	--- a/lisp/magit-popup.el
28	28	+++ b/lisp/magit-popup.el
29	29	@@ -12,7 +12,7 @@

36	36	;; Homepage: https://github.com/magit/magit
37	37
38	38	diff --git a/lisp/magit.el b/lisp/magit.el
39		index ad1ed25..57aedd1 100644
	39	index 386dbdf0..75ff961a 100644
40	40	--- a/lisp/magit.el
41	41	+++ b/lisp/magit.el
42	42	@@ -16,7 +16,7 @@
43	43	;; Rémi Vanicat <vanicat@debian.org>
44	44	;; Yann Hodique <yann.hodique@gmail.com>
45	45
46		-;; Package-Requires: ((emacs "24.4") (dash "2.13.0") (with-editor "2.5.1") (git-commit "2.7.0") (magit-popup "2.7.0"))
47		+;; Package-Requires: ((emacs "24.4") (with-editor "2.5.1") (git-commit "2.7.0") (magit-popup "2.7.0"))
	46	-;; Package-Requires: ((emacs "24.4") (dash "2.13.0") (with-editor "2.5.8") (git-commit "2.8.0") (magit-popup "2.8.0"))
	47	+;; Package-Requires: ((emacs "24.4") (with-editor "2.5.8") (git-commit "2.8.0") (magit-popup "2.8.0"))
48	48	;; Keywords: git tools vc
49	49	;; Homepage: https://github.com/magit/magit
50	50