Bug#862134: merging drumgizmos 0.9.12 and 0.9.14 changelogs? (was: Re: Processed: tagging 862134)

[Rene Engelhard]

tag 862134 + patch
thanks

Hi,

On Mon, May 15, 2017 at 06:45:03PM +0000, Debian Bug Tracking System wrote:
> Processing commands for control at bugs.debian.org:
> 
> > # fixed in 0.9.12 upstream, which is already in drumgizmo.git master
> > tags 862134 + pending
> Bug #862134 [src:drumgizmo] src:drumgizmo: FTBFS with cppunit 1.14 (AM_PATH_CPPUNIT/cppunit-config removed)
> Added tag(s) pending.
> > thanks
> Stopping processing here.

Just asked about this on #debian-multimedia:

20:34 < _rene_> (or better asked: shouldn't 0.9.12-1 and 0.9.14-1 in 
java/zookeeper.git/commit/?id=11d0ead9e54c98893466044d4e313c4216026a80 merged 
                since there nerver was a 0.9.12-1 in unstable)?
20:35 < _rene_> 0.9.12 fixes #862134 - so...
20:35 -zwiebelbot:#debian-multimedia- Debian#862134: src:drumgizmo: FTBFS with 
          cppunit 1.14 (AM_PATH_CPPUNIT/cppunit-config removed) - 
          https://bugs.debian.org/862134
20:36 < Sebastinas> He's usually here as viccuad.
20:39  * _rene_ wonders what the deal is with that unreleased 0.9.12
20:39 < _rene_> I would add a closes:, but...

This would be

diff --git a/debian/changelog b/debian/changelog
index 6f0fc18..34f84d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ drumgizmo (0.9.14-1) UNRELEASED; urgency=medium
 drumgizmo (0.9.12-1) unstable; urgency=medium
 
   * New upstream version 0.9.12
+    - switches from cppunit.m4 to pkg-config (closes: #862134)
   * Drop 0002-mips-atomic.patch as it upstreamed
   * Update 0001-alsa-kFreeBSD.patch to new version
   * Update d/copyright to new version


but of course this only would work if the upload was built with -v0.9.11-1 to
dpkg-buildpackage....

Or one merges the changelogs and adds the closes where it belongs (as 0.9.12-1
never was in unstable):

index 6f0fc18..8ea0cd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,23 +1,18 @@
 drumgizmo (0.9.14-1) UNRELEASED; urgency=medium
 
+  * New upstream version 0.9.12
+    - switches from cppunit.m4 to pkg-config (closes: #862134)
   * New upstream version 0.9.13
   * New upstream version 0.9.14
   * Update d/patches and d/copyright to new upstream version
+    + Drop 0002-mips-atomic.patch as it upstreamed
+    + Update 0001-alsa-kFreeBSD.patch to new version
+    + Add 0002-disable-lv2-test.patch
+  * Don't short-cirtuit dh_auto_test now that lv2 test is disabled
   * Add items to TODO.Debian
 
  -- Víctor Cuadrado Juan <me at viccuad.me>  Sun, 14 May 2017 22:42:31 +0200
 
-drumgizmo (0.9.12-1) unstable; urgency=medium
-
-  * New upstream version 0.9.12
-  * Drop 0002-mips-atomic.patch as it upstreamed
-  * Update 0001-alsa-kFreeBSD.patch to new version
-  * Update d/copyright to new version
-  * Add 0002-disable-lv2-test.patch
-  * Don't short-cirtuit dh_auto_test now that lv2 test is disabled
-
- -- Víctor Cuadrado Juan <me at viccuad.me>  Sat, 04 Feb 2017 16:36:52 +0100
-
 drumgizmo (0.9.11-3) unstable; urgency=medium
 
   * Change mips-atomic.patch to always link libatomic