[SCM] jedit - Java plugin-based editor for programmers branch, master, updated. debian/4.4.1+dfsg-1-6-g597e67b

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit 597e67bbe2ece663343471c5d5d06d4d28868416
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Thu Nov 10 00:44:40 2011 +0100

    Fix d/copyright according to DEP-5.

diff --git a/debian/changelog b/debian/changelog
index f009363..5d930cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ jedit (4.4.2+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Fix pixmaps dir typo (Closes: #648232).
+  * Fix d/copyright according to DEP-5.
 
- -- Gabriele Giacone <1o5g4r8o at gmail.com>  Thu, 10 Nov 2011 00:14:25 +0100
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Thu, 10 Nov 2011 00:44:09 +0100
 
 jedit (4.4.1+dfsg-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 126744a..57f303f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,9 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: jEdit - A plugin-based editor for programmers
-Maintainer: Contributors <jedit-devel at lists.sourceforge.net>
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Upstream-Name: jEdit - A plugin-based editor for programmers
+Upstream-Contact: Contributors <jedit-devel at lists.sourceforge.net>
 Source: http://www.jedit.org/
 
+Files: *
 Copyright: 1999-2010, Contributors <jedit-devel at lists.sourceforge.net>
 License: GPL-2+
  On Debian systems the full text of the GNU General Public 
@@ -16,27 +17,33 @@ License: GFDL-1.1+
  Documentation License, Version 1.2 License can be found in
  the `/usr/share/common-licenses/GFDL-1.2' file.
 
-Files: jEdit/installer/ConsoleInstall.java,
- jEdit/installer/ConsoleProgress.java,
- jEdit/installer/Install.java,
- jEdit/installer/InstallThread.java,
- jEdit/installer/InvalidHeaderException.java,
- jEdit/installer/NonInteractiveInstall.java,
- jEdit/installer/OperatingSystem.java,
- jEdit/installer/Progress.java,
- jEdit/installer/SwingInstall.java,
- jEdit/installer/TarBuffer.java,
- jEdit/installer/TarEntry.java,
- jEdit/installer/TarHeader.java,
- jEdit/installer/TarInputStream.java,
- jEdit/installer/TarOutputStream.java,
+Files: jEdit/installer/ConsoleInstall.java
+ jEdit/installer/ConsoleProgress.java
+ jEdit/installer/Install.java
+ jEdit/installer/InstallThread.java
+ jEdit/installer/InvalidHeaderException.java
+ jEdit/installer/NonInteractiveInstall.java
+ jEdit/installer/OperatingSystem.java
+ jEdit/installer/Progress.java
+ jEdit/installer/SwingInstall.java
+ jEdit/installer/TarBuffer.java
+ jEdit/installer/TarEntry.java
+ jEdit/installer/TarHeader.java
+ jEdit/installer/TarInputStream.java
+ jEdit/installer/TarOutputStream.java
  jEdit/installer/VariableGridLayout.java
-Copyright: Public domain
-License: Public domain
+Copyright: none
+License: public-domain
+ This work has been placed into the public domain. You may use this work in any
+ way and for any purpose you wish.
+ THIS SOFTWARE IS PROVIDED AS-IS WITHOUT WARRANTY OF ANY KIND, NOT EVEN THE
+ IMPLIED WARRANTY OF MERCHANTABILITY. THE AUTHOR OF THIS SOFTWARE, ASSUMES
+ _NO_ RESPONSIBILITY FOR ANY CONSEQUENCE RESULTING FROM THE USE, MODIFICATION,
+ OR REDISTRIBUTION OF THIS SOFTWARE.
 
-Files: jEdit/installer/BZip2Constants.java,
- jEdit/installer/CBZip2InputStream.java,
- jEdit/installer/CBZip2OutputStream.java,
+Files: jEdit/installer/BZip2Constants.java
+ jEdit/installer/CBZip2InputStream.java
+ jEdit/installer/CBZip2OutputStream.java
  jEdit/installer/CRC.java
 Copyright: 2000, The Apache Software Foundation
 License: Apache Software License version 1.1
@@ -118,7 +125,7 @@ License: GPL-2+
  License can be found in the `/usr/share/common-licenses/GPL-2'
  file.
 
-Files: debian/patches/00bsh-jedit, debian/patches/01bsh-jedit-asm
+Files: debian/patches/00bsh-jedit debian/patches/01bsh-jedit-asm
 Copyright: 1999-2010, Contributors <jedit-devel at lists.sourceforge.net>
 License: GPL-2+
  On Debian systems the full text of the GNU General Public 

-- 
jedit - Java plugin-based editor for programmers