[SCM] Phonon VLC backend packaging branch, master, updated. debian/0.8.0-1-5-ge77048c

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/phonon-backend-vlc.git;a=commitdiff;h=e77048c

The following commit has been merged in the master branch:
commit e77048cdb0a35253d40406e3d38d75ed3a97c7b8
Merge: 5b42a72cd7fb4a5b0a2b3a04d48daf57c0d7ab2c 30aa4abfe4abcf4e6943d8390433d0185a131ac5
Author: Diane Trout <diane at ghic.org>
Date:   Tue Sep 23 21:46:59 2014 -0700

    Merge branch 'master' of git://anonscm.debian.org/pkg-kde/kde-std/phonon-backend-vlc
    
    Conflicts:
    	debian/changelog

 debian/changelog | 11 +++++++++--
 debian/watch     |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 91977df,120e93c..343f573
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,11 +1,18 @@@
- phonon-backend-vlc (0.8.0-1) UNRELEASED; urgency=medium
++phonon-backend-vlc (0.8.0-2) UNRELEASED; urgency=medium
 +
-   * New upstream release.
 +  * Build Phonon Qt5 backend as well as the Qt4 backend.
 +  * Add myself to uploaders.
 +
 + -- Diane Trout <diane at ghic.org>  Sat, 13 Sep 2014 16:34:19 -0700
 +
+ phonon-backend-vlc (0.8.0-1) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   * New upstream release (0.8.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Sep 2014 17:51:02 +0200
+ 
  phonon-backend-vlc (0.7.2-1) unstable; urgency=medium
  
    [ Sune Vuorela ]

-- 
Phonon VLC backend packaging