disable dput-ng hooks rather than storing lists of suites, & tidying

7 files changed, 8 insertions, 78 deletions

diff --git a/.dput.d/codenames/debian.json b/.dput.d/codenames/debian.json
deleted file mode 100644
index 9b78a005..00000000
--- a/.dput.d/codenames/debian.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "__comment": "debian.json copied from recent release of dput-ng so that",
-    "__comment": "I can upload to stretch-backports with stretch's dput-ng",
-    "backport": [
-        "stable-backports",
-        "oldstable-backports",
-        "buster-backports",
-        "stretch-backports",
-        "stretch-backports-sloppy",
-        "jessie-backports",
-        "jessie-backports-sloppy",
-        "wheezy-backports",
-        "wheezy-backports-sloppy",
-        "squeeze-backports",
-        "squeeze-backports-sloppy"
-    ],
-    "general": [
-        "unstable",
-        "experimental",
-        "squeeze-lts",
-        "rc-buggy",
-        "sid"
-    ],
-    "rm-managed": [
-        "stable",
-        "oldstable",
-        "bullseye",
-        "bullseye-proposed-updates",
-        "buster",
-        "buster-proposed-updates",
-        "stretch",
-        "stretch-proposed-updates",
-        "jessie",
-        "jessie-proposed-updates",
-        "wheezy",
-        "squeeze",
-        "testing-proposed-updates",
-        "stable-proposed-updates",
-        "oldstable-proposed-updates"
-    ],
-    "security": [
-        "testing-security",
-        "stable-security",
-        "oldstable-security",
-        "squeeze-security",
-        "wheezy-security",
-        "jessie-security",
-        "stretch-security",
-        "buster-security",
-        "bullseye-security"
-    ]
-}
diff --git a/.dput.d/metas/debian.json b/.dput.d/metas/debian.json
new file mode 100644
index 00000000..9a1495fa
--- /dev/null
+++ b/.dput.d/metas/debian.json
@@ -0,0 +1,6 @@
+{
+    "hooks": [
+	"checksum",
+	"gpg"
+    ]
+}
diff --git a/.dput.d/profiles/DEFAULT.json b/.dput.d/profiles/DEFAULT.json
index 607374ac..557be7c0 100644
--- a/.dput.d/profiles/DEFAULT.json
+++ b/.dput.d/profiles/DEFAULT.json
@@ -1,14 +1,4 @@
 {
-    "__comment": "always check checksums to avoid totally broken uploads",
-    "+hooks": [
-        "checksums"
-    ],
-
     "default_host_main": "ftp-master",
-
-    "__comment": "verbose build logs can be useful",
-    "full_upload_log": true,
-
-    "__comment": "avoid any problems with dgit (#827879)",
-    "run_lintian": false
+    "full_upload_log": true
 }
diff --git a/.dput.d/profiles/debomatic-amd64.json b/.dput.d/profiles/debomatic-amd64.json
deleted file mode 100644
index 2eee9ad7..00000000
--- a/.dput.d/profiles/debomatic-amd64.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "fqdn": "debomatic-amd64.debian.net",
-    "incoming": "/srv/debomatic-amd64",
-    "login": "debomatic",
-    "meta": "debian",
-    "method": "scp"
-}
diff --git a/.dput.d/profiles/ftp-eu.json b/.dput.d/profiles/ftp-eu.json
deleted file mode 100644
index 487ea02e..00000000
--- a/.dput.d/profiles/ftp-eu.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "allow_dcut": true
-}
diff --git a/.dput.d/profiles/ftp-master.json b/.dput.d/profiles/ftp-master.json
deleted file mode 100644
index 487ea02e..00000000
--- a/.dput.d/profiles/ftp-master.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "allow_dcut": true
-}
diff --git a/.dput.d/profiles/ssh-upload.json b/.dput.d/profiles/ssh-upload.json
index c17ad4db..2d367ff7 100644
--- a/.dput.d/profiles/ssh-upload.json
+++ b/.dput.d/profiles/ssh-upload.json
@@ -1,4 +1,3 @@
 {
-    "login": "spwhitton",
-    "allow_dcut": true
+    "login": "spwhitton"
 }