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

[umlaeute at users.alioth.debian.org]

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

    Updated debian/control|changelog
    
    debian/changelog has the entries from the the ardour-4 releases imported
    from the master-a4 branch (so that it includes all entries it also
    included in the last upload).

diff --git a/debian/changelog b/debian/changelog
index c3f1b26..8fa8598 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,60 @@
+ardour3 (1:3.5.403~dfsg-3) UNRELEASED; urgency=medium
+
+  [ IOhannes m zmölnig ]
+  * Switch back to shipping ardour-3
+    * ardour-4 is now shipped from the "ardour" source package.
+    * Bump epoch.
+  * Added myself to uploaders
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>  Thu, 10 Sep 2015 21:50:29 +0200
+
+ardour3 (4.2~dfsg-1) unstable; urgency=low
+
+  * Imported Upstream version 4.2~dfsg
+
+ -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Sun, 23 Aug 2015 22:00:18 +0200
+
+ardour3 (4.1~dfsg-1) unstable; urgency=low
+
+  * Imported Upstream version 4.1~dfsg
+
+ -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Sat, 27 Jun 2015 21:40:50 +0200
+
+ardour3 (4.0~dfsg1-1) unstable; urgency=medium
+
+  * Imported Upstream version 4.0~dfsg1
+
+  [ Adrian Knoth ]
+  * Enable ALSA backend (as an alternative to jackd)
+  * Delete obsolete midi-data-loss.patch
+  * Refresh log-stdout.patch
+  * Refresh version patch
+  * Fix waf-light
+  * Build-depend on librubberband-dev
+  * Build-depend on libtagc0-dev
+  * Update LD_LIBRARY_PATH
+  * Enable ALSA backend
+  * Rename manpage
+  * Rename icon to ardour4.xpm
+  * Update desktop file
+  * Update menu entry
+  * Changelog entries
+  * Set gbp.conf to {master,upstream}-a4
+  * Build-depend on libltc-dev
+  * Use external LIBLTC and VAMP-SDK
+  * Shrink icon to 32x32
+  * Provide SVG logo
+
+  [ Jaromír Mikeš ]
+  * Install svg icon.
+  * Use svg icon by desktop file.
+  * Update copyright file.
+  * Add watch file.
+  * Add get-orig-source.
+  * Tuned gbp.conf for new gbp behavior.
+
+ -- Jaromír Mikeš <mira.mikes at seznam.cz>  Tue, 05 May 2015 07:35:19 +0200
+
 ardour3 (3.5.403~dfsg-3) unstable; urgency=medium
 
   * Fix MIDI data loss when editing (Closes: #772118)
diff --git a/debian/control b/debian/control
index 69b6728..13dffea 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,

-- 
ardour3 packaging