debian/0000755000000000000000000000000012201712025007156 5ustar debian/control0000644000000000000000000000165312112461520010570 0ustar Source: magit Section: vcs Priority: optional Maintainer: Timo Juhani Lindfors Uploaders: Marius Vollmer , Teemu Hukkanen Build-Depends: debhelper (>= 7.0.50~), emacs23, texinfo, install-info Standards-Version: 3.9.4 Homepage: http://magit.github.com/magit/index.html Vcs-Browser: http://git.debian.org/?p=collab-maint/magit.git Vcs-Git: git://git.debian.org/collab-maint/magit.git Package: magit Architecture: all Depends: ${misc:Depends}, emacs23 | emacs24 | emacs-snapshot, git-core, dpkg (>= 1.15.4) | install-info Description: Emacs interface for Git With Magit, you can inspect and modify your Git repositories with Emacs. You can review and commit the changes you have made to the tracked files, for example, and you can browse the history of past changes. There is support for cherry picking, reverting, merging, rebasing, and other common Git operations. debian/docs0000644000000000000000000000001212112461520010024 0ustar README.md debian/source/0000755000000000000000000000000012112461520010460 5ustar debian/source/format0000644000000000000000000000001412112461520011666 0ustar 3.0 (quilt) debian/compat0000644000000000000000000000000212112461520010356 0ustar 7 debian/rules0000755000000000000000000000121412112461520010236 0ustar #!/usr/bin/make -f %: dh $@ override_dh_auto_test: # Upstream testsuite is not part of released tarballs, it is only in git override_dh_auto_install: $(MAKE) install_contrib DESTDIR=$(CURDIR)/debian/magit PREFIX=/usr 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 50magit.el $(CURDIR)/debian/magit/usr/share/emacs/site-lisp/magit/magit-install.el rm -f debian/magit/usr/share/emacs/site-lisp/*.elc rm -f debian/magit/usr/share/info/dir rm -rf debian/magit/usr/bin debian/watch0000644000000000000000000000013512112461520010210 0ustar version=3 http://github.com/magit/magit/downloads /downloads/magit/magit/magit-(\d.+).tar.gz debian/copyright0000644000000000000000000001104212112650131011107 0ustar Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166 Source: https://github.com/magit/magit Files: * Copyright: 2010 Aaron Culich. 2010 Alan Falloon. 2008, 2010 Alex Ott. 2008, 2009, 2010 Alexey Voinov. 2011 Andreas Fuchs. 2010 Ben Walton. 2010, 2011 Brian Warner. 2010 Chris Bernard. 2010 Christian Kluge. 2008 Daniel Farina. 2010 Dave Abrahams. 2010 David Abrahams. 2009 David Wallin. 2011 Dominique Quatravaux. 2009, 2010 Hannu Koivisto. 2009 Ian Eure. 2009 Jesse Alama. 2009, 2010, 2012 John Wiegley. 2011 Julien Danjou. 2010, 2011 Leo. 2010 Marc Herbert. 2008, 2009 Marcin Bachry. 2008, 2009 Marius Vollmer. 2010 Mark Hepburn. 2010, 2011 Moritz Bunkus. 2012 Moritz Bunkus 2010 Nathan Weizenbaum. 2010 Oscar Fuentes. 2010 Paul Stadig. 2009 Pavel Holejsovsky. 2011, 2012 Peter J. Weisberg. 2009, 2010, 2011, 2013 Phil Jackson. 2010 Philip Weaver. 2010, 2011, 2012 Ramkumar Ramachandra. 2010 Remco van 't Veer. 2009 René Stadler. 2010 Robert Boone. 2010 Robin Green. 2010 Roger Crew. 2009, 2010, 2011, 2012, 2013 Rémi Vanicat. 2011, 2012, 2013 Rüdiger Sonderfeld. 2010 Sean Bryant. 2009 Steve Purcell. 2010, 2011, 2012 Timo Juhani Lindfors. 2010 Tom Feist. 2010, 2011, 2012, 2013 Yann Hodique. 2010 oscar. 2010 Ævar Arnfjörð Bjarmason. 2010 Óscar Fuentes. 2008 Linh Dang 2011 Eli Barzilay 2011 Hannu Koivisto 2011 Lluís Vilanova 2011, 2012, 2013 Nicolas Dudebout 2011, 2012 Peter J Weisberg 2011 Pieter Praet 2011 Roger Crew 2011 Ævar Arnfjörð Bjarmason 2011 Štěpán Němec 2012 Ryan C. Thompson 2012 Damien Cassou 2012, 2013 Jonas Bernoulli 2012, 2013 Leonardo Etcheverry 2012 Miles Bader 2012 Samuel Bronson 2012, 2013 Takafumi Arakaki License: GPL-3+ Files: magit.texi magit.info Copyright: 2008 Alex Ott. 2009 Alexey Voinov. 2010 Chris Bernard. 2010 Christian Kluge. 2011 Julien Danjou. 2008 Marcin Bachry. 2008, 2009 Marius Vollmer. 2010 Moritz Bunkus. 2010 Nathan Weizenbaum. 2009, 2010 Phil Jackson. 2009, 2010, 2011, 2012 Rémi Vanicat. 2010 Yann Hodique. 2011 Eli Barzilay 2011 Lluís Vilanova 2011 Moritz Bunkus 2011 Peter J Weisberg 2011 Peter J. Weisberg 2011 Pieter Praet 2011, 2012 Yann Hodique 2011 Štěpán Němec 2012 Nicolas Dudebout 2012 Ryan C. Thompson 2012 Rémi Vanicat License: GFDL-NIV-1.2+ Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. . On Debian systems, the complete text of the GNU Free Documentation License can be found in `/usr/share/common-licenses/GFDL-1.2'. Files: debian/* Copyright: 2008, 2009 Marius Vollmer 2010, 2011, 2012 Timo Juhani Lindfors 2011 Teemu Hukkanen 2012 Rémi Vanicat License: GPL-3+ License: GPL-3+ Magit is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. . Magit is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with Magit. If not, see . . On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-3'. debian/changelog0000644000000000000000000001602712201712025011036 0ustar magit (1.2.0-2) unstable; urgency=low * Backport patch to fix incompatibility with emacs-snapshot 24.3.50 (Closes: #718861) - bug-718861.patch -- Timo Juhani Lindfors Tue, 06 Aug 2013 12:27:17 +0300 magit (1.2.0-1) unstable; urgency=low * Upload to unstable. -- Timo Juhani Lindfors Mon, 13 May 2013 19:36:29 +0000 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. -- Timo Juhani Lindfors Sun, 24 Feb 2013 17:49:45 +0000 magit (1.1.1-3) unstable; urgency=low * Add emacs24 to the list of supported emacs versions (closes: #679781) -- Timo Juhani Lindfors Mon, 02 Jul 2012 16:19:41 +0300 magit (1.1.1-2) unstable; urgency=low * Backport upstream commit c8cfaf37b7c142edc6714d86691b8720f2606328 for autogenerating autoloads (closes: #671922). * Bump Standards-Version to 3.9.3 (no changes needed). * Update upstream homepage URL. * Remove DM-Upload-Allowed. -- Timo Juhani Lindfors Mon, 21 May 2012 14:35:24 +0000 magit (1.1.1-1) unstable; urgency=low [ Timo Juhani Lindfors] * New upstream release. [ Rémi Vanicat ] * Install contrib .el files -- Timo Juhani Lindfors Mon, 23 Jan 2012 09:31:11 +0200 magit (1.1.0-1) unstable; urgency=low * New upstream release. * Use upstream tarball instead of regenerating one from git tag, mostly because make dist nowadays embeds version numbers to the *.el files (LP: #853567). * Drop patch inherit-standard-faces.diff that is now upstream. * Update watch file path. -- Timo Juhani Lindfors Sat, 31 Dec 2011 02:31:11 +0200 magit (1.0.0-2) unstable; urgency=low * Bump Standards-Version to 3.9.2 (no changes needed). * Drop article from package description to make lintian happy. * Add patch inherit-standard-faces.diff - Backport upstream commit 3d0ea1d60fbc0a8135e2146418c0c64c9d05705a to use standard faces where possible (closes: #637193). -- Timo Juhani Lindfors Tue, 30 Aug 2011 23:37:02 +0000 magit (1.0.0-1) unstable; urgency=low [ Timo Juhani Lindfors ] * New upstream release. * Drop support for emacsen other than emacs23 or emacs-snapshot (closes: #619480). [ Teemu Hukkanen ] * Add DM-Upload-Allowed. -- Teemu Hukkanen Mon, 11 Apr 2011 21:57:51 +0300 magit (0.8.2+20110220-1) unstable; urgency=low [ Timo Juhani Lindfors ] * New upstream release (closes: #586039, #586047, #591646, #591646, #597149). * Provide debian/watch file (closes: #586051). * Switch to dpkg-source 3.0 (quilt) format. * Simplify debian/rules and upstream all debian/patches. * Bump Standards-Version to 3.9.1 (no changes needed) * Update copyright information in DEP-5 format. [ Teemu Hukkanen ] * Move package to collab-maint. * Add install-info to Build-Depends. * Add myself to Uploaders. -- Teemu Hukkanen Mon, 21 Mar 2011 21:02:51 +0200 magit (0.7-1.1) unstable; urgency=low [ Stefano Zacchiroli ] * Non-maintainer upload. * (Including pending maintainer changes, in wait of sponsoring.) * Bump Standard-Version to 3.8.4 (no changes needed) * Add Build-Dep on autoconf and automake, to support "autoreconf -fi" * debian/rules: install NEWS as upstream changelog * debian/docs: install README and AUTHORS as documentation [ Marius Vollmer ] * Added Homepage, Vcs-Git, and Vcs-Browser fields. * Added git-core and emacs to Depends (closes: 529040). * Use /usr/bin/emacsclient always (closes: 530266). * Don't include /usr/share/info/dir.gz (closes: 549590). * Switched to source format 3.0 (quilt). * Don't ship any generated files; instead, call autoreconf from debian/rules. -- Stefano Zacchiroli Wed, 10 Mar 2010 09:49:14 +0100 magit (0.7-1) unstable; urgency=low * first official debian upload (closes: #518818) [ RISKO Gergely ] * pointer added to GFDL-1.2 in debian/copyright * changed debian/compat to 7 * standards-version to 3.8.1 [ Marius Vollmer ] * Follow Debian Emacsen policy. - Use scripts in /usr/lib/emacsen-common/packages to byte-compile during installation. * List all authors in debian/copyright. * Lintian fixes. New upstream release. * Tagging, on 't' and 'T'. * Stashing, on 'z' and 'Z'. * Wazzup, on 'w'. Wazzup gives you an overview over how other branches relate to the current one. * There is more control over pushing. 'P' now takes a prefix argument and pushing a branch without a default remote will ask for one. * Logs have changed a bit: 'l' shows the traditional brief log, and 'L' shows a more verbose log. Use the prefix arg to specify the range of the log. * M-x magit-status doesn't prompt anymore for a directory when invoked from within a Git repository. Use C-u to force a prompt. * When you have nothing staged, 'c' will now explicitly ask whether to commit everything instead of just going ahead and do it. This can be customized. * The digit keys '1', '2', '3', and '4' now show sections on the respective level and hide everything below. With Meta, they work on all sections; without, they work only on sections that are a parent or child of the current section. * Typing '+' and '-' will change the size of hunks, via the "-U" option to git diff. '0' resets hunks to their default size. * Typing 'k' on the "Untracked files" section title will offer to delete all untracked files. * Magit understands a bit of git-svn: the status buffer shows unpushed and unpulled commits, 'N r' runs git svn rebase, and 'N c' runs git svn dcommit. * Magit now also works when the direcory is accessed via tramp. * M-x magit-status can also create new repositories when given a directory that is not a Git repository. * Magit works better with oldish Gits that don't understand "--graph", for example. * The name of the Git program and common options for it can be customized. -- Marius Vollmer Sun, 26 Apr 2009 19:13:16 +0300 magit (0.6.1-1) unstable; urgency=low * Fixed a bug that screwed up working with multiple repositories. -- Marius Vollmer Mon, 13 Oct 2008 00:40:08 +0300 magit (0.6-1) unstable; urgency=low Almost everything has changed. Please read the manual again. Some highlights: * Magit now works with Git 1.6.0. (John Wiegley) * Support for interactive rewriting. * Sections can be shown and hidden. * Staging, unstaging, applying, reverting and discarding changes can now be done line-by-line, not only hunk-by-hunk. -- Marius Vollmer Mon, 13 Oct 2008 00:32:44 +0300 magit (0.5-1) unstable; urgency=low * First release. -- Marius Vollmer Thu, 14 Aug 2008 02:11:00 +0300 debian/magit.emacsen-startup0000644000000000000000000000046212112461520013320 0ustar ;;; 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") (message "Package magit removed but not purged. Skipping setup."))) debian/README.Debian0000644000000000000000000000205712112461520011225 0ustar magit for Debian ================ Using magit magit simple keys ----------------------------- Older version of magit used a simpler mapping for key, that didn't give access to all magit capabilities. You can re-enable those simpler binding by adding (eval-after-load 'magit '(progn (ignore-errors (require 'magit-simple-keys)))) to your .emacs. Using magit classic theme ------------------------- Magit comes with a color theme that try to make magit look like older version of magit. You can load it by adding (eval-after-load 'magit '(progn (ignore-errors (load-theme 'magit-classic)))) to your .emacs Colors used by magit are invisible? ----------------------------------- Emacs has probably failed to detect that your background is black. This is an issue especially with KDE konsole (see upstream bug 121). You can workaround this by adding (setq frame-background-mode 'dark) to ~/.emacs or by using M-x customize-variable RET frame-background-mode RET. -- Rémi Vanicat , Mon, 9 Jan 2012 17:40:37 +0100 debian/magit.emacsen-remove0000644000000000000000000000056112112461520013113 0ustar #!/bin/sh # /usr/lib/emacsen-common/packages/remove/magit set -e PACKAGE=magit FLAVOR=$1 elc_dir=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} case "${FLAVOR}" in emacs) ;; *) echo remove/${PACKAGE}: Purging byte-compiled files for ${FLAVOR} rm -f ${elc_dir}/*.elc ${elc_dir}/*.el rmdir ${elc_dir} || true ;; esac exit 0; debian/patches/0000755000000000000000000000000012201712002010600 5ustar debian/patches/series0000644000000000000000000000002112201711165012017 0ustar bug-718861.patch debian/patches/bug-718861.patch0000644000000000000000000000612212201712002013153 0ustar Description: backport of upstream commit ff24d86ef9ee5cb76e08b9ba115f6c92e8c5ec2e too support emacs 24.3.50 Author: Timo Juhani Lindfors Forwarded: not-needed Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718861 --- a/magit.el +++ b/magit.el @@ -734,24 +734,6 @@ ;;; Compatibilities (eval-and-compile - (defun magit-max-args-internal (function) - "Returns the maximum number of arguments accepted by FUNCTION." - (if (symbolp function) - (setq function (symbol-function function))) - (if (subrp function) - (let ((max (cdr (subr-arity function)))) - (if (eq 'many max) - most-positive-fixnum - max)) - (if (eq 'macro (car-safe function)) - (setq function (cdr function))) - (let ((arglist (if (byte-code-function-p function) - (aref function 0) - (second function)))) - (if (memq '&rest arglist) - most-positive-fixnum - (length (remq '&optional arglist)))))) - (if (functionp 'start-file-process) (defalias 'magit-start-process 'start-file-process) (defalias 'magit-start-process 'start-process)) @@ -774,22 +756,28 @@ before-change-functions after-change-functions) ,@body))))) + ) - (if (>= (magit-max-args-internal 'delete-directory) 2) - (defalias 'magit-delete-directory 'delete-directory) - (defun magit-delete-directory (directory &optional recursive) - "Deletes a directory named DIRECTORY. If RECURSIVE is non-nil, -recursively delete all of DIRECTORY's contents as well. - -Does not follow symlinks." - (if (or (file-symlink-p directory) - (not (file-directory-p directory))) - (delete-file directory) - (if recursive - ;; `directory-files-no-dot-files-regex' borrowed from Emacs 23 - (dolist (file (directory-files directory 'full "\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")) - (magit-delete-directory file recursive))) - (delete-directory directory))))) +;; RECURSIVE has been introduced with Emacs 23.2, XEmacs still lacks it. +;; This is copied and adapted from `tramp-compat-delete-directory' +(defun magit-delete-directory (directory &optional recursive) + "Compatibility function for `delete-directory'." + (if (null recursive) + (delete-directory directory) + (condition-case nil + (funcall 'delete-directory directory recursive) + ;; This Emacs version does not support the RECURSIVE flag. We + ;; use the implementation from Emacs 23.2. + (wrong-number-of-arguments + (setq directory (directory-file-name (expand-file-name directory))) + (if (not (file-symlink-p directory)) + (mapc (lambda (file) + (if (eq t (car (file-attributes file))) + (org-delete-directory file recursive) + (delete-file file))) + (directory-files + directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))) + (delete-directory directory))))) ;;; Utilities debian/magit.emacsen-install0000644000000000000000000000231112112461520013257 0ustar #!/bin/sh # /usr/lib/emacsen-common/packages/install/magit set -e PACKAGE=magit FLAVOR=$1 byte_compile_options="-batch -f batch-byte-compile" el_files="magit-topgit.el magit.el magit-key-mode.el magit-svn.el magit-bisect.el magit-stgit.el magit-classic-theme.el magit-simple-keys.el rebase-mode.el magit-wip.el magit-blame.el" el_dir=/usr/share/emacs/site-lisp/${PACKAGE}/ elc_dir=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}/ case "${FLAVOR}" in emacs) ;; emacs23|emacs24|emacs-snapshot) echo install/${PACKAGE}: Handling install of emacsen flavor ${FLAVOR} [ -d ${elc_dir} ] || mkdir ${elc_dir} # Symlink the .el files (emacsen policy 6E) for i in ${el_files}; do ln -fs ../../../emacs/site-lisp/${PACKAGE}/${i} ${elc_dir}/${i} done # Byte compile them cd ${elc_dir} LOG=`mktemp -t elc.XXXXXXXXXXXX` if ! ${FLAVOR} ${byte_compile_options} ${el_files} > ${LOG} 2>&1; then echo Byte-compilation failed: cat ${LOG} rm ${LOG} exit 1 fi rm ${LOG} ;; *) echo install/${PACKAGE}: Ignoring unsupported flavor ${FLAVOR} ;; esac exit 0;