From f46909c2a0e4b6c3e038b4ff92909060a3cc1bee Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 Mar 2015 15:28:58 +0000
Subject: Debian policy: Merge remaining relevant comments into policy script

---
 infra/README.Debian-NEW        | 35 -----------------------------------
 infra/dgit-repos-policy-debian | 10 ++++++++++
 2 files changed, 10 insertions(+), 35 deletions(-)
 delete mode 100644 infra/README.Debian-NEW

diff --git a/infra/README.Debian-NEW b/infra/README.Debian-NEW
deleted file mode 100644
index da7fd59..0000000
--- a/infra/README.Debian-NEW
+++ /dev/null
@@ -1,35 +0,0 @@
-
-======
-
-policy hooks:
-
- - cron check thing
-     implement `(always)' above
- - in dispatch, on check or push, during package selection
-     implement `(always)' above
-
- - in dgit-repos-server, run policy hook after parsing tag
-      but before ff check; passing policy hook the deliberatelies
-      policy hook may:
-        - if appropriate blow away existing repo, copy old taints and add taints
-        - check taints
-        - fail if unused deliberatelies
-        - indicate to parent whether to disregard ff check
-        - remove taints which were overridden
-
-on push encode --deliberately in tag as lines
-  [dgit --deliberately-blah]
-
-======
-
-Want some invariants or properties
-
- - .dsc of published dgit package will have corresponding publicly
-   visible dgit-repo (soon)
-
- - when a new package is rejected we help maintainer avoid
-   accidentally including bad objects in published dgit history
-
- - .dsc of NEW dgit package has corresponding dgit-repo but not
-   publicly readable
-
diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index d5c4d0d..8aeff67 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -60,6 +60,16 @@ our %deliberately;
 # still be being uploaded.  (We record this using the timestamp of the
 # package's git repo directory.)
 
+# We aim for the following invariants and properties:
+#
+# - .dsc of published dgit package will have corresponding publicly
+#   visible dgit-repo (soon)
+#
+# - when a new package is rejected we help maintainer avoid
+#   accidentally including bad objects in published dgit history
+#
+# - .dsc of NEW dgit package has corresponding dgit-repo but not
+#   publicly readable
 
 sub poldb_setup () {
     $poldbh ||= DBI->connect($policydb,'','', {
-- 
cgit v1.2.3