Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.python > #11331

Re: upstream release of unreleased package

Show key headers only | View raw

Hello,

Now that my system is working properly I propose a solution for the 
repository. It is based in git-revert the three branches (debian/master, 
upstream and pristine-tar) and invoke gbp import-orig with option 
--upstream-tag=upstream/0.3.8-aux. I paste a log of my proposal.

Do you think it is adequate/correct?

$ gbp clone 
git@salsa.debian.org:python-team/applications/visualequation.git
gbp:info: Cloning from 
'git@salsa.debian.org:python-team/applications/visualequation.git'
$ cd visualequation/
(debian/master)]$ git revert HEAD
[debian/master 99ea7ee] Revert "Adding patches"
  3 files changed, 524 deletions(-)
  delete mode 100644 
debian/patches/0001-Imported-Upstream-version-0.3.8.patch
  delete mode 100644 
debian/patches/0002-modifying-d-changelog-for-new-upstream-release.patch
  delete mode 100644 debian/patches/series
(debian/master)]$ git checkout upstream
Switched to branch 'upstream'
Your branch is up-to-date with 'origin/upstream'.
(upstream)]$ git revert HEAD
[upstream aadd65c] Revert "Imported Upstream version 0.3.8"
  10 files changed, 51 insertions(+), 167 deletions(-)
(upstream)]$ git checkout pristine-tar
Branch pristine-tar set up to track remote branch pristine-tar from 
origin.
Switched to a new branch 'pristine-tar'
(pristine-tar)]$ git revert HEAD
[pristine-tar 3bf5b9f] Revert "pristine-tar data for 
visualequation_0.3.8.orig.tar.gz"
  2 files changed, 1 deletion(-)
  delete mode 100644 visualequation_0.3.8.orig.tar.gz.delta
  delete mode 100644 visualequation_0.3.8.orig.tar.gz.id
(pristine-tar)]$ git checkout debian/master
Switched to branch 'debian/master'
Your branch is ahead of 'origin/debian/master' by 1 commit.
   (use "git push" to publish your local commits)
(debian/master)]$ gbp pq import
gbp:info: Trying to apply patches at 
'99ea7eef8d9506318d4bf53b98c2b7e1eac892a0'
gbp:info: 0 patches listed in 'debian/patches/series' imported on 
'patch-queue/debian/master'
(patch-queue/debian/master)]$ git checkout debian/master
Switched to branch 'debian/master'
Your branch is ahead of 'origin/debian/master' by 1 commit.
   (use "git push" to publish your local commits)
(debian/master)]$ gbp import-orig --pristine-tar --uscan 
--upstream-tag=upstream/0.3.8-aux
gbp:info: Launching uscan...
uscan: Newest version of visualequation on remote site is 0.3.8, local 
version is 0.3.7
uscan:    => Newer package available from
       
https://github.com/daniel-molina/visualequation/archive/0.3.8.tar.gz
gbp:info: using ../visualequation_0.3.8.orig.tar.gz
What is the upstream version? [0.3.8]
gbp:info: Importing '../visualequation_0.3.8.orig.tar.gz' to branch 
'upstream'...
gbp:info: Source package is visualequation
gbp:info: Upstream version is 0.3.8
gbp:info: Merging to 'debian/master'
gbp:info: Successfully imported version 0.3.8 of 
../visualequation_0.3.8.orig.tar.gz
(debian/master)]$ gbp pq rebase
gbp:info: Switching to 'patch-queue/debian/master'
First, rewinding head to replay your work on top of it...
Fast-forwarded patch-queue/debian/master to debian/master.
(patch-queue/debian/master)]$ gbp pq export
gbp:info: On 'patch-queue/debian/master', switching to 'debian/master'
gbp:info: Generating patches from git 
(debian/master..patch-queue/debian/master)
gbp:info: No patches on 'patch-queue/debian/master' - nothing to do.
(debian/master)]$ dch -v 0.3.8-1
(debian/master)]$ git add debian/changelog
(debian/master)]$ git commit -m "Updating d/changelog to 0.3.8-1"

Best regards,
Daniel

Back to linux.debian.maint.python | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

upstream release of unreleased package lluvia@autistici.org - 2019-02-10 02:20 +0100
  Re: upstream release of unreleased package Brian May <bam@debian.org> - 2019-02-10 02:40 +0100
    Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-10 14:30 +0100
      Re: upstream release of unreleased package Andrey Rahmatullin <wrar@debian.org> - 2019-02-10 14:40 +0100
        Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-10 15:30 +0100
          Re: upstream release of unreleased package Brian May <bam@debian.org> - 2019-02-10 21:40 +0100
            Re: upstream release of unreleased package daniel <lluvia@autistici.org> - 2019-02-11 11:50 +0100
            Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-12 20:10 +0100
              Re: upstream release of unreleased package Andrey Rahmatullin <wrar@debian.org> - 2019-02-12 20:20 +0100
                Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-14 22:50 +0100
                Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-14 23:20 +0100
                Re: upstream release of unreleased package Andrey Rahmatullin <wrar@debian.org> - 2019-02-15 07:20 +0100
                Re: upstream release of unreleased package Brian May <bam@debian.org> - 2019-02-17 09:30 +0100
                Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-17 13:00 +0100
                Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-21 22:20 +0100
                Re: upstream release of unreleased package Dmitry Shachnev <mitya57@debian.org> - 2019-02-21 23:00 +0100
                Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-22 01:10 +0100
                Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-22 02:00 +0100
                Re: upstream release of unreleased package Dmitry Shachnev <mitya57@debian.org> - 2019-02-22 15:30 +0100
                Re: upstream release of unreleased package lluvia@autistici.org - 2019-02-22 20:20 +0100
                Re: upstream release of unreleased package Dmitry Shachnev <mitya57@debian.org> - 2019-02-22 21:30 +0100

csiph-web