[SCM] Amarok packaging branch, master, updated. debian/2.4.3-1-11-g0805c91

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 9566406143aab2d051a354cf372d472644d31af6
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Dec 17 20:02:25 2011 +0200

    Disable doc/nl because it fails to build.
    
    ... against kdelibs 4.6.5 at least.
---
 debian/amarok-common.install              |    1 -
 debian/changelog                          |    1 +
 debian/patches/debian_disable_doc_nl.diff |   10 ++++++++++
 debian/patches/series                     |    1 +
 4 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/debian/amarok-common.install b/debian/amarok-common.install
index 7a712e1..ec62259 100644
--- a/debian/amarok-common.install
+++ b/debian/amarok-common.install
@@ -4,7 +4,6 @@ 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/sv/*
diff --git a/debian/changelog b/debian/changelog
index 76c2c6d..6af2586 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ 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).
 
  -- Modestas Vainius <modax at debian.org>  Sat, 17 Dec 2011 12:08:05 +0200
 
diff --git a/debian/patches/debian_disable_doc_nl.diff b/debian/patches/debian_disable_doc_nl.diff
new file mode 100644
index 0000000..30e2bdd
--- /dev/null
+++ b/debian/patches/debian_disable_doc_nl.diff
@@ -0,0 +1,10 @@
+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 7588d01..73089eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +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

-- 
Amarok packaging