[SCM] jalv/master: Merge branch 'master.unstable'

[alessio at users.alioth.debian.org]

New entry.
Bump Standards.
Fix VCS urls.
Fix gbp.conf.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8cf73a47fd053a7afe1a79a92937c34980cc3d96
X-Git-Newrev: 386fcbf0fb216b2ce9c6180cfb3fc3465343b4b2

The following commit has been merged in the master branch:
commit 92e92d0811be455ae3625c3bd3e170f288f54f79
Merge: 8cf73a47fd053a7afe1a79a92937c34980cc3d96 aa31df49472c3f7568a6f72ba5a31062f4c2a4ed
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Aug 28 09:31:58 2013 +0100

    Merge branch 'master.unstable'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 68beae7,7d491f3..e87a820
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,11 +1,25 @@@
 +jalv (1.4.2~dfsg0-1) unstable; urgency=low
 +
 +  [ Alessio Treglia ]
 +  * New upstream release.
 +  * Bump build-dep on lv2-dev >= 1.4.3.
 +  * Add build-dep on libgtk-3-dev to enable GTK3+ support.
 +  * Enable support for GTKMM-2.0.
-   * Bump standards.
 +  * Needs lilv >= 0.15.1
-   * Fix VCS URLs.
 +
 +  [ Jaromír Mikeš ]
 +  * Added myself as uploader
 +
 + -- Alessio Treglia <alessio at debian.org>  Wed, 28 Aug 2013 09:26:04 +0100
 +
+ jalv (1.2.0~dfsg0-2) unstable; urgency=low
+ 
+   * Upload to unstable.
+   * Fix VCS urls.
+   * Bump Standards.
+ 
+  -- Alessio Treglia <alessio at debian.org>  Fri, 10 May 2013 17:27:44 +0200
+ 
  jalv (1.2.0~dfsg0-1) experimental; urgency=low
  
    * New upstream release:

-- 
jalv packaging