Skip to content

Commit

Permalink
Creates sd-viewer metapackage, replaces sd-svs-disp
Browse files Browse the repository at this point in the history
Adds new metapackage with a clean history, to aid in template
consolidation. Attempts to override the old package, causing it
automatically be removed, via Replaces/Conflicts [0].

The dependencies are the same, although reordered, with one exception:
"evince" has been pulled in so we can remove it from the salt config.

[0] https://www.debian.org/doc/debian-policy/ch-relationships.html#s-replaces
  • Loading branch information
Conor Schaefer committed Oct 2, 2020
1 parent 9fa374c commit 71764ec
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,13 @@ securedrop-workstation-grsec: ## Builds Debian metapackage for Qubes Workstation
PKG_NAME="securedrop-workstation-grsec" ./scripts/build-debianpackage

.PHONY: securedrop-workstation-svs-disp
securedrop-workstation-svs-disp: ## Builds Debian metapackage for Disposable VM dependencies and tooling
securedrop-workstation-svs-disp: ## Builds Debian metapackage for Disposable VM dependencies and tooling (DEPRECATED)
PKG_NAME="securedrop-workstation-svs-disp" ./scripts/build-debianpackage

.PHONY: securedrop-workstation-viewer
securedrop-workstation-viewer: ## Builds Debian metapackage for Disposable VM dependencies and tooling
PKG_NAME="securedrop-workstation-viewer" ./scripts/build-debianpackage

.PHONY: securedrop-export
securedrop-export: ## Builds Debian package for Qubes Workstation export scripts
PKG_NAME="securedrop-export" ./scripts/build-debianpackage
Expand Down
5 changes: 5 additions & 0 deletions securedrop-workstation-viewer/debian/changelog-buster
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
securedrop-workstation-viewer (0.1.0+buster) unstable; urgency=medium

* Creates package, replacing 'securedrop-workstation-sd-svs-disp' package

-- SecureDrop Team <securedrop@freedom.press> Thu, 01 Oct 2020 17:36:58 -0700
1 change: 1 addition & 0 deletions securedrop-workstation-viewer/debian/compat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9
15 changes: 15 additions & 0 deletions securedrop-workstation-viewer/debian/control
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Source: securedrop-workstation-viewer
Section: unknown
Priority: optional
Maintainer: SecureDrop Team <securedrop@freedom.press>
Build-Depends: debhelper (>= 9),
Standards-Version: 3.9.8
Homepage: https://github.com/freedomofpress/securedrop-debian-packaging

Package: securedrop-workstation-viewer
Architecture: all
Depends: securedrop-workstation-config,securedrop-workstation-grsec,apparmor-profiles,apparmor-profiles-extra,apparmor-utils,audacious,eog,evince,file-roller,gedit,totem
Description: This is the SecureDrop workstation SecureDrop Viewer Disposable VM template configuration package. This package provides dependencies and configuration for the Qubes SecureDrop workstation sd-viewer Template VM.
Provides: securedrop-workstation-sd-svs-disp
Conflicts: securedrop-workstation-sd-svs-disp
Replaces: securedrop-workstation-sd-svs-disp
7 changes: 7 additions & 0 deletions securedrop-workstation-viewer/debian/copyright
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: securedrop-workstation-svs-disp
Source: https://github.com/freedomofpress/securedrop-debian-packaging

Files: *
Copyright: 2020 Freedom of the Press Foundation <securedrop@freedom.press>
License: GPLv3+
4 changes: 4 additions & 0 deletions securedrop-workstation-viewer/debian/rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/make -f

%:
dh $@

0 comments on commit 71764ec

Please sign in to comment.