CVS commit by dato:
Merge from SVN.
M +0 -2 TODO 1.4
M +2 -0 amarok-arts.install 1.3
M +1 -1 amarok.1 1.2
M +2 -2 amarok.install 1.5
M +21 -0 changelog 1.11
M +2 -1 control 1.9
M +0 -9 rules 1.6
R patches/taglib-1.2-suffices.patch 1.1
--- kdeextragear-1/amarok/debian/TODO #1.3:1.4
@@ -1,4 +1,2 @@
- link dynamically against sqlite once 3.0 enters Debian (#272271).
-- remove debian/patches/taglib-1.2-suffices.patch once taglib 1.3 enters
- Debian (#273029).
- do something wrt --disable-maintainer-mode.
--- kdeextragear-1/amarok/debian/amarok-arts.install #1.2:1.3
@@ -5,2 +5,4 @@
debian/tmp/usr/lib/libamarokarts.la
debian/tmp/usr/lib/mcop/*
+
+debian/overrides/amarok-arts /usr/share/lintian/overrides
--- kdeextragear-1/amarok/debian/amarok.1 #1.1:1.2
@@ -60,5 +60,5 @@
.B \-\-dograb
running under a debugger can cause an implicit
--nograb, use -dograb to override.
+\-\-nograb, use \-\-dograb to override.
.TP
.B \-\-sync
--- kdeextragear-1/amarok/debian/amarok.install #1.4:1.5
@@ -14,6 +14,6 @@
debian/tmp/usr/bin/amarok
-debian/tmp/usr/bin/amarokapp
-debian/tmp/usr/bin/amarok_xmmswrapper2
+debian/tmp/usr/bin/amarokapp /usr/lib/amarok
+debian/tmp/usr/bin/amarok_xmmswrapper2 /usr/lib/amarok
debian/tmp/etc/*
--- kdeextragear-1/amarok/debian/changelog #1.10:1.11
@@ -1,2 +1,23 @@
+amarok (1.1.1-2~pre1) unstable; urgency=low
+
+ * debian/amarok.1:
+ - correct "hyphen vs. minus sign" usage.
+
+ * Taglib 1.3 is now in the archive:
+ - removed debian/patches/taglib-1.2-suffices.patch.
+ - update Build-Depends to libtag1-dev (>= 1.3).
+
+ * Make amarok recommend: kdemultimedia-kio-plugins, since otherwise it won't
+ be able to play audio CDs. Added note stating so to README.Debian.
+
+ * Added note to README.Debian explaining why the amarokapp and
+ amarok_xmmswrapper2 binaries are shipped in /usr/lib/amarok instead of
+ /usr/bin, differing from upstream.
+
+ * Added note to README.Debian about the 'Socket-path is not a link or a
+ directory' error.
+
+ -- Adeodato Simó <[EMAIL PROTECTED]> Tue, 09 Nov 2004 03:43:22 +0100
+
amarok (1.1.1-1) unstable; urgency=low
--- kdeextragear-1/amarok/debian/control #1.8:1.9
@@ -3,5 +3,5 @@
Priority: optional
Maintainer: Adeodato Simó <[EMAIL PROTECTED]>
-Build-Depends: cdbs (>= 0.4.21), debhelper (>> 4.1.0), kdelibs4-dev (>=
4:3.2), kdemultimedia-dev (>= 4:3.2), libkjsembed-dev (>= 4:3.2),
libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libtag1-dev (>= 1.2),
libxine-dev (>= 1-rc4), libsqlite0-dev, xmms-dev, libtunepimp2-dev
+Build-Depends: cdbs (>= 0.4.21), debhelper (>> 4.1.0), kdelibs4-dev (>=
4:3.2), kdemultimedia-dev (>= 4:3.2), libkjsembed-dev (>= 4:3.2),
libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libtag1-dev (>= 1.3),
libxine-dev (>= 1-rc4), libsqlite0-dev, xmms-dev, libtunepimp2-dev
Standards-Version: 3.6.1
@@ -9,4 +9,5 @@
Architecture: any
Depends: amarok-engines | amarok-engine, ${shlibs:Depends}
+Recommends: kdemultimedia-kio-plugins
Description: versatile and easy to use audio player for KDE
amaroK tries to be a little different, providing a simple drag and drop
--- kdeextragear-1/amarok/debian/rules #1.5:1.6
@@ -21,15 +21,6 @@
cat debian/substvars >>debian/$$p.substvars; \
done
- # Install lintian overrides
- p=amarok-arts; \
- dh_install -p$$p debian/overrides/$$p usr/share/lintian/overrides/
### POST-INSTALL HACKING
-# Non-user binaries in /usr/lib, not /usr/bin
-binary-post-install/amarok::
- p=`basename [EMAIL PROTECTED]; \
- mv debian/$$p/usr/bin/amarokapp debian/$$p/usr/lib/amarok; \
- mv debian/$$p/usr/bin/amarok_xmmswrapper2 debian/$$p/usr/lib/amarok
-
# Make directories in /usr/share/doc be symlinks for packages other than amarok
common-binary-post-install-arch::
