RFS: audacious/3.6.2-2~bpo8+1 and audacious-plugins/3.6.2-2~bpo8+1

[Nicholas D Steeves]

On 29 April 2016 at 18:02, Mattia Rizzolo <mattia at debian.org> wrote:
> On Fri, Apr 29, 2016 at 01:07:20PM -0400, Nicholas D Steeves wrote:
>> I made my changes, git add, git commit, git tag.  I wasn't sure which
>> convention to use for backports, so I based my tag on the debian
>> version.  It's at the top of the list for git tag -l.  I also wasn't
>> sure if I should if I should reset the tag back to the debian/3.7.2-1
>> and debian/3.7.2-2.  Please indicate how I can do a better job next
>> time.
>
>
> let's do it right this time too :), as you want to *maintain* the
> backport, you ought to learn it.

I agree! :-)

> I see you pushed to the master branch.  This is wrong straigh away.
> The master branch is used to do the main development of the package, and
> targets either unstable or experimental.  If you want to keep the
> backports stuff in a branch (as I think you could very well do), do it
> in a jessie-backports branch, not master.

But you said you preferred it to be pushed with just a tag!

On 28 April 2016 at 06:19, Mattia Rizzolo <mattia at debian.org> wrote:
> I'll happilly do so, but I'd really prefer to do so over git, so please
> do your backporting on the git repositories of those 2 things, either in
> a jessie-backports branch, or just with a tag (I mean, I don't really
> see the point in such jessie-backports branches, I prefer to do my
> backports just with tags without them being on any branch, but this can
> be a bit hard to grasp if you are not used to use git, so do it as you
> prefer).

So you wanted me to detach from the master branch with: git checkout
master^ before making changes?
And when the next version of the package hits stable I'd git checkout
master && git checkout master^ ?

>
> Now, the question about what to do with that commit arises.  If this was
> a repository of mine I'd have just force-pushed it, but I won't do it
> here unless somebody says me to do it.
>

I'd be happy to take responsibility for my mistake, especially since
I'd like to learn to to fix it.  According to the following guide I
should be able to do with with:
https://www.atlassian.com/git/tutorials/undoing-changes/git-checkout

First, I'd delete the tags I introduced, then:

for audacious:
git checkout 79c8a90
git status
git add debian/changelog (probably necessary)
git commit  -> with this as the message, if necessary: upload to
unstable (or would I say revert to 79c8a90?)
git push

for audacious-plugins:
git checkout 985c3d8
git status
git add debian/changelog (probably necessary)
git commit -> with this as the message, if necessary: Finalize
changelog (or would I say revert to 985c3d8?)
git push

What tag would you like me to use for the backport?

Thank you for your patience,
and sorry for the potential hassle!

Nicholas