[SCM] libdvdnav/master: Finalize changelog

Reinhard Tartler siretart at gmail.com
Thu Feb 13 18:28:44 UTC 2014


Maybe something like this works for you?

 $ git reset --hard debian/4.2.1-2"
 $ git reset --soft origin/master
 $ git commit -m" Revert everything to debian/4.2.1-2"

Reinhard

On Thu, Feb 13, 2014 at 1:10 PM, Bálint Réczey <balint at balintreczey.hu> wrote:
> Hi All,
>
> Sorry, the reverts were not complete thus the current state does not work.
> I would like to reset master to debian/4.2.1-2 and add the dvdnav_dup patches
> cleaning the history.
> I know rolling back git branches is not nice, but it would result a
> much nicer history.
> Can I go ahead or I should continue working on master to return it to
> a good shape with
> new commits?
>
> Balint
>
> 2014-02-13 18:06 GMT+01:00  <rbalint at users.alioth.debian.org>:
>> The following commit has been merged in the master branch:
>> commit 418218e919f7452436fb2a397f44e1e3611aea4e
>> Author: Balint Reczey <balint at balintreczey.hu>
>> Date:   Thu Feb 13 17:30:31 2014 +0100
>>
>>     Finalize changelog
>>
>> diff --git a/debian/changelog b/debian/changelog
>> index 7af2092..e5cf7a9 100644
>> --- a/debian/changelog
>> +++ b/debian/changelog
>> @@ -1,3 +1,9 @@
>> +libdvdnav (4.2.1-3) unstable; urgency=low
>> +
>> +  * Reintroduce dvdnav_dup and dvdnav_dup_free API calls (Closes: #735760)
>> +
>> + -- Balint Reczey <balint at balintreczey.hu>  Thu, 13 Feb 2014 17:26:10 +0100
>> +
>>  libdvdnav (4.2.1-2) unstable; urgency=medium
>>
>>    * debian/: documentation package added (Closes: #735108)
>>
>> --
>> libdvdnav packaging
>>
>> _______________________________________________
>> pkg-multimedia-commits mailing list
>> pkg-multimedia-commits at lists.alioth.debian.org
>> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-commits
>
> _______________________________________________
> pkg-multimedia-maintainers mailing list
> pkg-multimedia-maintainers at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers



-- 
regards,
    Reinhard



More information about the pkg-multimedia-maintainers mailing list