Merge pull request #4948 from freedomofpress/merge-1.1.0-changelog-to…

…-develop

Merge 1.1.0 changelog to develop

changelog.md

@@ -1,6 +1,59 @@
 # Changelog
 
-## 1.1.0~rc1
+## 1.2.0~rc1
+
+## 1.1.0
+
+### Web Applications
+
+* Added Czech to supported languages (#4885).
+* Added Slovak to supported languages (#4940).
+* Reordered and updated wording of manage.py (#4850, #4858).
+* Remove python 2 support in SecureDrop server code (#4859).
+
+### Operations
+
+* Update Tor to 0.4.1.6 (#4848).
+* Updated dependencies for app server and admin workstation (#4865, #4884).
+* Fixes to packaging (#4870, #4871).
+* Improve specification of securedrop-app-code dependencies (#4876).
+
+### Admin Tails workstation
+
+* Added StartupNotify=true to desktop shortcuts (#4841).
+* Adds workarounds for Tails 4.0 detection (#4852).
+* Moves securedrop-admin into Python 3 (#4867).
+* Enables Source and Journalist desktop icons in Tails 4 (#4872).
+* Added check for admin password in GUI updater (#4877).
+
+### Documentation
+
+* Transfer device and export recommendations (#4838).
+* Miscellaneous documentation fixes (#4844, #4853, #4874, #4886).
+
+### Web Applications
+
+* Reordered and updated wording of manage.py (#4850, #4858).
+* Remove python 2 support in SecureDrop server code (#4859).
+
+### Operations
+
+* Updated dependencies for app server and admin workstation (#4865, #4884).
+* Fixes to packaging (#4870, #4871).
+* Improve specification of securedrop-app-code dependencies (#4876).
+
+### Admin Tails workstation
+
+* Added StartupNotify=true to desktop shortcuts (#4841).
+* Adds workarounds for Tails 4.0 detection (#4852).
+* Moves securedrop-admin into Python 3 (#4867).
+* Enables Source and Journalist desktop icons in Tails 4 (#4872).
+* Added check for admin password in GUI updater (#4877).
+
+### Documentation
+
+* Transfer device and export recommendations (#4838).
+* Miscellaneous documentation fixes (#4844, #4853, #4874).
 
 ## 1.0.0
 

docs/conf.py

@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.0.0'
+version = '1.1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.0'
+release = '1.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/set_up_admin_tails.rst

@@ -131,8 +131,8 @@ signed with the release signing key:
 .. code:: sh
 
     cd ~/Persistent/securedrop/
-    git checkout 1.0.0
-    git tag -v 1.0.0
+    git checkout 1.1.0
+    git tag -v 1.1.0
 
 You should see ``Good signature from "SecureDrop Release Signing Key"`` in the
 output of that last command along with the fingerprint above.

install_files/ansible-base/group_vars/all/securedrop

@@ -2,8 +2,8 @@
 # Variables that apply to both the app and monitor server go in this file
 # If the monitor or app server need different values define the variable in
 # hosts_vars/app.yml or host_vars/mon.yml
-securedrop_app_code_version: "1.1.0~rc1"
-securedrop_app_code_sdist_version: "securedrop-app-code-1.1.0-rc1"
+securedrop_app_code_version: "1.2.0~rc1"
+securedrop_app_code_sdist_version: "securedrop-app-code-1.2.0-rc1"
 securedrop_app_code_sdist_name: "{{ securedrop_app_code_sdist_version }}.tar.gz"
 
 grsecurity: true

install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial

@@ -1,8 +1,14 @@
-securedrop-app-code (1.1.0~rc1+xenial) xenial; urgency=medium
+securedrop-app-code (1.2.0~rc1+xenial) xenial; urgency=medium
 
   * See changelog.md
 
- -- Kushal Das <[email protected]>  Wed, 18 Sep 2019 21:32:57 +0530
+ -- SecureDrop Team <[email protected]>  Tue, 22 Oct 2019 12:36:17 +0000
+
+securedrop-app-code (1.1.0+xenial) xenial; urgency=medium
+
+  * See changelog.md
+
+ -- SecureDrop Team <[email protected]>  Mon, 21 Oct 2019 18:09:35 +0000
 
 securedrop-app-code (1.0.0+xenial) xenial; urgency=medium
 

install_files/securedrop-config/DEBIAN/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://securedrop.org
 Package: securedrop-config
-Version: 0.1.3+1.1.0~rc1
+Version: 0.1.3+1.2.0~rc1
 Architecture: all
 Description: Establishes baseline system state for running SecureDrop.
  Configures apt repositories.

install_files/securedrop-keyring/DEBIAN/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://securedrop.org
 Package: securedrop-keyring
-Version: 0.1.3+1.1.0~rc1
+Version: 0.1.3+1.2.0~rc1
 Architecture: amd64
 Depends: gnupg
 Description: Provides an apt keyring for SecureDrop-related packages, so the master signing key used for SecureDrop packages can be updated via apt.

install_files/securedrop-ossec-agent/DEBIAN/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://securedrop.org
 Package: securedrop-ossec-agent
-Version: 3.0.0+1.1.0~rc1
+Version: 3.0.0+1.2.0~rc1
 Architecture: amd64
 Depends: ossec-agent,securedrop-keyring,securedrop-config
 Replaces: ossec-agent

install_files/securedrop-ossec-server/DEBIAN/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://securedrop.org
 Package: securedrop-ossec-server
-Version: 3.0.0+1.1.0~rc1
+Version: 3.0.0+1.2.0~rc1
 Architecture: amd64
 Depends: ossec-server,securedrop-keyring,securedrop-config
 Replaces: ossec-server

molecule/builder-xenial/tests/vars.yml

@@ -1,5 +1,5 @@
 ---
-securedrop_version: "1.1.0~rc1"
+securedrop_version: "1.2.0~rc1"
 ossec_version: "3.0.0"
 keyring_version: "0.1.3"
 config_version: "0.1.3"

molecule/shared/stable.ver

@@ -1 +1 @@
-1.0.0
+1.1.0

securedrop/version.py

@@ -1 +1 @@
-__version__ = '1.1.0~rc1'
+__version__ = '1.2.0~rc1'

setup.py

@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="securedrop-app-code",
-    version="1.1.0~rc1",
+    version="1.2.0~rc1",
     author="Freedom of the Press Foundation",
     author_email="[email protected]",
     description="SecureDrop Server",