• Re: gbp dch --release

    From =?UTF-8?b?2K/Yp9mG24zYp9mEINio2YfYs@21:1/5 to All on Wed Mar 13 12:40:01 2024
    Can you try importing new upstream version with gbp too:

    gbp import-orig ../package.orig.tar.gz

    Or if you use watch file:

    gbp import-orig --uscan


    <div id="geary-body" dir="auto"><div>Can you try importing new upstream version with gbp too:</div><div><br></div><div>&nbsp; &nbsp; gbp import-orig ../package.orig.tar.gz</div><div><br></div><div>Or if you use watch file:</div><div><br></div><div>&nbsp;
    &nbsp;gbp import-orig --uscan</div></div>

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Matt Zagrabelny@21:1/5 to All on Wed Mar 13 12:40:01 2024
    Hello Mentors,

    It has been a while since I've used gbp and I'm struggling to remember
    how to perform a release.

    I've got some software that I'm the upstream for and years ago I
    packaged up for use and installation at $JOB.

    I recently updated the software and tagged it for release.

    Debian branch: debian
    Upstream branch: master

    $ git switch master
    $ git tag v0.21
    $ git switch debian
    $ git merge master
    $ gbp dch --release

    ...but gbp chooses a release of 0.20-2 as opposed to 0.21-1.

    What am I missing?

    Thanks for helping me to get back on the gbp horse!

    -m

    PS. In case it is helpful, here are the last couple of commits from
    the git repo:

    $ git log -p

    commit 2b4eaec45156a893cd4c74c7dcde7b9b036bbc44 (HEAD -> debian)
    Merge: 9f4b884 38d08de
    Author: Matt Zagrabelny <mzagrabe@d.umn.edu>
    Date: Tue Mar 12 13:51:26 2024 -0500

    Merge branch 'master' into debian

    commit 38d08de5d97d81d3ca0f85226ec4eb88941066c1 (tag: v0.21, master)
    Author: Matt Zagrabelny <mzagrabe@d.umn.edu>
    Date: Tue Mar 12 13:45:41 2024 -0500

    Update changelog for release

    diff --git a/changelog b/changelog
    index 8788f2a..20f14b8 100644
    --- a/changelog
    +++ b/changelog
    @@ -47,3 +47,5 @@ undefined warnings.
    0.19 - Suppress warning about smartmatch

    0.20 - Filter out empty username from demographics source query
    +
    +0.21 - Connect to MariaDB with UTF-8 encoding

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Matt Zagrabelny@21:1/5 to dani.behzi@ubuntu.com on Wed Mar 13 14:00:03 2024
    Hi,

    ‪On Wed, Mar 13, 2024 at 6:35 AM ‫دانیال بهزادی‬‎ <dani.behzi@ubuntu.com> wrote:‬

    Can you try importing new upstream version with gbp too:

    gbp import-orig ../package.orig.tar.gz

    Or if you use watch file:

    gbp import-orig --uscan

    Thanks for the reply.

    I'm upstream and the upstream code is in the master branch - so I
    don't release tar balls.

    Sorry for not being clear about that.

    -m

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Matt Zagrabelny@21:1/5 to mzagrabe@d.umn.edu on Fri Mar 15 01:40:01 2024
    Ping?

    Sorry, but the lone reply I received didn't help.

    Thanks for anyone's time looking at this.

    Cheers,

    -m

    On Wed, Mar 13, 2024 at 6:21 AM Matt Zagrabelny <mzagrabe@d.umn.edu> wrote:

    Hello Mentors,

    It has been a while since I've used gbp and I'm struggling to remember
    how to perform a release.

    I've got some software that I'm the upstream for and years ago I
    packaged up for use and installation at $JOB.

    I recently updated the software and tagged it for release.

    Debian branch: debian
    Upstream branch: master

    $ git switch master
    $ git tag v0.21
    $ git switch debian
    $ git merge master
    $ gbp dch --release

    ...but gbp chooses a release of 0.20-2 as opposed to 0.21-1.

    What am I missing?

    Thanks for helping me to get back on the gbp horse!

    -m

    PS. In case it is helpful, here are the last couple of commits from
    the git repo:

    $ git log -p

    commit 2b4eaec45156a893cd4c74c7dcde7b9b036bbc44 (HEAD -> debian)
    Merge: 9f4b884 38d08de
    Author: Matt Zagrabelny <mzagrabe@d.umn.edu>
    Date: Tue Mar 12 13:51:26 2024 -0500

    Merge branch 'master' into debian

    commit 38d08de5d97d81d3ca0f85226ec4eb88941066c1 (tag: v0.21, master)
    Author: Matt Zagrabelny <mzagrabe@d.umn.edu>
    Date: Tue Mar 12 13:45:41 2024 -0500

    Update changelog for release

    diff --git a/changelog b/changelog
    index 8788f2a..20f14b8 100644
    --- a/changelog
    +++ b/changelog
    @@ -47,3 +47,5 @@ undefined warnings.
    0.19 - Suppress warning about smartmatch

    0.20 - Filter out empty username from demographics source query
    +
    +0.21 - Connect to MariaDB with UTF-8 encoding


    <div dir="ltr"><div>Ping?</div><div><br></div><div>Sorry, but the lone reply I received didn&#39;t help.</div><div><br></div><div>Thanks for anyone&#39;s time looking at this.</div><div><br></div><div>Cheers,</div><div><br></div><div>-m<br></div><br><div
    class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Mar 13, 2024 at 6:21 AM Matt Zagrabelny &lt;<a href="mailto:mzagrabe@d.umn.edu">mzagrabe@d.umn.edu</a>&gt; wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;
    border-left:1px solid rgb(204,204,204);padding-left:1ex">Hello Mentors,<br>

    It has been a while since I&#39;ve used gbp and I&#39;m struggling to remember<br>
    how to perform a release.<br>

    I&#39;ve got some software that I&#39;m the upstream for and years ago I<br> packaged up for use and installation at $JOB.<br>

    I recently updated the software and tagged it for release.<br>

    Debian branch: debian<br>
    Upstream branch: master<br>

    $ git switch master<br>
    $ git tag v0.21<br>
    $ git switch debian<br>
    $ git merge master<br>
    $ gbp dch --release<br>

    ...but gbp chooses a release of 0.20-2 as opposed to 0.21-1.<br>

    What am I missing?<br>

    Thanks for helping me to get back on the gbp horse!<br>

    -m<br>

    PS. In case it is helpful, here are the last couple of commits from<br>
    the git repo:<br>

    $ git log -p<br>

    commit 2b4eaec45156a893cd4c74c7dcde7b9b036bbc44 (HEAD -&gt; debian)<br>
    Merge: 9f4b884 38d08de<br>
    Author: Matt Zagrabelny &lt;<a href="mailto:mzagrabe@d.umn.edu" target="_blank">mzagrabe@d.umn.edu</a>&gt;<br>
    Date:   Tue Mar 12 13:51:26 2024 -0500<br>

        Merge branch &#39;master&#39; into debian<br>

    commit 38d08de5d97d81d3ca0f85226ec4eb88941066c1 (tag: v0.21, master)<br> Author: Matt Zagrabelny &lt;<a href="mailto:mzagrabe@d.umn.edu" target="_blank">mzagrabe@d.umn.edu</a>&gt;<br>
    Date:   Tue Mar 12 13:45:41 2024 -0500<br>

        Update changelog for release<br>

    diff --git a/changelog b/changelog<br>
    index 8788f2a..20f14b8 100644<br>
    --- a/changelog<br>
    +++ b/changelog<br>
    @@ -47,3 +47,5 @@ undefined warnings.<br>
     0.19 - Suppress warning about smartmatch<br>

     0.20 - Filter out empty username from demographics source query<br>
    +<br>
    +0.21 - Connect to MariaDB with UTF-8 encoding<br>
    </blockquote></div></div>

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)