[SCM] ardour/master: Ready for upload

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5574609cbaa080e9776420105ebd370a40e4fc26
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Sun Sep 13 21:09:01 2015 +0200

    Ready for upload

diff --git a/debian/changelog b/debian/changelog
index 33322c8..6fc636a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-ardour (1:4.2~dfsg-2) UNRELEASED; urgency=medium
+ardour (1:4.2~dfsg-2) unstable; urgency=medium
 
   * Imported ardour-4 from the ardour3 source package.
+    * the 'ardour3' source package will revert to shipping ardour-3
+    * the 'ardour' source package will always ship the newest ardour
 
   [ IOhannes m zmölnig ]
   * Added myself to uploaders
@@ -9,70 +11,57 @@ ardour (1:4.2~dfsg-2) UNRELEASED; urgency=medium
     * Breaks/Replaces ardour3 providing ardour-4
     * Transitional packages for CPU-optimized packages
     * Re-introducing ardour-dbg
-    * Added old ardour-4 entries in debian/changelog as UNRELEASED
   * Query "Source" field from dpkg-parsechangelog
   * Fixed spelling errors
   * Refreshed patches
+  * debian/README.source: Explicitly document how to generate debian/control
   * Added myself to the copyright holders in debian/
 
   [ Jaromír Mikeš ]
   * Add overides files.
-  * Remove wrong entry for lintian-overrides.
   * Introduce ardour-data package.
-  * Add overrides for ardour-data package.
+    * Add overrides for ardour-data package.
 
   [ Jonas Smedegaard ]
   * Add README.source to emphasize that control.in file is *not* a
     show-stopper for contributions, referring to wiki page for details.
 
- -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>  Thu, 10 Sep 2015 23:37:47 +0200
-
-ardour (1:4.2~dfsg-1) UNRELEASED; urgency=low
-
-  * Imported Upstream version 4.2~dfsg
-
- -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Sun, 23 Aug 2015 22:00:18 +0200
-
-ardour (1:4.1~dfsg-1) UNRELEASED; urgency=low
-
-  * Imported Upstream version 4.1~dfsg
-
- -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Sat, 27 Jun 2015 21:40:50 +0200
-
-ardour (1:4.0~dfsg1-1) UNRELEASED; 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
+  * quilt refresh log-stdout.patch
+  * quilt refresh waf.patch
+  * quilt refresh wscript.patch
+
+  [ changelog entries from ardour3 packaging ]
+  * Imported Upstream version 4.2~dfsg  [Adrian Knoth]
+  * Imported Upstream version 4.1~dfsg  [Adrian Knoth]
+  * Imported Upstream version 4.0~dfsg1  [Adrian Knoth]
+     * Enable ALSA backend (as an alternative to jackd)  [Adrian Knoth]
+     * Delete obsolete midi-data-loss.patch  [Adrian Knoth]
+     * Refresh log-stdout.patch  [Adrian Knoth]
+     * Refresh version patch  [Adrian Knoth]
+     * Fix waf-light  [Adrian Knoth]
+     * Build-depend on librubberband-dev  [Adrian Knoth]
+     * Build-depend on libtagc0-dev  [Adrian Knoth]
+     * Update LD_LIBRARY_PATH  [Adrian Knoth]
+     * Enable ALSA backend  [Adrian Knoth]
+     * Rename manpage  [Adrian Knoth]
+     * Rename icon to ardour4.xpm  [Adrian Knoth]
+     * Update desktop file  [Adrian Knoth]
+     * Update menu entry  [Adrian Knoth]
+     * Changelog entries  [Adrian Knoth]
+     * Set gbp.conf to {master,upstream}-a4  [Adrian Knoth]
+     * Build-depend on libltc-dev  [Adrian Knoth]
+     * Use external LIBLTC and VAMP-SDK  [Adrian Knoth]
+     * Shrink icon to 32x32  [Adrian Knoth]
+     * Provide SVG logo  [Adrian Knoth]
+     * Install svg icon.  [Jaromír Mikeš]
+     * Use svg icon by desktop file.  [Jaromír Mikeš]
+     * Update copyright file.  [Jaromír Mikeš]
+     * Add watch file.  [Jaromír Mikeš]
+     * Add get-orig-source.  [Jaromír Mikeš]
+     * Tuned gbp.conf for new gbp behavior.  [Jaromír Mikeš]
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>  Sun, 13 Sep 2015 21:03:42 +0200
 
 ardour (1:2.8.16+git20131003-4) unstable; urgency=medium
 

-- 
ardour Debian packaging