From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 3 Jun 2012 14:20:29 +0000 (+0100)
Subject: Merge branch 'master' into newacpi
X-Git-Tag: debian/4.1.31~35
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=51e3ad42cb6d9114fe2fb6b277adb59179e1f835

Merge branch 'master' into newacpi

Conflicts:
	.gitignore
	cprogs/.gitignore
	debian/.gitignore
	debian/changelog
---

51e3ad42cb6d9114fe2fb6b277adb59179e1f835
diff --cc debian/changelog
index 6808501,9af967b..4ed6596
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,13 +1,13 @@@
- chiark-utils (4.1.31) unstable; urgency=low
+ chiark-utils (4.1.31~~iwj) unstable; urgency=low
  
+   * chiark-backup Suggests chiark-utils-bin, not the nonexistent
+     chiark-cprogs (for `summer').
+   * Fix the build-depends to refer to nettle-dev not libnettle-dev.
+   * Add ${misc:Depends} to Depends: lines.  Causes no change to the .debs.
 -  * Have .gitignore instead of .cvsignore.
 +  * Switch to git.  Move .cvsignores to .gitignore, etc.
+   * Update my email address.
  
-  --
+  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 03 Jun 2012 14:56:36 +0100
  
  chiark-utils (4.1.30) unstable; urgency=low