Groups > linux.debian.maint.java > #10485

Re: Help to upgrade icedtea-web

Path	csiph.com!feeder.erje.net!2.eu.feeder.erje.net!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Vincent Privat <vincent@josm.openstreetmap.de>
Newsgroups	linux.debian.maint.java
Subject	Re: Help to upgrade icedtea-web
Date	Fri, 04 May 2018 23:40:01 +0200
Message-ID	<vLQAN-4MG-3@gated-at.bofh.it> (permalink)
References	<vLugV-6Hv-3@gated-at.bofh.it> <vLLB7-1xQ-3@gated-at.bofh.it>
X-Original-To	Emmanuel Bourg <ebourg@apache.org>
X-Mailbox-Line	From debian-java-request@lists.debian.org Fri May 4 21:36:48 2018
Old-Return-Path	<vincent.privat@gmail.com>
X-Amavis-Spam-Status	No, score=-2.199 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, EMPTY_BODY=3, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, HTML_MESSAGE=2, LDO_WHITELIST=-5, RCVD_IN_DNSWL_LOW=-0.7] autolearn=no autolearn_force=no
X-Policyd-Weight	using cached result; rate: -7
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=FUPghC3S1udRVbEHlEflb779vEBlPLfkyDaigz+JKvw=; b=qGikY4n4WzJEMzq4+hrMghbyZSFpb8DW8+ylyGmY3zCvrtU7LsNGnam5dr0FY5nQqk TG9pjqthDBLyp7qwHL6a8wHW31iixrSE3e9fp5E04HThKxiiWDyc3eho2yTJCqLVEWWl X7hZUhJlVK6wnf50LYRgBI0gYNIhYqw+xkiaIqiLigKHfGmZ6FQCzbaNyjZZPf7OcCQQ JUna2cl/lsuXGEtFlNtpJJ8c7U9oQbXn9NIUH0DF0orMItqPn1S7ZXIqXzMrfDk/S8rr M8NmmGMyXZimEhyp3YFI5wfzGEEHmPmRYjGa4+99rjCXVFk0roeGc1wDXaV4EED2eL0k Jr3A==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=FUPghC3S1udRVbEHlEflb779vEBlPLfkyDaigz+JKvw=; b=MMAR0Cb1d7CgXODtE+Ci8lKseBk1kAxIbIx8zvx7WMIIYRM+DvX9KJgtHvJ6xTcqaY xyk4m4+9186W5BKMDTU0dsnkC/mX7kNnGzDHRF41XNfX8Zhh3dTgNIgZKihW6YlI04Dt DBkj0yBu3UGWI1z1MJh+KWZt3B5UDhfvN0sDtAE1FICgQa9gVZq6dZYaped5YrqMnfQd JCUhDNT/nS6x2ycsbaiV8ZoWQR6PMAqC8xy0Km/935ol90/Dh/wD9QVIlmlVRdfasyUI KMq9Z03QvX9yHzCGgqiGAH2KsoP8W/GYa5yAmZuICONRUaZphT3bFLF2VCQgZ3eyeMsb hrJw==
X-Gm-Message-State	ALQs6tC2jHY3/Msv+O/IlCs4/di93CksHn/SWzSDKVszQ3ghJrIKdwwu S+pow3yRhF9SNeqIxQHrbHXGYclkIZZUHp2Qsp5/YLEI
X-Google-SMTP-Source	AB8JxZonnHyhizr0FDg2/8ef/AWYxNi+ZhMaJwQG1kzwnKyLZCBjNsedYBQ2gWXNGN/cM7PSU5kcf3V1j2q/1+2lL8s=
X-Received	by 2002:a50:a3e5:: with SMTP id t34-v6mr37772500edb.227.1525469791567; Fri, 04 May 2018 14:36:31 -0700 (PDT)
MIME-Version	1.0
Sender	robomod@news.nic.it
X-Google-Sender-Auth	xKCyTEi_zeqKWaK-YLU1VenNWtk
Content-Type	multipart/alternative; boundary="0000000000000ac2ff056b681dd8"
X-Mailing-List	<debian-java@lists.debian.org> archive/latest/20875
List-ID	<debian-java.lists.debian.org>
List-URL	<https://lists.debian.org/debian-java/>
List-Archive	https://lists.debian.org/msgid-search/CABBycTR1kCU=x34Y5aif=Efdr4PGfFswsKAB69HaKCKVptLF2A@mail.gmail.com
Approved	robomod@news.nic.it
Lines	87
Organization	linux.* mail to news gateway
X-Original-Cc	debian-java@lists.debian.org
X-Original-Date	Fri, 4 May 2018 23:36:30 +0200
X-Original-Message-ID	<CABBycTR1kCU=x34Y5aif=Efdr4PGfFswsKAB69HaKCKVptLF2A@mail.gmail.com>
X-Original-References	<CABBycTTimJudyoa6+zCgB1ty-WEQxvggxBts5aCZd9EzOpcy=g@mail.gmail.com> <3a5a53b8-2e4d-13d8-9d8b-3514226ee920@apache.org>
X-Original-Sender	vincent.privat@gmail.com
Xref	csiph.com linux.debian.maint.java:10485

Show key headers only | View raw

[Multipart message — attachments visible in raw view] - view raw

Thanks a lot!
After reading some documentation I forked the repo and did the following:

git clone git@salsa.debian.org:don-vip-guest/icedtea-web.git
cd icedtea-web
git checkout origin/upstream -b upstream
git checkout origin/pristine-tar -b pristine-tar
git checkout master
gbp import-orig --uscan --pristine-tar
git push --all

then created three Merge Requests (one per branch) in this order: upstream,
pristine-tar, master:
https://salsa.debian.org/java-team/icedtea-web/merge_requests

The first two seem to be correct, but the third (master) has merge
conflicts, I don't understand why? I probably did something wrong.

Vincent

2018-05-04 18:16 GMT+02:00 Emmanuel Bourg <ebourg@apache.org>:

> Le 03/05/2018 à 23:43, Vincent Privat a écrit :
>
> > I am interested in upgrading icedtea-web to fix #886109 and #894360.
> > My first question: Is the VCS up-to-date? There's a vcswatch warning
> > about that. The changelog I find in Bazaar stops at 1.6.2-1 while the
> > current package version is 1.6.2-3.1:
> > https://qa.debian.org/cgi-bin/vcswatch?package=icedtea-web
>
> I've migrated the Bazaar repository to Git and imported the missing
> updates, you are ready to go:
>
>   https://salsa.debian.org/java-team/icedtea-web
>
> Emmanuel Bourg
>

Thread

Help to upgrade icedtea-web Vincent Privat <vincent@josm.openstreetmap.de> - 2018-05-03 23:50 +0200
  Re: Help to upgrade icedtea-web Emmanuel Bourg <ebourg@apache.org> - 2018-05-04 00:00 +0200
    Re: Help to upgrade icedtea-web Vincent Privat <vincent@josm.openstreetmap.de> - 2018-05-04 00:10 +0200
      Re: Help to upgrade icedtea-web Emmanuel Bourg <ebourg@apache.org> - 2018-05-04 00:30 +0200
  Re: Help to upgrade icedtea-web Emmanuel Bourg <ebourg@apache.org> - 2018-05-04 18:20 +0200
    Re: Help to upgrade icedtea-web Vincent Privat <vincent@josm.openstreetmap.de> - 2018-05-04 23:40 +0200
      Re: Help to upgrade icedtea-web Emmanuel Bourg <ebourg@apache.org> - 2018-05-08 00:20 +0200
        Re: Help to upgrade icedtea-web Vincent Privat <vincent.privat@gmail.com> - 2018-05-08 00:40 +0200
          Re: Help to upgrade icedtea-web Vincent Privat <vincent.privat@gmail.com> - 2018-05-08 01:00 +0200
            Re: Help to upgrade icedtea-web Vincent Privat <vincent.privat@gmail.com> - 2018-05-08 13:40 +0200
              Re: Help to upgrade icedtea-web Vincent Privat <vincent.privat@gmail.com> - 2018-05-21 19:00 +0200
      Re: Help to upgrade icedtea-web Vincent Privat <vincent@josm.openstreetmap.de> - 2018-05-08 00:20 +0200

csiph-web