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

[Modestas Vainius]

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

    Fix doc/nl build with kdelibs 4.6.
    
    Patch debian_fix_doc_nl_build.diff.
---
 debian/changelog                            |    1 +
 debian/patches/debian_fix_doc_nl_build.diff |   16 ++++++++++++++++
 debian/patches/series                       |    1 +
 3 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fac8d75..721e489 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ amarok (2.5.0-0r1) UNRELEASED; urgency=low
   * Add debian_find_mysql_fix.diff patch to fix MySQL detection at cmake stage.
   * Update install files.
   * Compress amarok-dbg package with xz.
+  * Fix doc/nl build with kdelibs 4.6 (patch debian_fix_doc_nl_build.diff).
 
  -- Modestas Vainius <modax at debian.org>  Sat, 17 Dec 2011 12:08:05 +0200
 
diff --git a/debian/patches/debian_fix_doc_nl_build.diff b/debian/patches/debian_fix_doc_nl_build.diff
new file mode 100644
index 0000000..5337255
--- /dev/null
+++ b/debian/patches/debian_fix_doc_nl_build.diff
@@ -0,0 +1,16 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: fix doc/nl build with kde sc 4.6
+
+Embedded Thom Castermans entity inline as it does not exist in kdelibs 4.6.
+
+--- a/doc/nl/index.docbook
++++ b/doc/nl/index.docbook
+@@ -2,6 +2,8 @@
+ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY % addindex "IGNORE">
+   <!ENTITY % Dutch "INCLUDE">
++  <!ENTITY Thom.Castermans '<othercredit role="translator"><firstname>Thom</firstname><surname>Castermans</surname><affiliation><address><email>thomcastermans at kde.nl</email></address></affiliation><contrib>Vertaler/Nalezer</contrib></othercredit>'>
++  <!ENTITY vertaling.thom "<para>Dit document is vertaald in het Nederlands door &Thom.Castermans;.</para>">
+ ]>
+ <book lang="&language;">
+ <bookinfo>
diff --git a/debian/patches/series b/debian/patches/series
index 20d6c60..045926e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ upstream_fix_lyrics_autorefresh_in_some_cases.patch
 debian_disable_qtscriptbindings_check_fix.diff
 debian_mysqle_amarok_local_errmsg_feature.diff
 debian_find_mysql_fix.diff
+debian_fix_doc_nl_build.diff

-- 
Amarok packaging