Your message dated Sun, 24 Feb 2013 19:02:37 +0000
with message-id <[email protected]>
and subject line Bug#695479: fixed in magit 1.2.0-1~experimental1
has caused the Debian Bug report #695479,
regarding magit: Please package upstream release 1.2.0
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
695479: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695479
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
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" <[email protected]>
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 <[email protected]>
-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" <[email protected]>
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" <[email protected]>
+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" <[email protected]>
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
--- End Message ---
--- Begin Message ---
Source: magit
Source-Version: 1.2.0-1~experimental1
We believe that the bug you reported is fixed in the latest version of
magit, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Timo Juhani Lindfors <[email protected]> (supplier of updated magit package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sun, 24 Feb 2013 17:49:45 +0000
Source: magit
Binary: magit
Architecture: source all
Version: 1.2.0-1~experimental1
Distribution: experimental
Urgency: low
Maintainer: Timo Juhani Lindfors <[email protected]>
Changed-By: Timo Juhani Lindfors <[email protected]>
Description:
magit - Emacs interface for Git
Closes: 695479
Changes:
magit (1.2.0-1~experimental1) experimental; urgency=low
.
* New upstream release (Closes: #695479).
* Drop patch autogenerate-autoloads.diff.
* Bump standards-version to 3.9.4, no changes needed.
* Upload to experimental since wheezy is frozen.
Checksums-Sha1:
d3392c71d7eec276b400e105f3280d172fe88bb0 1987 magit_1.2.0-1~experimental1.dsc
b4d9531e9f66202f8a74cde38ad53ca1a6b4516d 163318 magit_1.2.0.orig.tar.gz
19a368e9c8373b041028707fbce1d609848a468e 6439
magit_1.2.0-1~experimental1.debian.tar.gz
89e61cd78525f6975d76b50dbedb4acd9c74186a 101140
magit_1.2.0-1~experimental1_all.deb
Checksums-Sha256:
feaa64addee649b2dc4bf278a1c808b7524f194054d3009ebd2778dd510e2600 1987
magit_1.2.0-1~experimental1.dsc
ef535819b8ee32c53ad38efabc82028f62422f2629407d69ddc5970669dc1ba9 163318
magit_1.2.0.orig.tar.gz
f59102d5527bc6c958d469e37c35bb7a67b198c3cba60fc0001140341a538ce5 6439
magit_1.2.0-1~experimental1.debian.tar.gz
f7fe5f9474dc0f2a3ab3af68232ae29db561fcaac5da3f77c72168b4bf475da3 101140
magit_1.2.0-1~experimental1_all.deb
Files:
6b771c45e5ea3728f1be7b168c4d9f60 1987 vcs optional
magit_1.2.0-1~experimental1.dsc
72bad34c38e0d5bc153b7fa9045e905c 163318 vcs optional magit_1.2.0.orig.tar.gz
4c2c9f4739ddc15c91e1ca3948023014 6439 vcs optional
magit_1.2.0-1~experimental1.debian.tar.gz
f8f11541e1f53f66adeb2863a1908d9f 101140 vcs optional
magit_1.2.0-1~experimental1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAEBCAAGBQJRKmOIAAoJEE0knZsj5vw6+W0P/j0HEMZPuhtbVKf8WtdWvsPq
ZLPVfec1OJBR4Wo/F9DVMF9WhXs6049JGy62YuoClftiDXpQmn8cztnQZ+8i6R2x
UjnO2L2R1XxNJomlXq9HqNE3vx5LCUylH6Vha2o1r1hl5qq51Sw4yy8WMhZrS+BM
pXhNROkHnFSgtgnyMN/OL/YcHvJSc+0KEVm66/KdxJ9ZEX/4u5083lxciEVxE/Ao
oq1kxNbxIC5arE6/UJSZ+lAxaAPwVUVmwlNUMh0vNeBuGUZvNAznbQPjBeoxFxD/
tG61hGof6dsDsGhFcN8vIcFnFO8mrfW1E2D//eqIPpFaLqSdUDE4VoIP45Uco8Wt
3S1n3mg++1wJy2+VzuRWV9PeguCKfX7IrFpvqHux8x0ny0ttVMsI1sX2bHgcDvIL
FrQyHohbjAk99APSNcGdAXNkJ9h9VzO/RzPptZdOdJzH6wqaUQAbHQd9ks6Reecs
a6j/XqSzsD/WTsX02nsAlc1W0mvNlqZZ4BPBd3FTV/cY4vM7Mu6pJgBTlSY/a/sj
WsPbMjll5KF10z65L4XiKDe9FtBazY/kkPMaeOuBlly4LJx75+rAWYXCy6C/g8kN
/lAel6KqKwGAhqFo4ykknFUH08W4CflPcilje+jib0CUxjcTenfnvXtZzhoXgyGL
JjOfaPYSZJfQ+WWxjuL+
=Iutr
-----END PGP SIGNATURE-----
--- End Message ---
