...
 
Commits (5)
magit (2.12.1-1) UNRELEASED; urgency=medium
* New upstream version
* Run test:
* Depend on git, elpa-dash, elpa-with-editor, elpa-magit-popup, elpa-ghub
* Set some variable (locale, and GIT variables)
* Ensure tramp test do not write in ~/
-- Rémi Vanicat <vanicat@debian.org> Tue, 03 Apr 2018 05:30:37 +0200
-- Rémi Vanicat <vanicat@debian.org> Wed, 11 Apr 2018 19:06:16 +0200
magit (2.11.0-1) unstable; urgency=medium
......
......@@ -3,8 +3,9 @@ Section: vcs
Priority: optional
Maintainer: Debian Emacs addons team <pkg-emacsen-addons@lists.alioth.debian.org>
Uploaders: Timo Juhani Lindfors <timo.lindfors@iki.fi>, Rémi Vanicat <vanicat@debian.org>, Barak A. Pearlmutter <bap@debian.org>
Build-Depends: debhelper (>= 10), dh-elpa (>= 1.7), elpa-dash,
texinfo, install-info
Build-Depends: debhelper (>= 10), dh-elpa (>= 1.7),
git, elpa-dash, elpa-with-editor, elpa-magit-popup, elpa-ghub,
texinfo, install-info
Standards-Version: 4.1.3
Homepage: http://magit.vc/
Vcs-Browser: https://salsa.debian.org/emacsen-team/magit
......@@ -33,17 +34,6 @@ Built-Using: ${misc:Built-Using}
Description: Major mode for editing git commit message
A mode for editing COMMIT_MSG file from git in Emacs.
Package: elpa-magit-popup
Architecture: all
Depends: ${misc:Depends}, ${elpa:Depends}
Built-Using: ${misc:Built-Using}
Enhances: emacs, emacs24, emacs25
Description: Use popup like Magit
Magit use popup to run different git function and select the option
you want
.
This package allow you to use those popup in other Emacs mode.
Package: magit
Priority: extra
Section: oldlibs
......
README.md
CONTRIBUTING.md
Documentation/CONTRIBUTING.md
Documentation/AUTHORS.md
Documentation/RelNotes
Documentation/magit-popup.info
#!/bin/sh
set -e
if [ "$1" = "failed-upgrade" ] ; then
# there was a bug in dh-elpa,
# this code won't be needed after Stretch released
if dpkg --compare-versions "$2" lt 2.3.0-2; then
echo "elpa-magit-popup: recovering from past breakage" >&2
echo "may be leaving behind stuff in /usr/share/emacs24/site-lisp/elpa/" >&2
exit 0
fi
fi
#DEBHELPER#
lisp/magit-pkg.el
lisp/magit.el
lisp/magit-apply.el
lisp/git-rebase.el
lisp/magit-autorevert.el
lisp/magit-bisect.el
lisp/magit-blame.el
lisp/magit-bookmark.el
lisp/magit-branch.el
lisp/magit-collab.el
lisp/magit-commit.el
lisp/magit-core.el
lisp/magit-diff.el
......@@ -12,24 +15,25 @@ lisp/magit-ediff.el
lisp/magit-extras.el
lisp/magit-files.el
lisp/magit-git.el
lisp/magit-imenu.el
lisp/magit-log.el
lisp/magit-margin.el
lisp/magit-merge.el
lisp/magit-mode.el
lisp/magit-notes.el
lisp/magit-obsolete.el
lisp/magit-popup.el
lisp/magit-process.el
lisp/magit-refs.el
lisp/magit-remote.el
lisp/magit-repos.el
lisp/magit-reset.el
lisp/magit-section.el
lisp/magit-sequence.el
lisp/magit-stash.el
lisp/magit-status.el
lisp/magit-submodule.el
lisp/magit-subtree.el
lisp/magit-tag.el
lisp/magit-utils.el
lisp/magit-wip.el
lisp/magit-worktree.el
lisp/magit-bookmark.el
lisp/magit-imenu.el
Description: Add a config.mk to make testing happy
The test need to find where elpa package are installed
Author: Rémi Vanicat <vanicat@debian.org>
---
Origin: debian
Forwarded: not-needed
Last-Update: 2018-04-11
--- /dev/null
+++ magit-2.12.1/config.mk
@@ -0,0 +1 @@
+ELPA_DIR = /usr/share/emacs/site-lisp/elpa-src
Description: set tramp-histfile-override in tramp test
In Debian building system, we can't wrote in home direcetory
Author: Rémi Vanicat <vanicat@debian.org>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: debian
Forwarded: not-needed
Last-Update: 2018-04-11
--- magit-2.12.1.orig/t/magit-tests.el
+++ magit-2.12.1/t/magit-tests.el
@@ -71,19 +71,20 @@
(list shell-file-name))
((cdr (assq 'tramp-login-args sudo-method)) nil))
(magit-with-test-directory
- (setq default-directory
- (concat (format "/sudo:%s@localhost:" (user-login-name))
- default-directory))
- (magit-git "init" "repo")
- (magit-test-magit-toplevel)
- (should (equal (magit-toplevel "repo/.git/")
- (expand-file-name "repo/")))
- (should (equal (magit-toplevel "repo/.git/objects/")
- (expand-file-name "repo/")))
- (should (equal (magit-toplevel "repo-link/.git/")
- (expand-file-name "repo-link/")))
- (should (equal (magit-toplevel "repo-link/.git/objects/")
- (expand-file-name "repo/"))))))
+ (let ((tramp-histfile-override default-directory))
+ (setq default-directory
+ (concat (format "/sudo:%s@localhost:" (user-login-name))
+ default-directory))
+ (magit-git "init" "repo")
+ (magit-test-magit-toplevel)
+ (should (equal (magit-toplevel "repo/.git/")
+ (expand-file-name "repo/")))
+ (should (equal (magit-toplevel "repo/.git/objects/")
+ (expand-file-name "repo/")))
+ (should (equal (magit-toplevel "repo-link/.git/")
+ (expand-file-name "repo-link/")))
+ (should (equal (magit-toplevel "repo-link/.git/objects/")
+ (expand-file-name "repo/")))))))
(ert-deftest magit-toplevel:submodule ()
(let ((find-file-visit-truename nil))
0004-tramp-test-overide.patch
0003-Remove-magit-version.el-from-autogenerated-files.patch
0002-Do-not-require-async.patch
0001-add-config.mk
......@@ -3,6 +3,11 @@ include /usr/share/dpkg/pkg-info.mk
export DEB_VERSION_UPSTREAM
# This is needed for running correctly the test in auto-builder
export GIT_AUTHOR_NAME = "Magit testeur"
export GIT_COMMITTER_NAME = "Magit committer"
export LC_ALL = C.UTF-8
%:
dh $@ --with elpa
......@@ -13,23 +18,8 @@ override_dh_auto_build:
override_dh_auto_install:
@echo do not run make install
override_dh_auto_test:
@echo Testing disabled, discussion in comment below.
override_dh_elpa_test:
make test
override_dh_clean:
dh_clean
# "make test" runs a test suite, which works fine on a development
# environment, but not on the autobuilders. To get it to work on the
# autobuilders requires a few tweaks, as of 2.2.1:
# - The upstream tarball does not contain /t/magit-tests.el; for
# convenience this is included in
# debian/patch/*-upstream-repo-files.patch
# - The testing routines require git to be installed, so you need a
# build dependency on git
# - There is one more mysterious error with a non-ASCII filename that
# occurs only in a minimal chroot environment