Re: upstream release of unreleased package

2019-02-21 Thread lluvia

Hello,

I continue trying to fix issue. In a clean directory, I tried to follow 
all the steps from


https://wiki.debian.org/Python/GitPackaging

without git-pushing to see if I was able to understand better what I did 
bad last time. I followed the sections "Creating new repositories" using 
version 0.3.7 of the program and then "New Upstream Release" to update 
to 0.3.8. After following all the steps, except updating 
debian/changelog from 0.3.7-1 to 0.3.8-1, I was able to build package 
for 0.3.7 (which is probably showing the error), and when I updated 
debian/changelog I was not able to create the package for version 0.3.8.


I paste below a (reproducible) log of what I did. Maybe you can show me 
what I did wrong this time so I am not able to build package for 0.3.8.


$ gbp clone 
g...@salsa.debian.org:python-team/applications/visualequation.git

$ uscan --download-version 0.3.7
uscan: Newest version of visualequation on remote site is 0.3.7, 
specified download version is 0.3.7

$ tar -xvf visualequation_0.3.7.orig.tar.gz
[...]
$ cd visualequation-0.3.7/
$ git init
Initialized empty Git repository in 
/home/lluvia/new_debian/visualequation-0.3.7/.git/

$ git checkout -b upstream
Switched to a new branch 'upstream'
$ git add .
$ git commit -m "import visualequation_0.3.7.orig.tar.gz"
[upstream (root-commit) ff4a9e9] import visualequation_0.3.7.orig.tar.gz
 48 files changed, 7461 insertions(+)
 create mode 100644 .gitignore
 [...]
$ pristine-tar commit ../visualequation_0.3.7.orig.tar.gz upstream
pristine-tar: committed visualequation_0.3.7.orig.tar.gz.delta to branch 
pristine-tar

$ git checkout -b debian/master
Switched to a new branch 'debian/master'
$ cp -r ../visualequation/debian/ .
$ rm -r debian/patches/
$ git add debian/*
$ debcommit
git commit -m 'Replicating initial release. Closes: #910998.

* Initial release. Closes: #910998.
* This is my first Debian package.'
[debian/master e7df833] Replicating initial release. Closes: #910998.
 9 files changed, 78 insertions(+)
 create mode 100644 debian/changelog
 create mode 100644 debian/compat
 create mode 100644 debian/control
 create mode 100644 debian/copyright
 create mode 100644 debian/gbp.conf
 create mode 100755 debian/rules
 create mode 100644 debian/source/format
 create mode 100644 debian/visualequation.manpages
 create mode 100644 debian/watch
$ gbp buildpackage --git-tag-only
gbp:info: Tagging 0.3.7-1 as debian/0.3.7-1
$ gbp pq import
gbp:info: Trying to apply patches at 
'e7df8339db59a5e92f14523f3c704a989c5b2e74'
gbp:info: Patches listed in 'debian/patches/series' imported on 
'patch-queue/debian/master'

$ gbp import-orig --pristine-tar --uscan
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

$ gbp pq rebase
gbp:info: Switching to 'patch-queue/debian/master'
First, rewinding head to replay your work on top of it...
Applying: Imported Upstream version 0.3.8
$ 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)

On branch debian/master
Untracked files:
  (use "git add ..." to include in what will be committed)

debian/patches/0001-Imported-Upstream-version-0.3.8.patch
debian/patches/series

nothing added to commit but untracked files present (use "git add" to 
track)

$ debuild -us -uc # It builds 0.3.7 without problems
[...]
$ dch -v 0.3.8-1
dch warning: your current directory has been renamed to:
../visualequation-0.3.8
$ debuild -us -uc # It fails building 0.3.8
[...]
dpkg-source: info: building visualequation using existing 
./visualequation_0.3.8.orig.tar.gz

patching file README.md
Reversed (or previously applied) patch detected!  Skipping patch.
3 out of 3 hunks ignored
patching file data/USAGE.html
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored
patching file data/icons-def.ini
Reversed (or previously applied) patch detected!  Skipping patch.
4 out of 4 hunks ignored
patching file visualequation/__main__.py
Reversed (or previously applied) patch detected!  Skipping patch.
4 out of 4 hunks ignored
patching file visualequation/commons.py
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored
patching file visualequation/eq.py
Reversed (or previously applied) patch detected!  Skipping patch.
2 out of 2 hunks ignored
patching file visualequation/eqsel.py
Reversed (or 

Re: upstream release of unreleased package

2019-02-21 Thread Dmitry Shachnev
Hi Daniel,

On Thu, Feb 21, 2019 at 09:15:59PM +, llu...@autistici.org wrote:
> I paste below a (reproducible) log of what I did. Maybe you can show me what
> I did wrong this time so I am not able to build package for 0.3.8.
>
> [...]
> $ gbp buildpackage --git-tag-only
> gbp:info: Tagging 0.3.7-1 as debian/0.3.7-1
> $ gbp pq import
> gbp:info: Trying to apply patches at 
> 'e7df8339db59a5e92f14523f3c704a989c5b2e74'
> gbp:info: Patches listed in 'debian/patches/series' imported on 
> 'patch-queue/debian/master'
> $ gbp import-orig --pristine-tar --uscan

Here, the output of ‘gbp pq import’ is a bit different (note the ‘0’):

  0 patches listed in 'debian/patches/series' imported on 
'patch-queue/debian/master'

And I cannot reproduce the failure that you are getting later. Does this
mean you are using git-buildpackage older than 0.8.0?

In 0.8.0, the output of ‘gbp pq import’ was changed, and in 0.8.2
bug #832016 was fixed, which may affect your workflow.

Anyway, I think that here you should run import-orig from debian/master
branch, not from patch-queue/debian/master (where the previous command
left you). If you run ‘git checkout debian/master’ before ‘gbp import-orig’
this might work even with older git-buildpackage versions.

I recommend setting up your shell prompt to show the current branch, it will
make it easier to understand what is going on. You can find some instructions
how to do it in /usr/lib/git-core/git-sh-prompt.

--
Dmitry Shachnev


signature.asc
Description: PGP signature


Re: upstream release of unreleased package

2019-02-21 Thread lluvia

Hi Dmitry,

On 2019-02-21 21:54, Dmitry Shachnev wrote:
And I cannot reproduce the failure that you are getting later. Does 
this

mean you are using git-buildpackage older than 0.8.0?


Yes, it was older. With 0.8.12.2 I success. Thanks a lot for solving the 
mystery, I will use version 0.8.12.2 from now on.



Anyway, I think that here you should run import-orig from debian/master
branch, not from patch-queue/debian/master (where the previous command
left you). If you run ‘git checkout debian/master’ before ‘gbp 
import-orig’

this might work even with older git-buildpackage versions.


OK. I will do that. Maybe it would be good to add that in the wiki.

I recommend setting up your shell prompt to show the current branch, it 
will
make it easier to understand what is going on. You can find some 
instructions

how to do it in /usr/lib/git-core/git-sh-prompt.


Perfect. Thanks for the tip.

Regards,
Daniel



Re: upstream release of unreleased package

2019-02-21 Thread lluvia

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 
g...@salsa.debian.org:python-team/applications/visualequation.git
gbp:info: Cloning from 
'g...@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



Bug#922938: RFS: python-css-parser/1.0.4-1~bpo9+1

2019-02-21 Thread Nicholas D Steeves
Package: sponsorship-requests
Severity: normal
Justification: necessary for to update the bpo for Calibre

Dear mentors,

I am looking for a sponsor for my package "python-css-parser"

Package name: python-css-parser
Version : 1.0.4-1~bpo9+1
Upstream Author : Christof Hoeke, Walter Doerwald,
  and Kovid Goyal 
URL : https://github.com/ebook-utils/css-parser
License : LGPL-3+
Section : python

It builds these binary packages:

  python-css-parser - CSS related utilities (parsing, serialization, etc) for 
Python 2
  python3-css-parser - CSS related utilities (parsing, serialization, etc) for 
Python 3

To access further information about this package, please visit the following 
URL:

  https://mentors.debian.net/package/python-css-parser

Alternatively, one can download the package with dget using this command:

dget -x 
https://mentors.debian.net/debian/pool/main/p/python-css-parser/python-css-parser_1.0.4-1~bpo9+1.dsc


Regards,
Nicholas