[SCM] easytag/master: Update changelog and merge unreleased entries together

[jcowgill-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fdd58820ae967a7641546a7c94013f611acaa4d7
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Tue May 19 17:53:10 2015 +0100

    Update changelog and merge unreleased entries together

diff --git a/debian/changelog b/debian/changelog
index 7f7db49..ab8cb0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,50 +1,24 @@
-easytag (2.3.7-1) UNRELEASED; urgency=medium
+easytag (2.3.7-1) experimental; urgency=medium
 
-  *
-
- -- James Cowgill <james410 at cowgill.org.uk>  Tue, 19 May 2015 12:34:04 +0100
-
-easytag (2.3.6-1) unstable; urgency=low
-
-  [ David King ]
-  * New upstream unstable release.
   [ James Cowgill ]
-  * Handle directory to symlink conversion in easytag-nautilus.
-
- -- David King <amigadave at amigadave.com>  Mon, 20 Apr 2015 07:53:53 +0100
-
-easytag (2.3.5-1) unstable; urgency=low
-
-  [ David King ]
-  * New upstream unstable release.
-  * debian/patches:
-    - Remove id3lib patch, which was applied upstream.
-
- -- David King <amigadave at amigadave.com>  Thu, 12 Mar 2015 10:05:17 +0000
-
-easytag (2.3.4-1) unstable; urgency=low
-
-  [ David King ]
   * New upstream unstable release.
+  * Handle directory to symlink conversion in easytag-nautilus.
   * debian/control:
-    Add easytag-dbg and easytag-nautilus-dbg debug symbol packages.
-  * debian/copyright:
-    Update for libapetag and id3lib license change to GPL-2+.
-  * debian/patches:
-    Add patch to allow id3lib wrapper compilation to succeed.
+    - Change appdata-tools b-dep to appstream-util.
+    - Use cgit Vcs-Browser URL.
+    - Drop versions from build dependencies already in squeeze.
   * debian/rules:
-    Symlink docs to those found in the main package.
-
- -- David King <amigadave at amigadave.com>  Fri, 06 Feb 2015 20:59:52 +0000
-
-easytag (2.3.2-1) unstable; urgency=low
+    - Disable -Werror to fix build with GCC 4.9.
 
   [ David King ]
-  * New upstream unstable release.
+  * debian/copyright:
+    - Update for libapetag and id3lib license change to GPL-2+.
   * debian/patches:
     - Remove ID3 patch, which was applied upstream.
+  * debian/rules:
+    - Symlink docs to those found in the main package.
 
- -- David King <amigadave at amigadave.com>  Mon, 01 Dec 2014 08:38:08 +0000
+ -- James Cowgill <james410 at cowgill.org.uk>  Tue, 19 May 2015 17:33:52 +0100
 
 easytag (2.3.1-1) experimental; urgency=low
 

-- 
easytag packaging