[SCM] Amarok packaging branch, master, updated. debian/2.5.0-1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit a29e98e15d186a4e2877618b6c98935ed0b237a5
Author: Modestas Vainius <modax at debian.org>
Date:   Mon Dec 26 14:12:00 2011 +0200

    Revert "Disable doc/nl because it fails to build."
    
    This reverts commit 9566406143aab2d051a354cf372d472644d31af6.
    
    Conflicts:
    
    	debian/changelog
    	debian/patches/series
---
 debian/amarok-common.install              |    1 +
 debian/changelog                          |    1 -
 debian/patches/debian_disable_doc_nl.diff |   10 ----------
 debian/patches/series                     |    1 -
 4 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/debian/amarok-common.install b/debian/amarok-common.install
index dd8498e..906efb6 100644
--- a/debian/amarok-common.install
+++ b/debian/amarok-common.install
@@ -4,6 +4,7 @@ usr/share/doc/kde/HTML/es/*
 usr/share/doc/kde/HTML/et/*
 usr/share/doc/kde/HTML/fr/*
 usr/share/doc/kde/HTML/it/*
+usr/share/doc/kde/HTML/nl/*
 usr/share/doc/kde/HTML/pt/*
 usr/share/doc/kde/HTML/pt_BR/*
 usr/share/doc/kde/HTML/ru/*
diff --git a/debian/changelog b/debian/changelog
index d834065..fac8d75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ amarok (2.5.0-0r1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Refresh patches.
-  * Disable doc/nl because it fails to build (against kdelibs 4.6.5 at least).
   * This version of amarok requires kdelibs 4.6, bump build dependency.
   * Bump compat to 9 in order to get automatic build flags handling.
   * Ship Russian documentation translations.
diff --git a/debian/patches/debian_disable_doc_nl.diff b/debian/patches/debian_disable_doc_nl.diff
deleted file mode 100644
index 30e2bdd..0000000
--- a/debian/patches/debian_disable_doc_nl.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: Disable doc/nl because it does not build
-
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -9,4 +9,3 @@ add_subdirectory(es)
- add_subdirectory(sv)
- add_subdirectory(ru)
- add_subdirectory(it)
--add_subdirectory(nl)
diff --git a/debian/patches/series b/debian/patches/series
index 2e0a883..20d6c60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 upstream_fix_lyrics_autorefresh_in_some_cases.patch
 debian_disable_qtscriptbindings_check_fix.diff
 debian_mysqle_amarok_local_errmsg_feature.diff
-debian_disable_doc_nl.diff
 debian_find_mysql_fix.diff

-- 
Amarok packaging