[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#696165: marked as done (ITP: libdiffutils-java -- Java diff and patch library)



Your message dated Fri, 11 Oct 2013 03:44:36 +0100
with message-id <20131011024436.GN32557@stoneboat.aleph1.co.uk>
and subject line re: ITP: libdiffutils-java -- Java diff and patch library
has caused the Debian Bug report #696165,
regarding ITP: libdiffutils-java -- Java diff and patch library
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
696165: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=696165
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: wnpp
Severity: wishlist
Owner: Wookey <wookey@wookware.org>

* Package name    : libdiffutils-java
  Version         : 1.2.1
  Upstream Author : Dmitry Naumenko <dm.naumenko@gmail.com>
* URL             : http://code.google.com/p/java-diff-utils/
* License         : Apache-2
  Programming Lang: Java
  Description     : Java diff and patch library

The Diff Utils library performs comparison operations between texts: 
computing diffs, applying patches, generating unified diffs or 
parsing them, and generating diff output for easy display (such as
side-by-side view).

----------

This library is used by the next release of caveconverter
(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=696163) and thus
ought to be packaged in its own right rather than embedded.

--- End Message ---
--- Begin Message ---
Due to licencing issues, this package is not suitable for Debian.

Below is a mail describing the situation and the threads that went
into researching it. I had no response to this from the diffutils
author, only from the jrcs author saying 'better use my code as it is
properly licenced'. That could still be done, but I have no need for
it any longer so will not be uploading this.


----------------
Date: Mon, 12 Aug 2013 03:51:30 +0100
From: Wookey <wookey@wookware.org>
To: Juancarlo Añez <juancarlo.anez@gmail.com>, dm.naumenko@gmail.com
Subject: Re: Fw: Re: Origin/licencing of myersdiff java code

Thank you for your quick responses when I last asked about this. I had
some problems with actually packaging the code so it got stalled for a
while, but I have now sorted that out and it is ready to upload,
except that there still seems to me to be room for confusion over the
licencing. 

The thread is copied below, where Juancarlos gives the history of the
relicensing from Apache-1.1 to LPGL-2.1, Dmitry says it came from
http://code.google.com/p/jrcs, and Juancarlos confirms that that
version is LGPL.

This all seems clear enough, but looking at that repo and the code
the myers files have revision IDs in 2003:
DiffException.java $Revision: 69 $ $Date: 2003-10-13
DiffNode.java $Revision: 60 $ $Date: 2003-05-10
etc
and an Apache 1.1 header in them.

The history at http://code.google.com/p/jrcs just says 'initial import
from what Juanca sent me', which was in 2010.

So are those 2003 files still apache licensed really, despite what
Dmitry said about the source? What year/date was the shift from Apache
to LGPL? After 2003?

On the other hand, the top-level files (Delta, DiffAlgorithm, Patch,
etc) do not have revision IDs, but do have Apache 2.0 headers, and are
just marked "Copyright 2010 Dmitry Naumenko (dm.naumenko@gmail.com)",
implying at least later work, and possibly later derivation, which
would fit with Dmitry saying they came from http://code.google.com/p/jrcs

If this is the case where did the Apache-2.0 licence come from? That
would just seem to be wrong as Dmitry can't just change this
clearly-derived LGPL code into Apache-2.0. Even if it came from the
earlier Apache 1.1 code I don't think he can update them dervied files
to Apache-2.0.

So. What I currently have for a copyright file is (going on the
headers in the files, and the original mail thread, but I don't think
it can be right) is:

--------------------------
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: java-diff-utils
Upstream-contact: Dmitry Naumenko <dm.naumenko@gmail.com>
Source: http://code.google.com/p/java-diff-utils/
Comment: Much of this code was derived from JRCS, written by Juancarlo Añez
 <juancarlo.anez@gmail.com>, which was originally Apache-1.1 and later
 relicenced to LGPL-2.1. This version was derived from the 2003.06 LGPL
 vintage of JRCS at http://code.google.com/p/jrcs. Clarified in emails
 from Juancarlo Añez and Dmitry Naumenko. This is inconsistent with
 the headers provided by upstream at
 http://code.google.com/p/java-diff-utils/


Files: *
Copyright: Copyright 2010 Dmitry Naumenko <dm.naumenko@gmail.com>
License: Apache-2.0

Files: test/*
Copyright: Copyright 2010 Dmitry Naumenko <dm.naumenko@gmail.com>
License: GPL-v3+

Files: diffutils/myers/*
Copyright: Copyright 1999-2003 The Apache Software Foundation
License: LGPL-2.1

Files: debian/*
Copyright: Copyright 2012 Wookey <wookey@debian.org>
License: Apache-2.0
-------------------------

Do we think that that is right? If it is then at least the headers on the
diffutils/myers/* files should be changed to say LGPL-2.1.

I am not familiar enough with the codebase and time lines to work out
from the diffs and online repos, exactly when the code was split off.
But it does look like we have some inconsistency, or simply
wrongly-labelled files.

On reflection, and looking at the files, I think the real situation is
something more like:

---------------
Files: *
Copyright: Copyright 2010 Dmitry Naumenko <dm.naumenko@gmail.com> and
           1999-2006(?) Juancarlo Añez <juancarlo.anez@gmail.com>
License: LGPL-2.1

Files: test/*
Copyright: Copyright 2010 Dmitry Naumenko <dm.naumenko@gmail.com>
License: GPL-v3+

Files: diffutils/myers/*
Copyright: Copyright 1999-2003 The Apache Software Foundation
License: Apache-1.1

Files: debian/*
Copyright: Copyright 2012 Wookey <wookey@debian.org>
License: LGPL-2.1
-------------

If that is the case then the Apache-2.0 headers all need changing to
LGPL-2.1

In practice I think it would be better if we could agree between us a
consistent licence for the whole thing, which I think should really be
LGPL-2.1, and Dmitry should change the headers on the code in the repo
to match the reality, (giving due credit to Juancarlo by leaving his
name in).

So, what do you both think? Is there any way the Apache 2.0 licence
can be correct? Is everyone happy with LGPL-2.1 throughout (or "2.1 or
later"?). 

I'd like to get this unbunged so this can go in Debian, and hopefully
we don't actually have any disagreement, just some confusion, so it
can be sorted reasonably quickly (before I get distracted again for
another 6 months).

Comments and clarifications welcome.

> ----- Forwarded message from Dmitry Naumenko <dm.naumenko@gmail.com> -----
> 
> Date: Mon, 17 Dec 2012 16:08:21 +0200
> From: Dmitry Naumenko <dm.naumenko@gmail.com>
> To: Wookey <wookey@wookware.org>
> Cc: juanco@suigeneris.org, juancarlo.anez@gmail.com
> Subject: Re: Origin/licencing of myersdiff java code
> X-Spam-Status: No, score=-2.6 required=4.5 tests=BAYES_00,FREEMAIL_FROM,
> 	RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.1
> 
> Hi
> 
> The origin of diffutils/myers/DiffNode.java can be founded here: http://code.google.com/p/jrcs/source/.
> 
> I'm not sure if it's ok to copyright it under apache commons. I guess Jouanco can elaborate on this more clearly. 
> 
> Dmitry
> 
> On Dec 17, 2012, at 3:54 PM, Wookey wrote:
> 
> > Hi, I just had a go at packaging Dmitry's java-diff-utils library for
> > Debian as another package I am packaging (caveconverter) uses it.
> > 
> > http://code.google.com/p/java-diff-utils/
> > 
> > The myers subdir in that package contains a separate java module by a
> > different author and with different licencing, but it's not totally
> > clear to me exactly what came from where, so I thought I'd check as
> > some googling suggests that the original author is Juanco/Juancorlos
> > Anẽz.
> > 
> > Debian is careful to make sure everything we upload is properly
> > licenced as free software and correct attribution is given. Sorry to
> > bother you about this if I'm being dense but checking now can avoid a
> > lot of hassle later if any problems are found.
> > 
> > So. am I correct that the 'diffutils.myers' subdir of java-diff-utils 
> > contains code which is all
> > Copyright: 2002 Juanco Anez
> > License: Apache-1.1
> > 
> > and is the same code as is found here:
> > http://ci.apache.org/projects/wicket/apidocs/1.4.x/org/apache/wicket/util/diff/myers/DiffNode.html
> > and here:
> > http://wicket.sourceforge.net/wicket-1.2/apidocs/wicket/util/diff/myers/MyersDiff.html
> > 
> > I note that all the files say:
> > Copyright 1999-2003 The Apache Software Foundation
> > and have an Apache-1.1 header
> > 
> > except diffutils/myers/DiffNode.java
> > which says:
> > * <p>Title: </p>
> > * <p>Description: </p>
> > * <p>Copyright: Copyright (c) 2002</p>
> > * <p>Company: </p>
> > * @author not attributable
> > * @version 1.0
> > ...
> > * @version $Revision: 60 $ $Date: 2003-05-10 21:56:10 +0300 (Суб, 10
> > Май 2003) $
> > * @author <a href="mailto:juanco@suigeneris.org";>Juanco Anez</a>
> > 
> > Should this file be considered the same as the others or does it have
> > a different prevenance?
> > 
> > Strictly speaking this file appears to be 'All rights reserved, Juanco
> > Anez' and not be redistributable, but I assume that's not really what
> > was intended and it should be Apache-1.1, like the others? Should it
> > also be "Copyright 1999-2003 The Apache Software Foundation" rather than
> > "Copyright 2002 Juanco Anez"?
> > 
> > I see that the same file in the wicket 1.4.0 distribution does have a
> > standard apache header, so I guess that's how it should be.
> > 
> > Is there a difinitive source for this diff.myers package which might
> > be a) more up-to-date with bug-fixes etc? b) have clearer copyright attribution? 
> > 
> > It may make sense to package that separately from diffutils in Debian
> > due to the different licence and author. As you may know Java people
> > tend to bundle everything and have lots of copies of very similar
> > stuff, whilst Debian people prefer to have one (versioned if
> > necessary) copy of each thing.
> > 
> > Anyway - if either of you can confirm the correct copyright
> > attribution for the diff.myers code in java-diff-utils, or pointers to
> > latest versions, or (even better) would like to help maintain this
> > code in Debian (and derivatives) (I personally am clueless about java
> > except insofar as I now have packaged 4 application written in it),
> > that would be great.
> > 
> > Wookey
> > -- 
> > Principal hats:  Linaro, Emdebian, Wookware, Balloonboard, ARM
> > http://wookware.org/
> 
> 
> ----- End forwarded message -----
> ----- Forwarded message from Juancarlo Añez <juancarlo.anez@gmail.com> -----
> 
> Date: Mon, 17 Dec 2012 10:04:11 -0430
> From: Juancarlo Añez <juancarlo.anez@gmail.com>
> To: Wookey <wookey@wookware.org>
> Cc: juanco@suigeneris.org, dm.naumenko@gmail.com
> Subject: Re: Origin/licencing of myersdiff java code
> 
>    Hello,
>    I am the author of the original JRCS package which lived for a while on
>    the Apache Commons sandbox after the Maven project pulled it in.
>    Maven never got to use JRCS, so I took the project back, and relicensed it
>    under LGPL 2.1. Unfortunately, the source code does not bear the suggested
>    LGPL boilerplate but just a pointer to LICENSE.txt.
>    A snapshot of my project directory, dated 2007 and versioned 0.4.2, is
>    attached.
>    I don't know the java-diff-utils project. I just took a look at the source
>    code in Google Code, and most of the modules with (C) Dmitry Naumenko are
>    identical to or derived from those in JRCS, but I don't know which
>    version. 
>    If the code was derived from the ASF version, then the ASL requires that
>    mentions of the ASF be removed prior to publishing the modified version.
>    It would be good if the original author (I) was credited, but the ASL
>    doesn't require that. If the code was derived from a LGPL version, then
>    that's another story.
>    Cheers,
> 
>    On Mon, Dec 17, 2012 at 9:24 AM, Wookey <[1]wookey@wookware.org> wrote:
> 
>      Hi, I just had a go at packaging Dmitry's java-diff-utils library for
>      Debian as another package I am packaging (caveconverter) uses it.
> 
>      [2]http://code.google.com/p/java-diff-utils/
> 
>      The myers subdir in that package contains a separate java module by a
>      different author and with different licencing, but it's not totally
>      clear to me exactly what came from where, so I thought I'd check as
>      some googling suggests that the original author is Juanco/Juancorlos
>      Anẽz.
> 
>      Debian is careful to make sure everything we upload is properly
>      licenced as free software and correct attribution is given. Sorry to
>      bother you about this if I'm being dense but checking now can avoid a
>      lot of hassle later if any problems are found.
> 
>      So. am I correct that the 'diffutils.myers' subdir of java-diff-utils
>      contains code which is all
>      Copyright: 2002 Juanco Anez
>      License: Apache-1.1
> 
>      and is the same code as is found here:
>      [3]http://ci.apache.org/projects/wicket/apidocs/1.4.x/org/apache/wicket/util/diff/myers/DiffNode.html
>      and here:
>      [4]http://wicket.sourceforge.net/wicket-1.2/apidocs/wicket/util/diff/myers/MyersDiff.html
> 
>      I note that all the files say:
>      Copyright 1999-2003 The Apache Software Foundation
>      and have an Apache-1.1 header
> 
>      except diffutils/myers/DiffNode.java
>      which says:
>      * <p>Title: </p>
>      * <p>Description: </p>
>      * <p>Copyright: Copyright (c) 2002</p>
>      * <p>Company: </p>
>      * @author not attributable
>      * @version 1.0
>      ...
>      * @version $Revision: 60 $ $Date: 2003-05-10 21:56:10 +0300 (Суб, 10
>      Май 2003) $
>      * @author <a href="mailto:[5]juanco@suigeneris.org";>Juanco Anez</a>
> 
>      Should this file be considered the same as the others or does it have
>      a different prevenance?
> 
>      Strictly speaking this file appears to be 'All rights reserved, Juanco
>      Anez' and not be redistributable, but I assume that's not really what
>      was intended and it should be Apache-1.1, like the others? Should it
>      also be "Copyright 1999-2003 The Apache Software Foundation" rather than
>      "Copyright 2002 Juanco Anez"?
> 
>      I see that the same file in the wicket 1.4.0 distribution does have a
>      standard apache header, so I guess that's how it should be.
> 
>      Is there a difinitive source for this diff.myers package which might
>      be a) more up-to-date with bug-fixes etc? b) have clearer copyright
>      attribution?
> 
>      It may make sense to package that separately from diffutils in Debian
>      due to the different licence and author. As you may know Java people
>      tend to bundle everything and have lots of copies of very similar
>      stuff, whilst Debian people prefer to have one (versioned if
>      necessary) copy of each thing.
> 
>      Anyway - if either of you can confirm the correct copyright
>      attribution for the diff.myers code in java-diff-utils, or pointers to
>      latest versions, or (even better) would like to help maintain this
>      code in Debian (and derivatives) (I personally am clueless about java
>      except insofar as I now have packaged 4 application written in it),
>      that would be great.
>      Wookey
>      --
>      Principal hats:  Linaro, Emdebian, Wookware, Balloonboard, ARM
>      [6]http://wookware.org/
> 
>    --
>    Juancarlo Añez
>    tel:+58(414)901-2021
>    skype:juancarloanez
> 
> References
> 
>    Visible links
>    1. mailto:wookey@wookware.org
>    2. http://code.google.com/p/java-diff-utils/
>    3. http://ci.apache.org/projects/wicket/apidocs/1.4.x/org/apache/wicket/util/diff/myers/DiffNode.html
>    4. http://wicket.sourceforge.net/wicket-1.2/apidocs/wicket/util/diff/myers/MyersDiff.html
>    5. mailto:juanco@suigeneris.org
>    6. http://wookware.org/
> 
> 
> 
> ----- End forwarded message -----
> ----- Forwarded message from Dmitry Naumenko <dm.naumenko@gmail.com> -----
> 
> Date: Mon, 17 Dec 2012 16:41:18 +0200
> From: Dmitry Naumenko <dm.naumenko@gmail.com>
> To: Juancarlo Añez <juancarlo.anez@gmail.com>
> Cc: Wookey <wookey@wookware.org>, juanco@suigeneris.org
> Subject: Re: Origin/licencing of myersdiff java code
> X-Spam-Status: No, score=-2.6 required=4.5 tests=AWL,BAYES_00,FREEMAIL_FROM,
> 	HTML_MESSAGE,MIME_QP_LONG_LINE,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham
> 	version=3.3.1
> 
>    Hi
>    The code derived from LGPL version from [1]http://code.google.com/p/jrcs/.
>    Dmitry
>    On Dec 17, 2012, at 4:34 PM, Juancarlo Añez wrote:
> 
>      Hello,
>      I am the author of the original JRCS package which lived for a while on
>      the Apache Commons sandbox after the Maven project pulled it in.
>      Maven never got to use JRCS, so I took the project back, and relicensed
>      it under LGPL 2.1. Unfortunately, the source code does not bear the
>      suggested LGPL boilerplate but just a pointer to LICENSE.txt.
>      A snapshot of my project directory, dated 2007 and versioned 0.4.2, is
>      attached.
>      I don't know the java-diff-utils project. I just took a look at the
>      source code in Google Code, and most of the modules with (C) Dmitry
>      Naumenko are identical to or derived from those in JRCS, but I don't
>      know which version. 
>      If the code was derived from the ASF version, then the ASL requires that
>      mentions of the ASF be removed prior to publishing the modified version.
>      It would be good if the original author (I) was credited, but the ASL
>      doesn't require that. If the code was derived from a LGPL version, then
>      that's another story.
>      Cheers,
> 
>      On Mon, Dec 17, 2012 at 9:24 AM, Wookey <[2]wookey@wookware.org> wrote:
> 
>        Hi, I just had a go at packaging Dmitry's java-diff-utils library for
>        Debian as another package I am packaging (caveconverter) uses it.
> 
>        [3]http://code.google.com/p/java-diff-utils/
> 
>        The myers subdir in that package contains a separate java module by a
>        different author and with different licencing, but it's not totally
>        clear to me exactly what came from where, so I thought I'd check as
>        some googling suggests that the original author is Juanco/Juancorlos
>        Anẽz.
> 
>        Debian is careful to make sure everything we upload is properly
>        licenced as free software and correct attribution is given. Sorry to
>        bother you about this if I'm being dense but checking now can avoid a
>        lot of hassle later if any problems are found.
> 
>        So. am I correct that the 'diffutils.myers' subdir of java-diff-utils
>        contains code which is all
>        Copyright: 2002 Juanco Anez
>        License: Apache-1.1
> 
>        and is the same code as is found here:
>        [4]http://ci.apache.org/projects/wicket/apidocs/1.4.x/org/apache/wicket/util/diff/myers/DiffNode.html
>        and here:
>        [5]http://wicket.sourceforge.net/wicket-1.2/apidocs/wicket/util/diff/myers/MyersDiff.html
> 
>        I note that all the files say:
>        Copyright 1999-2003 The Apache Software Foundation
>        and have an Apache-1.1 header
> 
>        except diffutils/myers/DiffNode.java
>        which says:
>        * <p>Title: </p>
>        * <p>Description: </p>
>        * <p>Copyright: Copyright (c) 2002</p>
>        * <p>Company: </p>
>        * @author not attributable
>        * @version 1.0
>        ...
>        * @version $Revision: 60 $ $Date: 2003-05-10 21:56:10 +0300 (Суб, 10
>        Май 2003) $
>        * @author <a href="mailto:[6]juanco@suigeneris.org";>Juanco Anez</a>
> 
>        Should this file be considered the same as the others or does it have
>        a different prevenance?
> 
>        Strictly speaking this file appears to be 'All rights reserved, Juanco
>        Anez' and not be redistributable, but I assume that's not really what
>        was intended and it should be Apache-1.1, like the others? Should it
>        also be "Copyright 1999-2003 The Apache Software Foundation" rather
>        than
>        "Copyright 2002 Juanco Anez"?
> 
>        I see that the same file in the wicket 1.4.0 distribution does have a
>        standard apache header, so I guess that's how it should be.
> 
>        Is there a difinitive source for this diff.myers package which might
>        be a) more up-to-date with bug-fixes etc? b) have clearer copyright
>        attribution?
> 
>        It may make sense to package that separately from diffutils in Debian
>        due to the different licence and author. As you may know Java people
>        tend to bundle everything and have lots of copies of very similar
>        stuff, whilst Debian people prefer to have one (versioned if
>        necessary) copy of each thing.
> 
>        Anyway - if either of you can confirm the correct copyright
>        attribution for the diff.myers code in java-diff-utils, or pointers to
>        latest versions, or (even better) would like to help maintain this
>        code in Debian (and derivatives) (I personally am clueless about java
>        except insofar as I now have packaged 4 application written in it),
>        that would be great.
>        Wookey
>        --
>        Principal hats:  Linaro, Emdebian, Wookware, Balloonboard, ARM
>        [7]http://wookware.org/
> 
>      --
>      Juancarlo Añez
>      tel:+58(414)901-2021
>      [8]skype:juancarloanez
>      <jrcs-0.4.2.tar.bz2>
> 
> References
> 
>    Visible links
>    1. http://code.google.com/p/jrcs/
>    2. mailto:wookey@wookware.org
>    3. http://code.google.com/p/java-diff-utils/
>    4. http://ci.apache.org/projects/wicket/apidocs/1.4.x/org/apache/wicket/util/diff/myers/DiffNode.html
>    5. http://wicket.sourceforge.net/wicket-1.2/apidocs/wicket/util/diff/myers/MyersDiff.html
>    6. mailto:juanco@suigeneris.org
>    7. http://wookware.org/
>    8. file:///tmp/skype:juancarloanez
> 
> ----- End forwarded message -----
> ----- Forwarded message from Juancarlo Añez <juancarlo.anez@gmail.com> -----
> 
> Date: Mon, 17 Dec 2012 10:17:53 -0430
> From: Juancarlo Añez <juancarlo.anez@gmail.com>
> To: Dmitry Naumenko <dm.naumenko@gmail.com>
> Cc: Wookey <wookey@wookware.org>, juanco@suigeneris.org
> Subject: Re: Origin/licencing of myersdiff java code
> X-Spam-Status: No, score=-2.6 required=4.5 tests=BAYES_00,FREEMAIL_FROM,
> 	HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.1
> 
>    On Mon, Dec 17, 2012 at 10:11 AM, Dmitry Naumenko
>    <[1]dm.naumenko@gmail.com> wrote:
> 
>      The code derived from LGPL version
>      from [2]http://code.google.com/p/jrcs/.
> 
>    That version of the code is indeed LGPL.
>    --
>    Juancarlo Añez
>    tel:+58(414)901-2021
>    skype:juancarloanez
> 
> References
> 
>    Visible links
>    1. mailto:dm.naumenko@gmail.com
>    2. http://code.google.com/p/jrcs/
> 
> ----- End forwarded message -----
> Wookey
> -- 
> Principal hats:  Linaro, Emdebian, Wookware, Balloonboard, ARM
> http://wookware.org/
Wookey
-- 
Principal hats:  Linaro, Emdebian, Wookware, Balloonboard, ARM
http://wookware.org/


Wookey
-- 
Principal hats:  Linaro, Emdebian, Wookware, Balloonboard, ARM
http://wookware.org/

--- End Message ---

Reply to: