[PKG-Openstack-devel] [MoM] Packaging manila

[Thomas Goirand]

On May 3, 2015 8:26 AM, Andreas Tille <andreas at an3as.eu> wrote:
>
> Hi Thomas, 
>
> thanks for helping out with the MoM project.

My pleasure!

> On Sat, May 02, 2015 at 11:57:54PM +0200, Thomas Goirand wrote: 
> OK.  However, I think the debian/watch file should be fixed anyway to 
> report the latest upstream version.  Verifying this by using 
>
>    uscan --verbose --report

Yes. You can take the watch file from nova or cinder as example, it handles both beta and rc releases.

> So the question I now have is:  How to pull this from upstream.  My 
> repository now looks like: 
>
> $ cat .git/config 
> [core] 
>         repositoryformatversion = 0 
>         filemode = true 
>         bare = false 
>         logallrefupdates = true 
> [remote "origin"] 
>         url = ssh://git.debian.org/git/openstack/manila.git 
>         fetch = +refs/heads/*:refs/remotes/origin/* 
> [branch "debian/kilo"] 
>         remote = origin 
>         merge = refs/heads/debian/kilo

Simply do:
./debian/rules fetch-upstream-remote
git merge -X theirs 2015.1.0
[ edit debian/changelog and commit the new version ]
git push

Cheers,

Thomas Goirand (zigo)