Package: magit
Version: 1.2.0-local.1
Severity: wishlist
Tags: patch
As a quick hack to roll my own local version I applied the attached
patches; I do not endorse them in any way, as I did not have time to
study upstream changes, I just provide them here for convenience; they
seem to work for me, but YMMV.
--
Thanks, Davide
>From fd3e86b36f2c737c81719df0dc77b8df8cb03538 Mon Sep 17 00:00:00 2001
From: "Davide G. M. Salvetti" <sa...@debian.org>
Date: Sun, 2 Dec 2012 18:44:10 +0100
Subject: [PATCH 1/3] debian/patches: Synchronize with upstream
The following patch has been applied upstream and has therefore been
deleted:
- autogenerate-autoloads
---
debian/patches/autogenerate-autoloads.diff | 27 ---------------------------
debian/patches/series | 1 -
2 files changed, 28 deletions(-)
delete mode 100644 debian/patches/autogenerate-autoloads.diff
delete mode 100644 debian/patches/series
diff --git a/debian/patches/autogenerate-autoloads.diff b/debian/patches/autogenerate-autoloads.diff
deleted file mode 100644
index d88da9d..0000000
--- a/debian/patches/autogenerate-autoloads.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: autogenerate autoloads (magit-install.el)
- based on https://github.com/magit/magit/commit/c8cfaf37b7c142edc6714d86691b8720f2606328
-Author: Timo Juhani Lindfors <timo.lindf...@iki.fi>
-Forwarded: not-needed
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=671922
-
---- a/Makefile
-+++ b/Makefile
-@@ -20,7 +20,7 @@
-
- all: core docs contrib
-
--core: $(ELCS) magit.spec magit-pkg.el
-+core: $(ELCS) magit.spec magit-pkg.el magit-install.el
-
- docs: magit.info
-
-@@ -32,6 +32,9 @@
- magit-pkg.el: magit-pkg.el.in
- sed -e s/@VERSION@/$(VERSION)/ < $< > $@
-
-+magit-install.el: $(ELS)
-+ $(BATCH) --eval "(let ((generated-autoload-file \"$(CURDIR)/magit-install.el\") (make-backup-files nil)) (update-directory-autoloads \".\"))"
-+
- magit.elc: magit.el
- magit-key-mode.elc:
- magit-svn.elc:
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8dd8161..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-autogenerate-autoloads.diff
--
1.7.10.4
>From 16928869110c052fd59da32a895fc7945845a5b0 Mon Sep 17 00:00:00 2001
From: "Davide G. M. Salvetti" <sa...@debian.org>
Date: Sun, 2 Dec 2012 18:44:10 +0100
Subject: [PATCH 2/3] Add patch: Makefile-Disable-test-target
---
.../0001-Makefile-Disable-test-target.patch | 24 ++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 25 insertions(+)
create mode 100644 debian/patches/0001-Makefile-Disable-test-target.patch
create mode 100644 debian/patches/series
diff --git a/debian/patches/0001-Makefile-Disable-test-target.patch b/debian/patches/0001-Makefile-Disable-test-target.patch
new file mode 100644
index 0000000..37d1db9
--- /dev/null
+++ b/debian/patches/0001-Makefile-Disable-test-target.patch
@@ -0,0 +1,24 @@
+From: "Davide G. M. Salvetti" <sa...@debian.org>
+Date: Sun, 2 Dec 2012 18:44:10 +0100
+Subject: Makefile: Disable test target
+
+There's no tests/magit-tests.el file in the source, therefore the target
+cannot succeed.
+---
+ Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index cdbabe2..9317125 100644
+--- a/Makefile
++++ b/Makefile
+@@ -83,7 +83,8 @@ install_contrib: contrib
+ install_all: install install_contrib
+
+ test: $(ELCS)
+- $(BATCH) -l tests/magit-tests.el -f ert-run-tests-batch-and-exit
++ @echo "Cannot test: ain't no tests/magit-tests.el"
++# $(BATCH) -l tests/magit-tests.el -f ert-run-tests-batch-and-exit
+
+ clean:
+ rm -fr magit-pkg.el magit.spec 50magit.el $(ELCS) $(ELCS_CONTRIB) *.tar.gz magit-$(VERSION)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cb295f2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Makefile-Disable-test-target.patch
--
1.7.10.4
>From 1a1ce5762d1b53262ecf53ebd946da71d6d7209a Mon Sep 17 00:00:00 2001
From: "Davide G. M. Salvetti" <sa...@debian.org>
Date: Sat, 8 Dec 2012 23:06:10 +0100
Subject: [PATCH 3/3] Synchronize Emacs startup code with upstream
The emacs-install.el file has been renamed to 50emacs.el.
---
debian/magit.emacsen-startup | 4 ++--
debian/rules | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/magit.emacsen-startup b/debian/magit.emacsen-startup
index e875ae2..22901a2 100644
--- a/debian/magit.emacsen-startup
+++ b/debian/magit.emacsen-startup
@@ -1,6 +1,6 @@
;;; Autoloads for magit
(if (member debian-emacs-flavor '(emacs23 emacs24 emacs-snapshot))
- (if (file-exists-p "/usr/share/emacs/site-lisp/magit/magit-install.el")
- (load "/usr/share/emacs/site-lisp/magit/magit-install")
+ (if (file-exists-p "/usr/share/emacs/site-lisp/magit/50magit.el")
+ (load "/usr/share/emacs/site-lisp/magit/50magit")
(message "Package magit removed but not purged. Skipping setup.")))
diff --git a/debian/rules b/debian/rules
index b513c0a..3d81c95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ override_dh_auto_install:
dh_auto_install -- PREFIX=/usr
mkdir -p $(CURDIR)/debian/magit/usr/share/emacs/site-lisp/magit
mv $(CURDIR)/debian/magit/usr/share/emacs/site-lisp/*.el $(CURDIR)/debian/magit/usr/share/emacs/site-lisp/magit
- install -m 644 magit-install.el $(CURDIR)/debian/magit/usr/share/emacs/site-lisp/magit
+ install -m 644 50magit.el $(CURDIR)/debian/magit/usr/share/emacs/site-lisp/magit
rm -f debian/magit/usr/share/emacs/site-lisp/*.elc
rm -f debian/magit/usr/share/info/dir
rm -rf debian/magit/usr/bin
--
1.7.10.4
