[jedit] 05/06: update d/copyright for jedit/macros/Emacs

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository jedit.

commit 8c2592595364e37922fe548ec2b678dea70118ac
Author: tony mancill <tmancill at debian.org>
Date:   Sun Oct 20 21:30:36 2013 -0700

    update d/copyright for jedit/macros/Emacs
    
    update d/rules to no longer install LICENSE.md
---
 debian/changelog |    1 +
 debian/copyright |   29 +++++++++++++++++++++++++++++
 debian/rules     |    5 ++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 01bb59e..2a9fa16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jedit (5.1.0+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream version.
+  * Update debian/copyright with license for usr/share/jedit/macros/Emacs
 
  -- tony mancill <tmancill at debian.org>  Sun, 20 Oct 2013 16:20:32 -0700
 
diff --git a/debian/copyright b/debian/copyright
index 2c14c6c..614bd70 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -118,6 +118,35 @@ License: other
  merchantability or fitness for a particular purpose. Please use
  it AT YOUR OWN RISK.
 
+Files: macros/Emacs/*
+Copyright: 2005-2010 Brian M. Clapper
+License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ . 
+ * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+ . 
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ . 
+ * Neither the name "clapper.org" nor the names of its contributors may be
+   used to endorse or promote products derived from this software without
+   specific prior written permission.
+ . 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
 Files: debian/*
 Copyright: 2010, Gabriele Giacone <1o5g4r8o at gmail.com>
 License: GPL-2+
diff --git a/debian/rules b/debian/rules
index d18e3fb..c127f4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ override_dh_auto_build:
 	cp build/doc/CHANGES.txt build/doc/changelog
 
 override_dh_auto_install:
-	dh_install
+	#dh_install
 	# icons
 	for i in 16 22 48; do \
 		mkdir -p $(ICONS)/$${i}x$${i}/apps; \
@@ -53,6 +53,9 @@ override_dh_auto_install:
 	sed -i '$$s/$$/ icon="\/usr\/share\/pixmaps\/jedit.xpm"/;s/Apps/Applications/' \
 		debian/jedit.menu
 
+override_dh_install:
+	dh_install --exclude=LICENSE.md
+
 override_dh_auto_clean:
 	-dh_quilt_unpatch
 	-mv debian/patches/series debian/patches/series.noauto

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jedit.git