[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=27c9a20

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

    Drop "upgrading from 1.4" and "upgrading to 2.2" sections from README.Debian.
    
    They are no longer relevant.
---
 debian/README.Debian |   27 ---------------------------
 debian/changelog     |    2 ++
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index bc127dc..63ce982 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -13,30 +13,3 @@ General notes
   "mood" files for your tracks and to enable moodbar in Amarok preferences.
   Refer to http://amarok.kde.org/wiki/Moodbar#Usage for more information.
 
-Importing Amarok 1.4 database to Amarok 2
------------------------------------------
-
-Amarok 2 features collection importer from Amarok 1.4. You may open it by going
-to "Settings" menu, opening "Configure Amarok" dialog, "Collection" tab and
-clicking on the "Import Collection" button. Depeding on the database backend
-you used with Amarok 1.4, make sure you have the respective Qt4 SQL plugins
-installed before using the collection importer:
-
-- libqt4-sql-sqlite for SQLite (SQLite database was default in Amarok 1.4).
-- libqt4-sql-mysql for importing from MySQL.
-- libqt4-sql-psql for importing from PostgreSQL.
-
-Upgrading from earlier 2.x versions to 2.2.1 or later
------------------------------------------------------
-
-If you experience weird issues like 0:00 track lengths or last.fm scrobbling
-problems after upgrading from earlier version of the 2.x series, full rescan of
-the local collection may help. Go to "Settings" menu, select "Configure
-Amarok", open "Collection" tab and click "Fully Rescan Collection" button. Wait
-while scanning process is complete and restart Amarok. You will not lose any
-statistics in the process.
-
-Visit the following URLs for more information about related issues:
-
-https://bugs.kde.org/show_bug.cgi?id=207153
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556621
diff --git a/debian/changelog b/debian/changelog
index eda965f..fee3345 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ 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.
+  * Drop "upgrading from 1.4" and "upgrading to 2.2" sections from
+    README.Debian. They are no longer relevant.
 
  -- Modestas Vainius <modax at debian.org>  Fri, 29 Jun 2012 01:50:42 +0300
 

-- 
Amarok packaging