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

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit 2accbb4cd924256dea4680581969a22edd3b424a
Author: Modestas Vainius <modax at debian.org>
Date:   Tue Aug 7 09:21:12 2012 +0300

    Drop patch debian_fix_doc_nl_build.diff, merged upstream.
---
 debian/changelog                            |    1 +
 debian/patches/debian_fix_doc_nl_build.diff |   16 ----------------
 debian/patches/series                       |    1 -
 3 files changed, 1 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9daf075..1d0ffaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 amarok (2.6~rc1-1) UNRELEASED; urgency=low
 
   * New upstream release (release candidate).
+  * Drop patch debian_fix_doc_nl_build.diff, merged upstream.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 07 Aug 2012 09:14:21 +0300
 
diff --git a/debian/patches/debian_fix_doc_nl_build.diff b/debian/patches/debian_fix_doc_nl_build.diff
deleted file mode 100644
index a8b8498..0000000
--- a/debian/patches/debian_fix_doc_nl_build.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: fix doc/nl build with kde sc 4.7
-Last-Update: 2012-06-03
-
-Add missing ENTITYs again.
-
---- a/doc/nl/index.docbook
-+++ b/doc/nl/index.docbook
-@@ -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 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>
diff --git a/debian/patches/series b/debian/patches/series
index 2c7a020..2f8fb5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ debian_disable_qtscriptbindings_check_fix.diff
 debian_mysqle_amarok_local_errmsg_feature.diff
 debian_mysqle_force_defaults_file.diff
 debian_find_mysql_fix.diff
-debian_fix_doc_nl_build.diff

-- 
Amarok packaging