[Git][debian-gis-team/libapache2-mod-tile][master] 4 commits: fixed another spelling error (upstream pr #175)

[Sebastiaan Couwenberg]

On 8/25/20 10:12 PM, Felix Delattre wrote:
> On 8/25/20 5:41 PM, Sebastiaan Couwenberg wrote:
>> You're the primary caretaker of the package based on the Uploaders, so
>> it's up to you.
>>
>> The quilt workflow has the benefit that it also works with plain source
>> packages not managed with git-buildpackage. You should be comfortable
>> with the quilt workflow in addition to gbp-pg if you need to work on
>> more packages in the archive like (reverse) dependencies not maintained
>> within the team.
>>
>> The same goes for dch vs gbp-dch, the former works for more use cases
>> than the latter, hence the preference for plain dch. It also makes it
>> much easier to choose which changes need to be included in d/changelog
>> and which ones to have in VCS history only.
> 
> Thanks for the input and explanations! In this case I would like to try to go with gbp-pq, because I think the tight connection with the commits and git helps to get it into upstream. Of course, I'm happy to learn and go with pure quilt in other packages - it seems to be very nice handling of patches!

Get changes accepted upstream is just a matter of a good PR. Whether
that is based on commits from the patch queue or from a quilt patch
makes little to no difference.

Forwarding quilt patches is quite easy too:

 cp debian/patch/foo.patch /tmp
 git fetch upstream --no-tags --prune
 git checkout -b foo upstream/master
 patch -p1 < /tmp/foo.patch
 head /tmp/foo.patch
 git commit -m "<Description from patch header>" -a
 git push github foo
 <Create PR>
 git checkout master
 git branch -D foo
 vi debian/patches/foo.patch
 <Add Forwarded header>
 git commit -m "Mark foo.patch as Forwarded." -a
 git push

The above assumes you have an "upstream" remote for the upstream git
repo, and a "github" remote for your fork.

Fetching without tags is important to not risk pushing upstream tags
that don't have corresponding commits in the local repo.

Kind Regards,

Bas

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