merge changelogs

- easier to maintain
- preserves history of Joey's old changes
- permitted by policy

2 files changed, 9 insertions, 13 deletions

diff --git a/CHANGELOG b/CHANGELOG
index e9623ce..d526672 100644..120000
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1 @@
-<!-- -*- mode: markdown; -*- -->
-
-# Version 1.0.0 (UNRELEASED) #
-
-* Taking over as upstream maintainer.
-  Closes https://github.com/bluss/git-remote-gcrypt/issues/12
-* Remove notice about repository format potentially changing.
-* Implement GCRYPT_GPG_ARGS environment variable (Closes: #771011).
-* Respect git config gpg.program if configured.
-  Thanks Christian Amsüss.
-  Closes https://github.com/joeyh/git-remote-gcrypt/pull/3
+debian/changelog
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 6465394..70ebc86 100644
--- 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 <spwhitton@spwhitton.name>  Sun, 17 Jan 2016 19:12:42 -0700