Merge ~smoser/ssh-import-id:ubuntu/devel into ssh-import-id:ubuntu/devel

[Scott Moser]

releasing ssh-import-id version 5.8-0ubuntu1

see commit message

[Dustin Kirkland  (kirkland)]

review: Approve

[Robie Basak (racb)]

I was asked to review this but then I see that Dustin beat me to it.

I'm puzzled by the debian/ directory existing in the master branch. This leaves me confused about what the usual release management process is for the project.

However, as Dustin and Scott both know the project already and they have both approved this MP, I'll leave it here - no need for me to go into it as well then.

review: Abstain

[Dustin Kirkland  (kirkland)]

This is an relic of the fact that I started this project / package, many
years ago, and use the same process that I've used for the dozens of
projects + packages that I've maintained. In each of those, I simply keep
the debian/ directory in the master upstream source (other distros are
welcome to ignore it). And I use the debian/changelog to cover both the
packaging changes, as well as all of the upstream source code changes
(which are automatically duplicated, verbatim, in source code revision
control). Scott and I have shared this access and process successfully on
other projects/packages, and I'd prefer to keep it that way.

On Tue, Feb 11, 2020 at 11:03 AM Robie Basak <email address hidden>
wrote:

> Review: Abstain
>
> I was asked to review this but then I see that Dustin beat me to it.
>
> I'm puzzled by the debian/ directory existing in the master branch. This
> leaves me confused about what the usual release management process is for
> the project.
>
> However, as Dustin and Scott both know the project already and they have
> both approved this MP, I'll leave it here - no need for me to go into it as
> well then.
>
> Diff comments:
>
> > diff --git a/debian/control b/debian/control
> > index d55c9bf..8f5a7f4 100644
> > --- a/debian/control
> > +++ b/debian/control
> > @@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 10),
> > python3-setuptools
> > Standards-Version: 4.1.3
> > Homepage: http://launchpad.net/ssh-import-id
> > -Vcs-Browser:
> http://bazaar.launchpad.net/~ssh-import-id/ssh-import-id/trunk/files
> > -Vcs-Bzr: https://code.launchpad.net/~ssh-import-id/ssh-import-id/trunk
> > +Vcs-Browser: https://git.launchpad.net/ssh-import-id
> > +Vcs-git: https://git.launchpad.net/ssh-import-id
>
> Vcs-Git is the normal capitalization, although admittedly field names are
> specified to be case insensitive.
>
> >
> > Package: ssh-import-id
> > Architecture: all
>
>
> --
>
> https://code.launchpad.net/~smoser/ssh-import-id/+git/ssh-import-id/+merge/378909
> You are reviewing the proposed merge of ~smoser/ssh-import-id:ubuntu/devel
> into ssh-import-id:ubuntu/devel.
>

[Scott Moser (smoser)]

It seems fine to me to have a debian/ dir in upstream. If upstream wants to make packages, for testing, then they probably want to have a debian/ dir to do so, and not managing that dir in git would be silly.

I'm not set on that staying, but as it is right now this is almost how curtin does it.

In curtin, we have deleted the debian/changelog file to avoid having conflicts between the ubuntu/debian branch and master branch, and I think that seems sane to do here also.

The debian/ dir means that './tools/build-deb' creates a deb from the current branch.

Anyway. thanks for reviews. I will upload.

[Robie Basak (racb)]

Thank you for explaining.

To be clear, I didn't mean to suggest that the process should be changed. Just that I was confused as to exactly what the process was, and it didn't seem worth me taking the time to look further as Dustin already reviewed this MP.

I might have my own differing views of what the "ideal" should be, but I don't think it's appropriate to push for that in a project I have had virtually no development involvement with. I am very much in favour of adapting to follow the established pattern in any given project, and in not seeking to change that without heavy involvement and experience first.

diff --git a/debian/changelog b/debian/changelog
index 94aa69e..0ad3f3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ssh-import-id (5.8-0ubuntu1) focal; urgency=medium
+
+  * New upstream release.
+    - Release 5.8.
+    - setup.py: Update long description content type in order to upload to
+      pypi. [Dustin Kirkland]
+    - debian/control: Update vcs fields after move to git.
+
+ -- Scott Moser <[e-mail]>  Tue, 11 Feb 2020 11:24:22 -0500
+
 ssh-import-id (5.7-24-g4001a38e-0ubuntu1) cosmic; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/control b/debian/control
index d55c9bf..8f5a7f4 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 10),
                python3-setuptools
 Standards-Version: 4.1.3
 Homepage: http://launchpad.net/ssh-import-id
-Vcs-Browser: http://bazaar.launchpad.net/~ssh-import-id/ssh-import-id/trunk/files
-Vcs-Bzr: https://code.launchpad.net/~ssh-import-id/ssh-import-id/trunk
+Vcs-Browser: https://git.launchpad.net/ssh-import-id
+Vcs-git: https://git.launchpad.net/ssh-import-id
 
 Package: ssh-import-id
 Architecture: all
diff --git a/setup.py b/setup.py
index 3b6d878..78e592f 100755
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@ except OSError:
 setup(
     name='ssh-import-id',
     description='Authorize SSH public keys from trusted online identities',
-    long_description=readme,
+    long_description_content_type='markdown',
     version=read_version(),
     author='Dustin Kirkland, Casey Marshall',
     author_email='[e-mail], [e-mail]',
diff --git a/ssh_import_id/version.py b/ssh_import_id/version.py
index 70a5218..7edaaba 100644
--- a/ssh_import_id/version.py
+++ b/ssh_import_id/version.py
@@ -1,6 +1,6 @@
 # This file is part of ssh-import-id. See LICENSE file for more info.
 
-_LAST_RELEASE = "5.7"
+_LAST_RELEASE = "5.8"
 _PACKAGED_VERSION = '@@PACKAGED_VERSION@@'
 
 VERSION = _LAST_RELEASE