From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 6 Jun 2012 01:19:28 +0000 (+0100)
Subject: conffile
X-Git-Tag: debian/4.1.31~9
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=0097313854b3028e8e4ee802e0aba20c3ca1aee6;p=chiark-utils.git

conffile
---

diff --git a/debian/changelog b/debian/changelog
index a68b0bd..72196ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ chiark-utils (4.1.31~~iwj) unstable; urgency=medium
     - In the code, rename pix_... variables to be named after the meaning
       rather than the default colour.
 
+  * chiark-backup marks /etc/chiark-backup/snap/nosnap as a conffile.
   * Provide build-arch and build-indep debian/rules targets.
   * Fix the type of a callback function passed to scandir, to expect
     struct dirent**'s rather than void*'s.
diff --git a/debian/chiark-backup/conffiles b/debian/chiark-backup/conffiles
index bf61c98..c38afbf 100644
--- a/debian/chiark-backup/conffiles
+++ b/debian/chiark-backup/conffiles
@@ -2,3 +2,4 @@
 /etc/chiark-backup/snap/lvm
 /etc/chiark-backup/snap/remount
 /etc/chiark-backup/snap/remountrocp
+/etc/chiark-backup/snap/nosnap