Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge securesystemslib 0.11.3-1 debian/* files into master #177

Merged
merged 15 commits into from
Sep 4, 2019
Merged

Conversation

lukpueh
Copy link
Member

@lukpueh lukpueh commented Sep 4, 2019

Fixes issue #:
None.

There is no need to review these files. @h01ger already reviewed and used them for the python-securesystemslib 0.11.3-1 release.

Description of the changes being introduced by the pull request:
Update debian/* files from an earlier release attempt, to match with most recent (first) release.

This should fix a qa.debian.org's vcswatch warning, which complains about an old debian/changelog in upstream's default branch.

Some background thoughts: securesystemslib is a non-native Debian package. Hence the debian/* files don't really belong into the upstream repo. But for simplicity, we decided to keep the files in upstream, as upstream and downstream developers are the same people. Originally, I meant to keep the debian metadata in a separate dedicated debian branch, and just delete the outdated debian metadata from master. However, if we then wanted to update the debian branch (e.g. rebase onto master) we might end up deleting up-to-date debian metadata. Bottomline, the easiest thing seems to just carry the files along in master. (@SantiagoTorres, does this make sense?)

Please verify and check that the pull request fulfills the following
requirements
:

  • The code follows the Code Style Guidelines
  • Tests have been added for the bug fix or new feature
  • Docs have been added for the bug fix or new feature

lukpueh added 15 commits June 12, 2019 16:33
- Simplify control and rule file
- Change control and rules file to only build Python3
  it's mid '19 :)
- Override changelog file to list 0.11.3 as initial deb release
  (0.10.9 was never actually released on debian)
Use @awwad's signing key, he signed the most recent upstream
release that we will package.
See debian policy for requirements of the Description contents,
i.e. synopsis and extended description.
https://www.debian.org/doc/debian-policy/ch-binary.html#the-description-of-a-package
The debian release is only one of many releases, thus non-native
makes more sense

Further details at:
- https://wiki.debian.org/DebianMentorsFaq#What_is_the_difference_between_a_native_Debian_package_and_a_non-native_package.3F
- https://wiki.debian.org/Packaging/Intro#The_packaging_work_flow

Debian build instructions for upstream release 0.11.3
-----------------------------------------------------
```
  # Assuming sbuild is installed and chroot is created
  # https://wiki.debian.org/sbuild

  # Download upstream tarball + signature and rename to expected pattern
  wget https://github.com/secure-systems-lab/securesystemslib/releases/download/sslibv0.11.3/securesystemslib-0.11.3.tar.gz \
      -O python-securesystemslib_0.11.3.orig.tar.gz
  wget https://github.com/secure-systems-lab/securesystemslib/releases/download/sslibv0.11.3/securesystemslib-0.11.3.tar.gz.asc \
      -O python-securesystemslib_0.11.3.orig.tar.gz.asc

  # Extract upstream tarball
  tar xf python-securesystemslib_0.11.3.orig.tar.gz

  # Clone upstream repo for debian files and tests
  git clone https://github.com/secure-systems-lab/securesystemslib.git \
      securesystemslib-upstream

  # Copy debian files (from debian branch)
  git -C securesystemslib-upstream checkout debian --
  cp -r securesystemslib-upstream/debian securesystemslib-0.11.3/

  # Change to unpacked tarball
  cd securesystemslib-0.11.3

  ##################
  # Optionally copy and run tests (from corresponding release tag)
  # NOTE: The next upstream release will include tests in the source tarball
  # see #168
  git -C ../securesystemslib-upstream checkout sslibv0.11.3
  cp -r ../securesystemslib-upstream/tests .
  # FIXME: Sbuild will complain about local changes and abort building. One way
  # to solve this is to create downstream patches, but there must be a better way
  # to only run tests in chroot as sbuild would do it, without including the
  # tests to the downstream release.
  dpkg-source --commit
  sbuild -A -s -d unstable
  ##################

  # Build (w/o tests)
  DEB_BUILD_OPTIONS=nocheck sbuild -A -s -d unstable

  # Sign debian files (replace keyid if necessary)
  debsign -k 8BA69B87D43BE294F23E812089A2AD3C07D962E8
```
Add auto-generated watch file obtained by
```
curl -o debian/watch https://pypi.debian.net/mypackage/watch
```
Drop debian/compat and replace "debhelper (>= 12~)" with
"debhelper-compat (12)" in debian/control.
Fixes timewarp-standards-version lintian warning:

The source package refers to a Standards-Version that was released
after the date of the most recent debian/changelog entry.
Replace RFS bug number with ITP bug number in first changelog
entry.
The skiptest override may be removed with the next upstream
release, which includes tests in the release tarball.
@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling 0bd1dba on debian into a9e3f7e on master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants