[SCM] Amarok packaging branch, master, updated. debian/2.8.0-1
Modestas Vainius
modax at alioth.debian.org
Sun Aug 18 14:20:08 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=40351e8
The following commit has been merged in the master branch:
commit 40351e8031cdabd8e0a93362fb880cd68f69fa2e
Author: Modestas Vainius <modax at debian.org>
Date: Sun Aug 18 14:08:42 2013 +0300
Move amzdownloader into amarok-utils package.
---
debian/amarok-utils.install | 3 +++
debian/amarok.install | 1 -
debian/changelog | 1 +
debian/control | 4 ++--
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/debian/amarok-utils.install b/debian/amarok-utils.install
index c458b0c..419c05a 100644
--- a/debian/amarok-utils.install
+++ b/debian/amarok-utils.install
@@ -1,2 +1,5 @@
usr/bin/amarok_afttagger
usr/bin/amarokcollectionscanner
+usr/bin/amzdownloader
+usr/share/applications/kde4/amzdownloader.desktop
+usr/share/mime/packages/amzdownloader.xml
diff --git a/debian/amarok.install b/debian/amarok.install
index 104f8ca..b8c1c1f 100644
--- a/debian/amarok.install
+++ b/debian/amarok.install
@@ -2,7 +2,6 @@ debian/icons/* /usr/share/pixmaps
usr/bin/amarok
usr/bin/amarokmp3tunesharmonydaemon
usr/bin/amarokpkg
-usr/bin/amzdownloader
usr/lib/kde4/amarok_collection-audiocdcollection.so
usr/lib/kde4/amarok_collection-daapcollection.so
usr/lib/kde4/amarok_collection-ipodcollection.so
diff --git a/debian/changelog b/debian/changelog
index c150904..92b073e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ amarok (2.8.0-0r1) UNRELEASED; urgency=low
* Adapt debian_find_mysql_fix.diff to upstream changes.
* Adapt debian_clamz_is_runtime_dependency.diff to upstream changes.
* Update install files.
+ * Move amzdownloader into amarok-utils package.
[ Maximiliano Curia ]
* Update watch file.
diff --git a/debian/control b/debian/control
index 68b67d9..0b4297c 100644
--- a/debian/control
+++ b/debian/control
@@ -84,8 +84,8 @@ Package: amarok-utils
Section: utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: amarok (<< 2.1.80-1~)
-Breaks: amarok (<< 2.1.80-1~)
+Replaces: amarok (<< 2.8.0)
+Breaks: amarok (<< 2.8.0)
Description: utilities for Amarok media player
This package contains command line utilities that are typically used by Amarok
media player but might also be useful on systems without Amarok installed.
--
Amarok packaging
More information about the pkg-kde-commits
mailing list