[SCM] Amarok packaging branch, experimental, updated. debian/2.6-beta1-1

[Modestas Vainius]

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

The following commit has been merged in the experimental branch:
commit ee2d1b86023a5b343ba4e50bdc8424e2abaa5555
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jun 3 00:11:20 2012 +0300

    Fix a new build problem with KDE 4.7, require kdelibs5-dev 4:4.7.
    
    debian_fix_doc_nl_build.diff patch updated.
---
 debian/changelog                            |    2 ++
 debian/control                              |    2 +-
 debian/patches/debian_fix_doc_nl_build.diff |   10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8200031..a684aba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ amarok (2.6~beta1-0r1) UNRELEASED; urgency=low
   * New upstream development release (2.5.90).
   * Drop upstream_fix_lyrics_autorefresh_in_some_cases.patch, merged upstream.
   * Adapt debian_find_mysql_fix.diff to upstream changes.
+  * Update debian_fix_doc_nl_build.diff patch to fix a new build problem with
+    KDE 4.7, require kdelibs5-dev 4:4.7.
 
  -- Modestas Vainius <modax at debian.org>  Sun, 03 Jun 2012 00:00:29 +0300
 
diff --git a/debian/control b/debian/control
index 4dc1d95..4337be1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Modestas Vainius <modax at debian.org>
 Build-Depends: debhelper (>= 9), cmake (>= 2.6.2), pkg-kde-tools (>= 0.5),
  libtag1-dev (>= 1.6-2~), libtag-extras-dev (>= 1.0.1),
  libqtwebkit-dev | libqt4-dev (<< 4:4.7.0),
- kdelibs5-dev (>= 4:4.6), libsoprano-dev (>= 2.1.67),
+ kdelibs5-dev (>= 4:4.7), libsoprano-dev (>= 2.1.67),
  libstreamanalyzer-dev (>= 0.6.3), libstrigiqtdbusclient-dev (>= 0.6.3),
  libnjb-dev, libifp-dev, libmtp-dev (>= 1.0.0), libqjson-dev,
  libglib2.0-dev, libgpod-nogtk-dev (>= 0.7.0) | libgpod-dev (>= 0.7.0),
diff --git a/debian/patches/debian_fix_doc_nl_build.diff b/debian/patches/debian_fix_doc_nl_build.diff
index 5337255..a8b8498 100644
--- a/debian/patches/debian_fix_doc_nl_build.diff
+++ b/debian/patches/debian_fix_doc_nl_build.diff
@@ -1,16 +1,16 @@
 From: Modestas Vainius <modax at debian.org>
-Subject: fix doc/nl build with kde sc 4.6
+Subject: fix doc/nl build with kde sc 4.7
+Last-Update: 2012-06-03
 
-Embedded Thom Castermans entity inline as it does not exist in kdelibs 4.6.
+Add missing ENTITYs again.
 
 --- a/doc/nl/index.docbook
 +++ b/doc/nl/index.docbook
-@@ -2,6 +2,8 @@
+@@ -2,6 +2,7 @@
  <!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>">
++  <!ENTITY ged.vertaald           '<othercredit role="translator"><firstname>Dit document is nog maar gedeeltelijk vertaald.</firstname> <surname>Wilt u meehelpen, stuur een bericht naar:</surname><affiliation><address> <email>kde-i18n-nl at kde.org</email></address></affiliation> <contrib>Nieuwe vertaler</contrib></othercredit>'>
  ]>
  <book lang="&language;">
  <bookinfo>

-- 
Amarok packaging