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

Re: Preparation of Cinnamon 5?

Il 17/10/2021 15:04, Joshua Peisach ha scritto:
Coolio, I can take care of that, but what about the stuff I already pushed? Is that going to screw up the upstream or is there a way to force redo it to fix it?
probably is not an issue with future version but I'm not 100%, keep it now and we'll do manual merge if needed next time, force is not permitted on master branch, I did fast update of cinnamon when I did the tests but I not tested for now (build/install/upgrade/use), I'll do today if I'll have time

From: Fabio Fantoni <fantonifabio@tiscali.it>
Sent: Sunday, October 17, 2021 5:40 AM
To: Joshua Peisach <itzswirlz2020@outlook.com>; Norbert Preining <norbert@preining.info>
Cc: Maximiliano Curia <maxy@gnuservers.com.ar>; Debian Cinnamon Team <debian-cinnamon@lists.debian.org>
Subject: Re: Preparation of Cinnamon 5?
Il 16/10/2021 22:00, Joshua Peisach ha scritto:
I use:

gbp import-orig --verbose --filter '*/debian/*' --filter '*/.pc/*' --pristine-tar --filter-pristine-tar --merge-mode=replace --uscan --sign-tags --keyid=41C3D4189AFEDB5A

I did a test and I suppose you didn't set upstream repository (with git remote add) and/or keep fetch it (before gbp import-orig). Also add "--upstream-vcs-tag="%(version)s"" that is different by default.

I don't know if there is anything better to do that norbert could recommend, what i use if i remember correctly is based on what maxy advised me years ago

From: Fabio Fantoni <fantonifabio@tiscali.it>
Sent: Saturday, October 16, 2021 1:29 PM
To: Norbert Preining <norbert@preining.info>
Cc: Joshua Peisach <itzswirlz2020@outlook.com>; Maximiliano Curia <maxy@gnuservers.com.ar>; Debian Cinnamon Team <debian-cinnamon@lists.debian.org>
Subject: Re: Preparation of Cinnamon 5?
Il 16/10/2021 11:40, Fabio Fantoni ha scritto:
> Il 16/10/2021 11:17, Norbert Preining ha scritto:
>> On Sat, 16 Oct 2021, Fabio Fantoni wrote:
>>> nemo-compare is already in it:
>>> https://salsa.debian.org/cinnamon-team/nemo-compare
>> Ah, so should I build/install/test run it and upload it to NEW?
> I wrote I did a build/install and only a very fast use test (with
> meld), I suppose Joshua did an accurate use test, probably is good
> await a Joshua reply about

@Joshua: I saw your recent commits about new 5.0.x, I don't have time
for a full review now but I saw that upstream branch have only one
additional commit (and not all the upstream ones), what parameters do
you use in "gbp import-orig"?

For example I use (after git fetch of upstream repository): gbp
import-orig --verbose --filter '*/debian/*' --filter '*/.pc/*'
--pristine-tar --filter-pristine-tar --upstream-vcs-tag="%(version)s"
--merge-mode=replace --uscan

Reply to: