From dc10baabf961ca5fc2113563f1ce38a497de70d5 Mon Sep 17 00:00:00 2001
From: Kushal Das <mail@kushaldas.in>
Date: Thu, 23 Jan 2020 16:52:06 +0530
Subject: [PATCH] Adds changes for updated securedrop-log package

Now also adds the securedrop-log systemd service file.
---
 securedrop-log/debian/changelog-buster       | 6 ++++++
 securedrop-log/debian/control                | 4 ++--
 securedrop-log/debian/rules                  | 2 +-
 securedrop-log/debian/securedrop-log.install | 4 ++++
 securedrop-log/debian/securedrop-log.links   | 2 ++
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/securedrop-log/debian/changelog-buster b/securedrop-log/debian/changelog-buster
index 9ad86d2c..19797935 100644
--- a/securedrop-log/debian/changelog-buster
+++ b/securedrop-log/debian/changelog-buster
@@ -1,3 +1,9 @@
+securedrop-log (0.0.4+buster) unstable; urgency=medium
+
+  * See changelog.md
+
+ -- Kushal Das <kushal@freedom.press>  Tue, 22 Jan 2019 13:05:38 +0530
+
 securedrop-log (0.0.3+buster) unstable; urgency=medium
 
   * See changelog.md
diff --git a/securedrop-log/debian/control b/securedrop-log/debian/control
index 977c310f..8051f7be 100644
--- a/securedrop-log/debian/control
+++ b/securedrop-log/debian/control
@@ -2,7 +2,7 @@ Source: securedrop-log
 Section: utils
 Priority: optional
 Maintainer: SecureDrop Team <securedrop@freedom.press>
-Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools, dh-virtualenv
+Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools, dh-virtualenv, python3-distutils
 Standards-Version: 3.9.8
 Homepage: https://github.com/freedomofpress/securedrop-log
 Vcs-Git: https://github.com/freedomofpress/securedrop-log.git
@@ -10,7 +10,7 @@ X-Python-3-Version: >= 3.7
 
 Package: securedrop-log
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}
+Depends: ${python3:Depends}, ${misc:Depends}, python3-distutils
 Description: Python module and qrexec service to store logs for SecureDrop Workstation
  This package provides Python module and qrexec service files to create a logging VM in
  SecureDrop Workstation project in Qubes.
diff --git a/securedrop-log/debian/rules b/securedrop-log/debian/rules
index 28f5894d..a380b52f 100755
--- a/securedrop-log/debian/rules
+++ b/securedrop-log/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python-virtualenv --python /usr/bin/python3 --setuptools --index-url https://pypi.securedrop.org/simple --requirements build-requirements.txt
+	dh $@ --with python-virtualenv --python /usr/bin/python3 --setuptools --extra-pip-arg "--no-deps" --index-url https://pypi.securedrop.org/simple --requirements build-requirements.txt
 
 override_dh_strip_nondeterminism:
 	find ./debian/ -type f -name '*.pyc' -delete
diff --git a/securedrop-log/debian/securedrop-log.install b/securedrop-log/debian/securedrop-log.install
index cf0dfe84..01500926 100644
--- a/securedrop-log/debian/securedrop-log.install
+++ b/securedrop-log/debian/securedrop-log.install
@@ -1 +1,5 @@
 securedrop.Log etc/qubes-rpc/
+sd-rsyslog usr/sbin/
+securedrop-log.service etc/systemd/system
+sdlog.conf etc/rsyslog.d/
+
diff --git a/securedrop-log/debian/securedrop-log.links b/securedrop-log/debian/securedrop-log.links
index ff0fcb27..e5480a62 100644
--- a/securedrop-log/debian/securedrop-log.links
+++ b/securedrop-log/debian/securedrop-log.links
@@ -1 +1,3 @@
 opt/venvs/securedrop-log/sbin/securedrop-log usr/sbin/securedrop-log
+opt/venvs/securedrop-log/sbin/securedrop-log-saver usr/sbin/securedrop-log-saver
+opt/venvs/securedrop-log/sbin/securedrop-redis-log usr/sbin/securedrop-redis-log