Skip to content

Commit

Permalink
fix: fully use dh-sequence-installnss
Browse files Browse the repository at this point in the history
Package `dh-sequence-installnss` not supported in jammy. Dropping
support for newer packages there.

Checking for existence of `/usr/bin/dh_installnss` on the machine was wrong anyway (outside the build env).

Fixes: #12
  • Loading branch information
petski committed Jul 21, 2024
1 parent 694c237 commit c61d778
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 90 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ jobs:
launchpad_publish:
needs: create_gh_release
name: Publish (launchpad)
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
# curl -s https://api.launchpad.net/1.0/ubuntu/series | jq -r '.entries[] | select(.active == true).name' | xargs | sed 's/ /, /g'
distro: [
Expand All @@ -103,7 +104,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- run: git archive --format=tar.gz --prefix="nss-docker-ng_${GITHUB_REF_NAME#v}/" -o "../nss-docker-ng_${GITHUB_REF_NAME#v}.orig.tar.gz" "$GITHUB_REF_NAME"
- run: sudo apt-get update && sudo apt-get -y install devscripts cargo dh-make patchelf
- run: sudo apt-get update && sudo apt-get -y install devscripts dh-sequence-installnss build-essential cargo dh-make patchelf
- run: |
dch \
--create \
Expand Down
4 changes: 2 additions & 2 deletions debian/control
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Source: nss-docker-ng
Section: admin
Priority: optional
Build-Depends: debhelper-compat (= 13), cargo, patchelf
Build-Depends: debhelper-compat (= 13), dh-sequence-installnss, cargo, patchelf
Maintainer: Patrick Kuijvenhoven <[email protected]>
Standards-Version: 4.5.1
Vcs-Git: https://github.com/petski/nss-docker-ng.git
Expand All @@ -10,7 +10,7 @@ Rules-Requires-Root: no

Package: nss-docker-ng
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, perl | dh-nss
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: docker.io
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Expand Down
47 changes: 0 additions & 47 deletions debian/nss-docker-ng.postinst

This file was deleted.

39 changes: 0 additions & 39 deletions debian/nss-docker-ng.postrm

This file was deleted.

0 comments on commit c61d778

Please sign in to comment.