chiark / gitweb /
Merge branch 'master' into newacpi
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 3 Jun 2012 14:20:29 +0000 (15:20 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 3 Jun 2012 14:20:29 +0000 (15:20 +0100)
Conflicts:
.gitignore
cprogs/.gitignore
debian/.gitignore
debian/changelog

1  2 
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
  
 -  * Have .gitignore instead of .cvsignore.
+   * 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.
 +  * 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