Bug#878433: dgit-maint-merge(7) workflow for converting an existing package does not work

2017-10-13 Thread Sean Whitton 
control: tag -1 +patch
control: severity -1 minor

Hello Michael,

Firstly, let me note that you didn't finish following the instructions.
You're meant to follow the "Source package configuration" section after
following either "Initial Debianisation" or "Converting an existing
package".  That's why "Source package configuration" comes before the
instructions to use `dgit build-source`.

That wouldn't fix the missing orig.tar, though.  The issue is that the
manpage assumes that you already have the repository cloned and have
been using it with another workflow, in which case you'd already have
the orig.tar present.

The attached patch adds a few commands to handle your case.

On Fri, Oct 13 2017, Michael Stapelberg wrote:

> Could a check for the orig tarball be added to “dgit build-source”?
> The current dpkg-source message is confusing: [...]

I think it makes more sense to improve this error message in
dpkg-source, rather than working around it in dgit.

-- 
Sean Whitton

From b850304d55df5d4948cef43dcd3d5439adf9a7e4 Mon Sep 17 00:00:00 2001
From: Sean Whitton 
Date: Fri, 13 Oct 2017 14:08:51 -0700
Subject: [PATCH] dgit-maint-merge(7): Include instructions to clone existing
 repo

Signed-off-by: Sean Whitton 
---
 dgit-maint-merge.7.pod | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 3da1b78..ffece64 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -188,7 +188,16 @@ this workflow.  It should be skipped when debianising a new package.
 
 =head2 Existing git history using another workflow
 
-First, dump any existing patch queue:
+First, if you don't already have the git history locally, clone it,
+and obtain the corresponding orig.tar from the archive:
+
+=over 4
+
+% git clone git.debian.org:collab-maint/foo
+% cd foo
+% origtargz
+
+Now dump any existing patch queue:
 
 =over 4
 
-- 
2.14.2



signature.asc
Description: PGP signature

Bug#878433: dgit-maint-merge(7) workflow for converting an existing package does not work

2017-10-13 Thread Michael Stapelberg 
Thanks. Running “pristine-tar checkout
google-cloud-print-connector_1.12.orig.tar.gz” indeed gets me further.

Could a check for the orig tarball be added to “dgit build-source”?
The current dpkg-source message is confusing:
• it mentions a generic “orig.tar” instead of the actual filename it expects
• it mentions “debian.tar”, which I assume doesn’t apply here
• it claims my package uses source format v2.0, but I’m using v3.0

On Fri, Oct 13, 2017 at 10:37 AM, Ian Jackson
 wrote:
> Michael Stapelberg writes ("Bug#878433: dgit-maint-merge(7) workflow for 
> converting an existing package does not work"):
>> Package: dgit
>> Version: 3.12
>> Severity: normal
>>
>> I read the following section of the dgit-maint-merge(7):
>> https://manpages.debian.org/stretch/dgit/dgit-maint-merge.7.en.html#Existing_git_history_using_another_workflow
>
> I'm currently on a train and can't dig properly, but:
>
>> And tried to apply it to one of my packages:
>>
>> % gbp clone 
>> git+ssh://git.debian.org/git/pkg-go/packages/google-cloud-print-connector.git
>> gbp:info: Cloning from 
>> 'git+ssh://git.debian.org/git/pkg-go/packages/google-cloud-print-connector.git'
>> % cd google-cloud-print-connector
> ...
>> % dgit build-source
>> Format `3.0 (quilt)', need to check/update patch stack
>> examining quilt state (multiple patches, linear mode)
>> dpkg-source: error: missing orig.tar or debian.tar file in v2.0 source 
>> package
>
> I don't know how the dgit-maint-merge workflow is supposed to generate
> the .orig, but before yo do this you need to somehow have
>  ../google-cloud-print-connector_UPSTREAMVERSION.orig.tar.gz
> or similar.
>
> In the absence of a better answer from me, maybe Sean can enlighten
> you ?
>
> Ian.



-- 
Best regards,
Michael

Bug#878433: dgit-maint-merge(7) workflow for converting an existing package does not work

2017-10-13 Thread Ian Jackson 
Michael Stapelberg writes ("Bug#878433: dgit-maint-merge(7) workflow for 
converting an existing package does not work"):
> Package: dgit
> Version: 3.12
> Severity: normal
> 
> I read the following section of the dgit-maint-merge(7):
> https://manpages.debian.org/stretch/dgit/dgit-maint-merge.7.en.html#Existing_git_history_using_another_workflow

I'm currently on a train and can't dig properly, but:

> And tried to apply it to one of my packages:
> 
> % gbp clone 
> git+ssh://git.debian.org/git/pkg-go/packages/google-cloud-print-connector.git
> gbp:info: Cloning from 
> 'git+ssh://git.debian.org/git/pkg-go/packages/google-cloud-print-connector.git'
> % cd google-cloud-print-connector 
...
> % dgit build-source
> Format `3.0 (quilt)', need to check/update patch stack
> examining quilt state (multiple patches, linear mode)
> dpkg-source: error: missing orig.tar or debian.tar file in v2.0 source package

I don't know how the dgit-maint-merge workflow is supposed to generate
the .orig, but before yo do this you need to somehow have
 ../google-cloud-print-connector_UPSTREAMVERSION.orig.tar.gz
or similar.

In the absence of a better answer from me, maybe Sean can enlighten
you ?

Ian.

Bug#878433: dgit-maint-merge(7) workflow for converting an existing package does not work

2017-10-13 Thread Michael Stapelberg 
Package: dgit
Version: 3.12
Severity: normal

I read the following section of the dgit-maint-merge(7):
https://manpages.debian.org/stretch/dgit/dgit-maint-merge.7.en.html#Existing_git_history_using_another_workflow

And tried to apply it to one of my packages:

% gbp clone 
git+ssh://git.debian.org/git/pkg-go/packages/google-cloud-print-connector.git
gbp:info: Cloning from 
'git+ssh://git.debian.org/git/pkg-go/packages/google-cloud-print-connector.git'
% cd google-cloud-print-connector 
% git remote add -f upstream https://github.com/google/cloud-print-connector
Updating upstream  
warning: no common commits
remote: Counting objects: 3022, done.
remote: Total 3022 (delta 0), reused 0 (delta 0), pack-reused 3022
Receiving objects: 100% (3022/3022), 1.18 MiB | 1.99 MiB/s, done.
Resolving deltas: 100% (1668/1668), done.
From https://github.com/google/cloud-print-connector
 * [new branch]  driver -> upstream/driver
 * [new branch]  master -> upstream/master
 * [new branch]  printer_notify -> upstream/printer_notify
 * [new branch]  testingURLs-> upstream/testingURLs
 * [new tag] 2015.03.04 -> 2015.03.04
 * [new tag] 2015.04.13 -> 2015.04.13
 * [new tag] 2015.06.29 -> 2015.06.29
 * [new tag] 2015.07.31 -> 2015.07.31
 * [new tag] 2015.08.24 -> 2015.08.24
 * [new tag] 2015.09.22 -> 2015.09.22
 * [new tag] 2015.09.30 -> 2015.09.30
 * [new tag] 2015.10.05 -> 2015.10.05
 * [new tag] 2016.01.02 -> 2016.01.02
 * [new tag] v1.1   -> v1.1
 * [new tag] v1.11  -> v1.11
 * [new tag] v1.12  -> v1.12
 * [new tag] v1.13  -> v1.13
% dgit build-source
Format `3.0 (quilt)', need to check/update patch stack
examining quilt state (multiple patches, linear mode)
dpkg-source: error: missing orig.tar or debian.tar file in v2.0 source package
dgit: failed command: sh -ec 'exec dpkg-source --no-check --skip-patches -x 
fake.dsc >/dev/null'
dgit: subprocess failed with error exit status 255

At this point, I have no idea why I’m getting the error message I see or how to
proceed.

-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 
'testing-debug'), (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armel, mipsel, arm64

Kernel: Linux 4.13.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), 
LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages dgit depends on:
ii  apt   1.5
ii  ca-certificates   20170717
ii  coreutils 8.26-3
ii  curl  7.55.1-1
ii  devscripts2.17.10
ii  dpkg-dev  1.18.24
ii  dput-ng [dput]1.15
ii  git [git-core]1:2.14.2-1
ii  git-buildpackage  0.9.0~exp4
ii  libdpkg-perl  1.18.24
ii  libjson-perl  2.94-1
ii  liblist-moreutils-perl0.416-1+b3
ii  libperl5.22 [libdigest-sha-perl]  5.22.2-5
ii  libperl5.26 [libdigest-sha-perl]  5.26.0-8
ii  libtext-glob-perl 0.10-1
ii  libtext-iconv-perl1.7-5+b6
ii  libwww-perl   6.15-2
ii  perl  5.26.0-8

Versions of packages dgit recommends:
ii  openssh-client [ssh-client]  1:7.6p1-2

Versions of packages dgit suggests:
ii  sbuild  0.73.0-4

-- no debconf information