[SCM] ardour/master: Updated debian/changelog|control

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f3efbae1e042525e30de7520691b2b62ff2af146
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Sep 10 21:45:21 2015 +0200

    Updated debian/changelog|control

diff --git a/debian/changelog b/debian/changelog
index d30bbf1..3987507 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ardour (1:4.2~dfsg-2) UNRELEASED; urgency=medium
+
+  * Added myself to uploaders
+  * Breaks/Replaces ardour3 providing ardour-4
+
+ -- IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>  Thu, 10 Sep 2015 21:42:26 +0200
+
 ardour (1:4.2~dfsg-1) unstable; urgency=low
 
   * Imported Upstream version 4.2~dfsg
diff --git a/debian/control b/debian/control
index 5925ad1..3d2ac7c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders:
  Adrian Knoth <adi at drcomp.erfurt.thur.de>,
- 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:
  cdbs,
  autotools-dev,
@@ -71,7 +72,10 @@ Suggests:
 Conflicts:
  ${cdbs:Conflicts}
 Replaces:
+ ardour3 (<< 1:3.5),
  ${cdbs:Replaces}
+Breaks:
+ ardour3 (<< 1:3.5)
 Description: digital audio workstation (graphical gtk2 interface)
  Ardour is a multichannel hard disk recorder (HDR) and digital audio
  workstation (DAW).  It can be used to control, record, edit and run

-- 
ardour Debian packaging