[SCM] Amarok packaging branch, master, updated. debian/2.6-beta1+75.g47e75df-1

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit 756491b75dd203093d1e9b0c705569104886ff1a
Author: Modestas Vainius <modax at debian.org>
Date:   Fri Jun 29 02:16:46 2012 +0300

    Override lintian embedded-library: zlib error. It comes from MySQLe.
---
 debian/amarok.lintian-overrides |    1 +
 debian/changelog                |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/debian/amarok.lintian-overrides b/debian/amarok.lintian-overrides
index 5c22bce..0b6dcd1 100644
--- a/debian/amarok.lintian-overrides
+++ b/debian/amarok.lintian-overrides
@@ -1,4 +1,5 @@
 amarok: package-name-doesnt-match-sonames
 amarok: shlib-without-versioned-soname usr/lib/libampache_account_login.so libampache_account_login.so
 amarok: embedded-library usr/lib/kde4/amarok_collection-mysqlecollection.so: libmysqlclient
+amarok: embedded-library usr/lib/kde4/amarok_collection-mysqlecollection.so: zlib
 amarok: no-symbols-control-file
diff --git a/debian/changelog b/debian/changelog
index 4edab06..eda965f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 amarok (2.6~beta1+75.g47e75df-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot (very close 2.6 release).
+  * Override lintian embedded-library: zlib error. It comes from MySQLe.
 
  -- Modestas Vainius <modax at debian.org>  Fri, 29 Jun 2012 01:50:42 +0300
 

-- 
Amarok packaging