[SCM] Amarok packaging branch, master, updated. debian/2.5.0-3

Modestas Vainius modax at alioth.debian.org
Sat May 26 16:44:43 UTC 2012


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

The following commit has been merged in the master branch:
commit 874831acb8b19f0113d8e0be14ec393ad59451fb
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 26 01:04:14 2012 +0300

    Split off Amarok Handbook into amarok-doc package.
    
    amarok-common has grown very big and this will reduce it back to 15 MB
    Installed-Size.
---
 debian/amarok-common.install |   12 ------------
 debian/changelog             |    1 +
 debian/control               |   14 +++++++++++++-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/amarok-common.install b/debian/amarok-common.install
index 906efb6..45e4e31 100644
--- a/debian/amarok-common.install
+++ b/debian/amarok-common.install
@@ -1,15 +1,3 @@
-usr/share/doc/kde/HTML/de/*
-usr/share/doc/kde/HTML/en/*
-usr/share/doc/kde/HTML/es/*
-usr/share/doc/kde/HTML/et/*
-usr/share/doc/kde/HTML/fr/*
-usr/share/doc/kde/HTML/it/*
-usr/share/doc/kde/HTML/nl/*
-usr/share/doc/kde/HTML/pt/*
-usr/share/doc/kde/HTML/pt_BR/*
-usr/share/doc/kde/HTML/ru/*
-usr/share/doc/kde/HTML/sv/*
-usr/share/doc/kde/HTML/uk/*
 usr/share/icons/hicolor/*
 usr/share/kde4/apps/amarok/amarok.notifyrc
 usr/share/kde4/apps/amarok/data/*
diff --git a/debian/changelog b/debian/changelog
index e847d5e..c7ae360 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ amarok (2.5.0-3~pre1) UNRELEASED; urgency=low
   * Depend on libmysql-pic 5.5.23+dfsg so we can drop libssl-dev from
     Build-Depends.
   * Compress all deb packages with xz, not just amarok-dbg.
+  * Split off Amarok Handbook into amarok-doc package.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 26 May 2012 00:42:14 +0300
 
diff --git a/debian/control b/debian/control
index 96ebf97..4dc1d95 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,8 @@ Depends: amarok-common (= ${source:Version}), amarok-utils (= ${binary:Version})
  ${shlibs:Depends}, ${misc:Depends},
  libqtscript4-core, libqtscript4-gui, libqtscript4-network, libqtscript4-xml, libqtscript4-sql, libqtscript4-uitools
 Recommends: kdemultimedia-kio-plugins (>= 4:4.2.0)
-Suggests: libxine1-ffmpeg, libqt4-sql-sqlite, libqt4-sql-mysql, libqt4-sql-psql, moodbar
+Suggests: amarok-doc (>= ${source:Version}), libxine1-ffmpeg, libqt4-sql-sqlite, libqt4-sql-mysql, libqt4-sql-psql,
+ moodbar
 Description: easy to use media player based on the KDE Platform
  Amarok is a powerful music player with an intuitive interface. It makes
  playing the music you love and discovering new music easier than ever before
@@ -63,6 +64,17 @@ Description: architecture independent files for Amarok
  properly. Therefore, unless you have 'amarok' package of the same version
  installed, you will hardly find this package useful.
 
+Package: amarok-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, ${perl:Depends}
+Replaces: amarok-common (<= 2.5.0-2)
+Breaks: amarok-common (<= 2.5.0-2)
+Recommends: amarok (>= ${source:Version})
+Description: Amarok documentation (Handbook)
+ This package contains Amarok user documentation. It can be opened from the
+ application menu Help -> Amarok Handbook.
+
 Package: amarok-utils
 Section: utils
 Architecture: any

-- 
Amarok packaging



More information about the pkg-kde-commits mailing list