[SCM] drumkv1/master: Merge remote-tracking branch 'origin/master'

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Wed Sep 28 09:46:15 UTC 2016


Finalize changelog.
Add Breaks: Replaces: fields. (Closes: #839044)
Fix Depends: fields.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 82da68fc2fad9520b6d34c2501251ddbbb42f91a
X-Git-Newrev: f0ea0f736fd8046c9d2949ee440f41219349e2e8

The following commit has been merged in the master branch:
commit 7915c837312293ff33e557cfb51a8bb4c5c9b7ff
Merge: b83bed4739068c2a2d30fd1f756589f186364eda 82da68fc2fad9520b6d34c2501251ddbbb42f91a
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Sep 28 11:37:54 2016 +0200

    Merge remote-tracking branch 'origin/master'

diff --combined debian/control
index 5ca6088,bb327e6..b5191b8
--- a/debian/control
+++ b/debian/control
@@@ -4,8 -4,7 +4,8 @@@ Priority: optiona
  Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders:
   Alessio Treglia <alessio at debian.org>,
 - Jaromír Mikeš <mira.mikes at seznam.cz>
 + Jaromír Mikeš <mira.mikes at seznam.cz>,
 + IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>,
  Build-Depends:
   automake,
   debhelper (>= 9~),
@@@ -30,7 -29,7 +30,7 @@@ Architecture: an
  Depends:
   ${misc:Depends},
   ${shlibs:Depends},
 - drumkv1-common (=${binary:Version}),
 + drumkv1-common (= ${binary:Version}),
  Recommends:
   jackd
  Description: old-school drum-kit sampler - standalone
@@@ -47,9 -46,9 +47,9 @@@ Architecture: an
  Depends:
   ${misc:Depends},
   ${shlibs:Depends},
 - drumkv1-common  (=${binary:Version}),
 + drumkv1-common (= ${binary:Version}),
- Breaks: drumkv1 (<< 0.7.5-1),
- Replaces: drumkv1 (<< 0.7.5-1),
+ Replaces: drumkv1 (<< 0.7.6)
+ Breaks: drumkv1 (<< 0.7.6)
  Provides:
   lv2-plugin
  Description: old-school drum-kit sampler - lv2-plugin
@@@ -66,8 -65,6 +66,8 @@@ Architecture: an
  Depends:
   ${misc:Depends},
   ${shlibs:Depends},
 +Breaks: drumkv1 (<< 0.7.5-1),
 +Replaces: drumkv1 (<< 0.7.5-1),
  Description: old-school drum-kit sampler - common files
   drumkv1 is an old-school all-digital drum-kit sampler
   synthesizer with stereo effects. It is provided in both

-- 
drumkv1 packaging



More information about the pkg-multimedia-commits mailing list