From 11282ade1d8deeafa042a639e2685472d6347e69 Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Wed, 2 Mar 2022 19:22:44 +0000
Subject: Move the `snapcraft` configuration to `contrib`. (#12142)

* Move the `snapcraft` configuration to `contrib`.

We're happy for people to package this as a snap image if it's useful,
but we don't support or maintain it. I'd like to move the config to
`contrib` to reflect this state of affairs.

* Changelog
---
 MANIFEST.in                 |  1 -
 changelog.d/12142.misc      |  1 +
 contrib/snap/snapcraft.yaml | 57 +++++++++++++++++++++++++++++++++++++++++++++
 snap/snapcraft.yaml         | 57 ---------------------------------------------
 4 files changed, 58 insertions(+), 58 deletions(-)
 create mode 100644 changelog.d/12142.misc
 create mode 100644 contrib/snap/snapcraft.yaml
 delete mode 100644 snap/snapcraft.yaml

diff --git a/MANIFEST.in b/MANIFEST.in
index 7e903518e1..f1e295e583 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -52,5 +52,4 @@ prune contrib
 prune debian
 prune demo/etc
 prune docker
-prune snap
 prune stubs
diff --git a/changelog.d/12142.misc b/changelog.d/12142.misc
new file mode 100644
index 0000000000..5d09f90b52
--- /dev/null
+++ b/changelog.d/12142.misc
@@ -0,0 +1 @@
+Move the snapcraft configuration file to `contrib`.
\ No newline at end of file
diff --git a/contrib/snap/snapcraft.yaml b/contrib/snap/snapcraft.yaml
new file mode 100644
index 0000000000..dd4c8478d5
--- /dev/null
+++ b/contrib/snap/snapcraft.yaml
@@ -0,0 +1,57 @@
+name: matrix-synapse
+base: core18
+version: git
+summary: Reference Matrix homeserver
+description: |
+  Synapse is the reference Matrix homeserver.
+  Matrix is a federated and decentralised instant messaging and VoIP system.
+
+grade: stable
+confinement: strict
+
+apps:
+  matrix-synapse:
+    command: synctl --no-daemonize start $SNAP_COMMON/homeserver.yaml
+    stop-command: synctl -c $SNAP_COMMON stop
+    plugs: [network-bind, network]
+    daemon: simple
+  hash-password:
+    command: hash_password
+  generate-config:
+    command: generate_config
+  generate-signing-key:
+    command: generate_signing_key
+  register-new-matrix-user:
+    command: register_new_matrix_user
+    plugs: [network]
+  synctl:
+    command: synctl
+parts:
+  matrix-synapse:
+    source: .
+    plugin: python
+    python-version: python3
+    python-packages:
+      - '.[all]'
+      - pip
+      - setuptools
+      - setuptools-scm
+      - wheel
+    build-packages:
+      - libffi-dev
+      - libturbojpeg0-dev
+      - libssl-dev
+      - libxslt1-dev
+      - libpq-dev
+      - zlib1g-dev
+    stage-packages:
+      - libasn1-8-heimdal
+      - libgssapi3-heimdal
+      - libhcrypto4-heimdal
+      - libheimbase1-heimdal
+      - libheimntlm0-heimdal
+      - libhx509-5-heimdal
+      - libkrb5-26-heimdal
+      - libldap-2.4-2
+      - libpq5
+      - libsasl2-2
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
deleted file mode 100644
index dd4c8478d5..0000000000
--- a/snap/snapcraft.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: matrix-synapse
-base: core18
-version: git
-summary: Reference Matrix homeserver
-description: |
-  Synapse is the reference Matrix homeserver.
-  Matrix is a federated and decentralised instant messaging and VoIP system.
-
-grade: stable
-confinement: strict
-
-apps:
-  matrix-synapse:
-    command: synctl --no-daemonize start $SNAP_COMMON/homeserver.yaml
-    stop-command: synctl -c $SNAP_COMMON stop
-    plugs: [network-bind, network]
-    daemon: simple
-  hash-password:
-    command: hash_password
-  generate-config:
-    command: generate_config
-  generate-signing-key:
-    command: generate_signing_key
-  register-new-matrix-user:
-    command: register_new_matrix_user
-    plugs: [network]
-  synctl:
-    command: synctl
-parts:
-  matrix-synapse:
-    source: .
-    plugin: python
-    python-version: python3
-    python-packages:
-      - '.[all]'
-      - pip
-      - setuptools
-      - setuptools-scm
-      - wheel
-    build-packages:
-      - libffi-dev
-      - libturbojpeg0-dev
-      - libssl-dev
-      - libxslt1-dev
-      - libpq-dev
-      - zlib1g-dev
-    stage-packages:
-      - libasn1-8-heimdal
-      - libgssapi3-heimdal
-      - libhcrypto4-heimdal
-      - libheimbase1-heimdal
-      - libheimntlm0-heimdal
-      - libhx509-5-heimdal
-      - libkrb5-26-heimdal
-      - libldap-2.4-2
-      - libpq5
-      - libsasl2-2
-- 
cgit 1.5.1