merge changelogs

- easier to maintain - preserves history of Joey's old changes - permitted by policy
spwhitton · Apr 20, 2016 · b13abe6 · b13abe6
1 parent 05fb753
commit b13abe6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/CHANGELOG b/CHANGELOG
diff --git a/CHANGELOG b/CHANGELOG
@@ -0,0 +1 @@
+debian/changelog
diff --git a/debian/changelog b/debian/changelog
@@ -1,10 +1,16 @@
 git-remote-gcrypt (1.0.0-1) UNRELEASED; urgency=medium
 
-  * New upstream release incorporating changes by Joey Hess and others (Closes: #771011).
-    Drop quilt patch containing his changes.
+  * Taking over as upstream maintainer.
+    Closes: https://github.com/bluss/git-remote-gcrypt/issues/12
+    Drop patch containing changes by Joey Hess: incorporated in release.
+  * Remove notice about repository format potentially changing.
+  * Implement GCRYPT_GPG_ARGS environment variable (Closes: #771011).
   * Patch README.rst to remove references to installation.
   * Drop Lintian override of no-upstream-changelog.
   * Update URIs in old changelog entries.
+  * Respect git config gpg.program if configured.
+    Thanks Christian Amsüss.
+    Closes: https://github.com/joeyh/git-remote-gcrypt/pull/3
 
  -- Sean Whitton <[email protected]>  Sun, 17 Jan 2016 19:12:42 -0700