[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=ba60077

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

    Do not install amarokrc, not needed for this build.
---
 debian/amarok.install |    1 -
 debian/amarokrc       |    2 --
 debian/changelog      |    1 +
 3 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/debian/amarok.install b/debian/amarok.install
index fc98c9c..2704773 100644
--- a/debian/amarok.install
+++ b/debian/amarok.install
@@ -1,5 +1,4 @@
 debian/icons/*                          /usr/share/pixmaps
-debian/amarokrc                         /usr/share/kde4/config
 usr/bin/amarok
 usr/bin/amarokmp3tunesharmonydaemon
 usr/bin/amarokpkg
diff --git a/debian/amarokrc b/debian/amarokrc
deleted file mode 100644
index 2bbca38..0000000
--- a/debian/amarokrc
+++ /dev/null
@@ -1,2 +0,0 @@
-[LikeBack]
-userWantToShowBar=false
diff --git a/debian/changelog b/debian/changelog
index dead356..d18a796 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ amarok (2.6~rc1-1) UNRELEASED; urgency=low
   * New upstream release (release candidate).
   * Drop patch debian_fix_doc_nl_build.diff, merged upstream.
   * Update install files (fr, it docs removed upstream).
+  * Do not install amarokrc, not needed for this build.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 07 Aug 2012 09:14:21 +0300
 

-- 
Amarok packaging