[ecj] 15/145: Import Debian changes 3.1.2-5

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository ecj.

commit 83c3879d2a29dd31c23820c1be086b6dadb3069c
Author: Michael Koch <konqueror at gmx.de>
Date:   Sat May 6 16:25:40 2006 +0000

    Import Debian changes 3.1.2-5
    
    ecj-bootstrap (3.1.2-5) unstable; urgency=low
    
      * Updated Standards-Version to 3.7.2. No changes needed.
---
 debian/changelog |  8 +++++++-
 debian/control   |  2 +-
 debian/copyright | 19 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab4435c..c9769bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ecj-bootstrap (3.1.2-5) unstable; urgency=low
+
+  * Updated Standards-Version to 3.7.2. No changes needed.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat,  6 May 2006 16:25:40 +0000
+
 ecj-bootstrap (3.1.2-4) unstable; urgency=low
 
   * Build using gij-4.1/gcj-4.1.
@@ -6,7 +12,7 @@ ecj-bootstrap (3.1.2-4) unstable; urgency=low
 
  -- Matthias Klose <doko at debian.org>  Sat,  1 Apr 2006 11:29:03 +0000
 
- ecj-bootstrap  (3.1.2-3) experimental; urgency=low
+ecj-bootstrap (3.1.2-3) experimental; urgency=low
 
    * Build using gcj-4.1, upload to experimental.
 
diff --git a/debian/control b/debian/control
index be803c0..8786cc5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>
 Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.1.0), gcj-4.1 (>= 4.1.0), fastjar, ant
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: ecj-bootstrap
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index c591ceb..5efc60d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,9 @@ This software is copyright (c) 2000, 2004 IBM Corporation and others,
 licensed under the Common Public License - v 1.0.
 
 The ecj script is Copyright (C) 2004  Red Hat, licensed under the GPL with
-a special exception.
+a special exception. The full text of the GPL can be found in
+/usr/share/common-licenses/GPL-2. The full text of the exception is stated
+below.
 
 Copyright:
 
@@ -239,3 +241,18 @@ intellectual property laws of the United States of America. No party to
 this Agreement will bring a legal action under this Agreement more than 
 one year after the cause of action arose. Each party waives its rights 
 to a jury trial in any resulting litigation. 
+
+
+Linking Exception clause for GPL
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.

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