Timo Juhani Lindfors <[email protected]>
writes:

> Ramkumar Ramachandra <[email protected]> writes:
>> Yeah, me too.  Let the Debian policy people decide what to do :)
>
> magit 1.1.0-1 is now in debian unstable. I did not call "make
> install_contrib" there mostly because I have not tested
> magit-simple-keys.el or magit-classic-theme.el. This means I did not
> feel very comfortable at writing documentation on how to enable these
> either at this time.
>

Is the following acceptable:

>From faa7463500945b61fafc60f11fa12eb8c5e9c79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Vanicat?= <[email protected]>
Date: Mon, 9 Jan 2012 17:42:36 +0100
Subject: [PATCH] Install the contribs in the Debian package.

---
 debian/README.Debian         |   26 ++++++++++++++++++++++++++
 debian/changelog             |    6 ++++++
 debian/magit.emacsen-install |    2 +-
 debian/rules                 |    1 +
 4 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 039b898..432c731 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,6 +1,31 @@
 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 reenable those simpler
+binding by adding
+
+    (require 'magit-simple-keys)
+
+to your .emacs.
+
+ -- Rémi Vanicat <[email protected]>, Mon,  9 Jan 2012 17:40:37 +0100
+
+Using magit classic theme
+-------------------------
+
+Magit comme with a color theme that try to make magit look like older
+version of magit. You can load it by using
+
+    (load-theme 'magit-classic)
+
+to your .emacs
+
+ -- Rémi Vanicat <[email protected]>, Mon,  9 Jan 2012 17:37:08 +0100
+
 Colors used by magit are invisible?
 -----------------------------------
 
@@ -14,3 +39,4 @@ to ~/.emacs or by using M-x customize-variable RET
 frame-background-mode RET.
 
  -- Timo Juhani Lindfors <[email protected]>, Fri, 25 Feb 2011 19:05:11 
+0200
+
diff --git a/debian/changelog b/debian/changelog
index 3606e00..0edf9ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+magit (1.1.0-2) unstable; urgency=low
+
+  * Install contrib
+
+ -- Rémi Vanicat <[email protected]>  Mon, 09 Jan 2012 17:29:56 +0100
+
 magit (1.1.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/magit.emacsen-install b/debian/magit.emacsen-install
index 94b65bf..9c832d9 100644
--- a/debian/magit.emacsen-install
+++ b/debian/magit.emacsen-install
@@ -6,7 +6,7 @@ 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"
+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"
 el_dir=/usr/share/emacs/site-lisp/${PACKAGE}/
 elc_dir=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}/
 
diff --git a/debian/rules b/debian/rules
index e4ab221..4890ec2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
        dh $@
 
 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
-- 
1.7.8.2


Reply via email to