[josm-dev] JOSM Version check source (VersionTest macro) to troubleshoot strange version

[Sebastiaan Couwenberg]

On 11-10-15 13:31, Dirk Stöcker wrote:
> On Sat, 10 Oct 2015, Sebastiaan Couwenberg wrote:
> 
>> On 10-10-15 00:01, Dirk Stöcker wrote:
>>> On Fri, 9 Oct 2015, Sebastiaan Couwenberg wrote:
>>>
>>>>> No. As you mark it as Debian in the agent it's correct to strip the
>>>>> SVN
>>>>> text. This patch as far as I remember was designed in cooperation with
>>>>> me. For SVN we react different in tickets - We tell the user first to
>>>>> update to recent SVN version assuming the user can build the software
>>>>> himself. This is not the correct reply for Debian version, so the SVN
>>>>> should not be there. Simply change the patch to set "Debian"
>>>>> instead of
>>>>> "SVN", as I see that there is no patch in the GIT yet for this
>>>>> purpose.
>>>>
>>>> Based on the bug report and your changes to the VersionTest macro, it
>>>> seemed the patch may have been unneeded in the first place.
>>>>
>>>> I prefer the User-Agent without SVN substring anyway, so I'll happily
>>>> keep it for the Debian package.
>>>>
>>>> The Debian Build-Name change is currently only available in the
>>>> 00-build.patch on the stretch branch:
>>>>
>>>> https://anonscm.debian.org/cgit/pkg-grass/josm.git/tree/debian/patches/00-build.patch?h=stretch#n57
>>>>
>>>>
>>>
>>> Hmm, maybe these two together need some rework. If you simply change
>>> Is-Local-Build (above the Build-Name) to false the patch to Version.java
>>> can be dropped and manifest is more correct.
>>
>> Settings Is-Local-Build to false goes against the guidelines from the
>> 'How to create a build' documentation [0].
>>
>> The Debian package is not an "official" release provided by
>> josm.openstreetmap.de for which Is-Local-Build: true is appropriate.
> 
> I added " or another approved organization" there, so it's appropriate
> now :-)

Alright, the Debian package has been updated accordingly. :-)

It will be included in the next upload, that should be next weekend to
give the freeplane maintainer a little time to look into supporting
JMapViewer 1.11 in the freeplane openmaps plugin.

>> If the motivation for this change is to not need the Version.java
>> change, I don't think that's appropriate. I prefer keeping Version.java
>> change and correctly identifying the Debian package builds as a custom
>> build not provided by josm.openstreetmap.de.
> 
> Local build really means user local builds. That's not true for Debian.
> As we discussed and agreed on a proper marking of the Debian version
> setting this to false is better. All these settings are only there to
> allow us proper support reaction for requests.

Shouldn't the Main-Version in the MANIFEST.MF now also include Debian
instead of SVN? Or should we just keep stripping the SVN string?

Kind Regards,

Bas

-- 
 GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1