Re: review for RFS simplyhtml
Eric Lavarde <deb@zorglub.s.bawue.de> writes:
> Hi,
hello Bart, hello Eric,
> jumping in as former maintainer, where Felix probably took over some of my
> errors :P
Thanks Eric :-)
> On 05/05/13 08:42, Bart Martens wrote:
>> Hi Felix,
>>
>> On your package at mentors uploaded there on 2013-04-05 20:05 :
>>
>> These files should be identical :
>> md5sum SimplyHTML_src_0_16_07.tar.gz simplyhtml_0.16.07.orig.tar.gz
>> 8450cb7b9faee87699fa7b734013593d SimplyHTML_src_0_16_07.tar.gz
>> 454d1569b0d29dc702c18a7f4d160d50 simplyhtml_0.16.07.orig.tar.gz
> My debian/rules get-orig-source target uses 'uscan --repack --rename' which
> would have explained the difference in the past (gzip saves name and
> timestamp which breaks the checksum).
I thought I had made sure that this is the case by using git-import-orig
[...] --pristine-tar ?
Can you give me a hint regarding how I can fix this? I would try to
reimport SimplyHTML_src_0_16_07.tar.gz, but I cannot do this with the
same upstream version number (and IMHO it does not make sense to add
+dfsg-1 because the upstream source has not been modified).
> This said, I also had to clean-up the
> sources to make them dfsg free, here I'm not sure as they're not marked
> +dfsg but the libraries are gone (check debian/rules for details).
*.jar are not part of SimplyHTML_src_0_16_07.tar.gz in 0.16.x: Eric, you
committed this:
391e00a8 (ewl 2009-05-24 14:54:21 +0000 65) <tar destfile="${dist}/SimplyHTML_src_${version}.tar.gz" compression="gzip">
96a2c1b1 (ewl 2009-05-24 16:39:31 +0000 66) <tarfileset dir="${dist.src}" prefix="simplyhtml-${version}/src"
96a2c1b1 (ewl 2009-05-24 16:39:31 +0000 67) excludes="**/*.jar" />
96a2c1b1 (ewl 2009-05-24 16:39:31 +0000 68) <tarfileset dir="${base}" prefix="simplyhtml-${version}" includes="*.txt" />
391e00a8 (ewl 2009-05-24 14:54:21 +0000 69) </tar>
=> so currently I do not filter when doing git-import-orig (no --filter).
>> Not all changes are documented in debian/changelog.
I'll fix that. Shall I use
simplyhtml (0.16.07-2) unstable; urgency=low
as the changelog header for the newer changes (like copyright update
below)? [1]
[1] unfortunately, the experimental upload was already tagged as
debian/0.16.07-1 :-/
>> Was adding yourself to Uploaders agreed with the team ? (It's just an honest
>> question, because I'm not part of the team.) If Eric Lavarde is no longer
>> working on this package then please remove him from Uploaders.
> Agreed with the team and me but, indeed, I can/should be removed.
I think it's debian-java "policy" to put pkg-java in as Maintainer,
and the packager as Uploader:
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Eric Lavarde <deb@zorglub.s.bawue.de>, Felix Natter <fnatter@gmx.net>
I will remove Eric on his request.
>>
>> There are more copyright holders than mentioned in debian/copyright, see for
>> example src/com/lightdev/app/shtm/NamedObject.java.
> This is new and I am even the opinion that it is an error from upstream:
> the copyright is actually from FreeMind and, as I knew the team, only
> Dimitri had something to do with this specific piece of code.
> I *guess* that Dimitri did a mass header-update that hit as well
> simplyhtml, but, anyway, that needs to be cleaned upstream or
> package-wise.
/*FreeMind - A Program for creating and viewing Mindmaps
*Copyright (C) 2000-2006 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitri Polivaev and others.
=> simplyhtml is used as a library in Freeplane and FreeMind. I believe
that at some early stage, the library was included in FreeMind (and
hence in Freeplane, since it is a 2008-fork of FreeMind).
I belive that this copyright is wrong (as Eric mentions also), since
there are only commits from Freeplane members (Dimitry, me) and
Eric:
$ git log |grep -i author | sort| uniq
Author: dpolivaev <Dimitry@Dimitry-THINK.(none)>
Author: dpolivaev <dpolivaev>
Author: ewl <ewl>
Author: Felix Natter <fnatter@gmx.net>
Author: unknown <Dimitry@Dimitry-THINK.(none)>
=> so I think I should add (since only dpolivaev from Freeplane/FreeMind
contributed to this file, and this is the only file of that kind, but
Christian Foltin, the FreeMind maintainer may have contributed before):
--------------------------------------------------
Files: ./src/com/lightdev/app/shtm/NamedObject.java
Copyright: 2006-2013 Dimitri Polivaev <dpolivaev@users.sourceforge.net>
2006-2013 Christian Foltin
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
--------------------------------------------------
Thanks! Best Regards,
--
Felix Natter
Reply to: