Merge pull request #198 from freedomofpress/mimetype-reorg-for-all

Reorganizes mimetype declarations for template consolidation

Makefile

@@ -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

securedrop-export/debian/securedrop-export.install

@@ -1,5 +1,3 @@
 files/application-x-sd-export.xml usr/share/mime/packages
 files/send-to-usb.desktop usr/share/applications
 files/sd-logo.png usr/share/securedrop/icons
-files/mimeapps.list usr/share/applications/
-files/open-in-dvm.desktop usr/share/applications/

securedrop-workstation-config/debian/changelog-buster

@@ -1,3 +1,9 @@
+securedrop-workstation-config (0.1.5+buster) unstable; urgency=medium
+
+  * Adds a "default" mimetype handler, for reuse by other VMs
+
+ -- SecureDrop Team <securedrop@freedom.press>  Thu, 01 Oct 2020 17:55:53 -0700
+
 securedrop-workstation-config (0.1.4+buster) unstable; urgency=medium
 
   * Provides mime type files all VMs for template consolidation

securedrop-workstation-config/debian/postinst

@@ -21,12 +21,15 @@ set -e
 case "$1" in
     configure)
     # move pax flags and restart paxctld service
+    # copy and set default mimeapps handling
     # except for whonix-based VMs
     if [ ! -e "/etc/whonix_version" ]; then
       cp /opt/sdw/paxctld.conf /etc/paxctld.conf
       systemctl restart paxctld
+      cp /opt/sdw/open-in-dvm.desktop /usr/share/applications/
+      cp /opt/sdw/mimeapps.list.sd-app /usr/share/applications/mimeapps.list
+      cp /opt/sdw/mimeapps.list.sd-app /opt/sdw/mimeapps.list.default
     fi
-    cp /opt/sdw/open-in-dvm.desktop /usr/share/applications/
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

securedrop-workstation-svs-disp/debian/changelog-buster

@@ -1,3 +1,10 @@
+securedrop-workstation-svs-disp (0.2.3+buster) unstable; urgency=medium
+
+  * Removes mimetype handling logic, now handled in the
+  'securedrop-workstation-config' package.
+
+ -- SecureDrop Team <securedrop@freedom.press>  Fri, 11 Sep 2020 11:03:11 -0700
+
 securedrop-workstation-svs-disp (0.2.2+buster) unstable; urgency=medium
 
   * Fix mime type handling for desktop files

securedrop-workstation-svs-disp/debian/securedrop-workstation-svs-disp.install

@@ -1,2 +1 @@
-mimeapps.list usr/share/applications/
 paxctld.conf.svsdisp opt/

securedrop-workstation-viewer/debian/changelog-buster

@@ -0,0 +1,12 @@
+securedrop-workstation-viewer (0.1.1+buster) unstable; urgency=medium
+
+  * Fixes typo in control fields, replaces package
+  'securedrop-workstation-svs-disp'
+
+ -- SecureDrop Team <securedrop@freedom.press>  Mon, 05 Oct 2020 16:59:56 -0700
+
+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

securedrop-workstation-viewer/debian/compat

@@ -0,0 +1 @@
+9

securedrop-workstation-viewer/debian/control

@@ -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-svs-disp
+Conflicts: securedrop-workstation-svs-disp
+Replaces: securedrop-workstation-svs-disp

securedrop-workstation-viewer/debian/copyright

@@ -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+

securedrop-workstation-viewer/debian/rules

@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@