[SCM] Amarok packaging branch, master, updated. debian/2.7.1-1-8-ge786950

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=e786950

The following commit has been merged in the master branch:
commit e7869505398b907cfc0c5358fae379c01e06040f
Merge: 8f84cd49e08266ec21b20760307a1bacf3a65770 b41161f7450a2998c5195c8451fcac9d4550e892
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Jun 10 10:29:13 2013 +0200

    Merge branch 'master' of git://git.debian.org/pkg-kde/kde-extras/amarok

 debian/changelog |    3 +++
 debian/rules     |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --cc debian/changelog
index 235b6dc,56f7aad..c100128
--- a/debian/changelog
+++ b/debian/changelog
@@@ -4,12 -3,10 +4,15 @@@ amarok (2.7.1-2) UNRELEASED; urgency=lo
    * Drop libifp-dev and libnjb-dev build dependencies. Apparently, they have
      been unused since initial Amarok 2 release. Thanks to Pino Toscano for
      heads up.
+   * Disable test building explicitly. Tests are enabled by default since
+     KDE 4.9 so they will trigger FTBFS. We are not quite there yet with amarok
+     tests.
  
 +  [ Maximiliano Curia ]
 +  * Update watch file.
 +  * Add myself to Uploaders
 +  * Missing build-dep google-mock.
 +
   -- Modestas Vainius <modax at debian.org>  Sun, 02 Jun 2013 20:08:09 +0300
  
  amarok (2.7.1-1) unstable; urgency=low

-- 
Amarok packaging