[Pkg-kde-commits] rev 395 - in people/dato/packages/trunk/amarok/debian: . patches
Adeodato Simó
dato-guest@costa.debian.org
Fri, 14 Jan 2005 00:12:19 +0100
Author: dato-guest
Date: 2005-01-14 00:12:18 +0100 (Fri, 14 Jan 2005)
New Revision: 395
Added:
people/dato/packages/trunk/amarok/debian/patches/disable_no_undefined.patch
Modified:
people/dato/packages/trunk/amarok/debian/amarok.install
people/dato/packages/trunk/amarok/debian/changelog
people/dato/packages/trunk/amarok/debian/control
people/dato/packages/trunk/amarok/debian/rules
Log:
Prepare 1.1.1-2. Reverted some things from 1.2 betas, rewritten
changelog entry.
Modified: people/dato/packages/trunk/amarok/debian/amarok.install
===================================================================
--- people/dato/packages/trunk/amarok/debian/amarok.install 2005-01-13 16:32:10 UTC (rev 394)
+++ people/dato/packages/trunk/amarok/debian/amarok.install 2005-01-13 23:12:18 UTC (rev 395)
@@ -12,10 +12,6 @@
debian/tmp/usr/lib/kde3/libamarok_void-engine_plugin.la
debian/tmp/usr/lib/kde3/libamarok_void-engine_plugin.so
-debian/tmp/usr/share/apps/konqsidebartng/add/amarok.desktop
-debian/tmp/usr/lib/kde3/konqsidebar_universalamarok.la
-debian/tmp/usr/lib/kde3/konqsidebar_universalamarok.so
-
debian/tmp/usr/bin/amarok
debian/tmp/usr/bin/amarokapp /usr/lib/amarok
debian/tmp/usr/bin/amarok_xmmswrapper2 /usr/lib/amarok
Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog 2005-01-13 16:32:10 UTC (rev 394)
+++ people/dato/packages/trunk/amarok/debian/changelog 2005-01-13 23:12:18 UTC (rev 395)
@@ -1,41 +1,57 @@
-amarok (1.2-beta2-1) experimental; urgency=low
+amarok (1.1.1-2) unstable; urgency=high
- * Packaged second 1.2 beta from upstream:
- - the search text input element is now cleared when the user writes
- something there. (Closes: #278359).
+ * Upload to get rid of the libflac4 dependency and be ready for the libflac6
+ transition. Urgency set to high as other packages with RC bug fixes can't
+ enter testing because of the transition not being ready. (Closes: #289344)
- * debian/amarok.1:
- - correct "hyphen vs. minus sign" usage.
+ + Relibtoolized the package, so that binaries won't link against not
+ needed libraries. Introduced disable_no_undefined.patch, many thanks to
+ Daniel Schepler for his insight with this (and for providing the patch).
+ [This has reduced the number of NEEDED libraries from 45 to 18, libflac
+ being among them.]
- * debian/amarok.install:
- - add files for the konqueror sidebar.
- - this makes amarok depend on konqueror, and thus closes: #282523.
+ + debian/control:
+ - version Build-Dependency on libtunepimp2-dev to (>= 0.3.0-2.1).
- * Taglib 1.3 is now in the archive:
- - removed debian/patches/taglib-1.2-suffices.patch.
- - update Build-Depends to libtag1-dev (>= 1.3).
+ * Some new versions of libraries have become available since the last
+ upload:
- * SQLite 3 is now in the archive:
- - update Build-Depends on libsqlite0-dev to libsqlite3-dev.
- - pass --without-included-sqlite to ./configure.
+ + 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.
+ + SQLite 3 is now in the archive:
+ - changed Build-Depends on libsqlite0-dev to libsqlite3-dev.
+ - pass --without-included-sqlite to ./configure.
+
+ * New package relationships:
- * 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.
+ - amarok now recommends kdemultimedia-kio-plugins, which is needed to play
+ audio CDs.
- * Added note to README.Debian about the 'Socket-path is not a link or a
- directory' error.
+ - amarok now suggests konqueror, since it's called in the MusicBrainz
+ dialog and some other places. (Closes: #282523)
- * Use AM_MAINTAINER_MODE, so that --disable-maintainer-mode really works
- (patch: am_maintainer_mode.patch). To make the .diff.gz stuff smaller,
- force automake-1.6 (used by upstream) in admin/detect-autoconf.sh (patch:
- automake-1.6.patch).
+ * Created a README.Debian files with the following:
- -- Adeodato Simó <asp16@alu.ua.es> Thu, 09 Dec 2004 19:34:36 +0100
+ + Explain why the amarokapp and amarok_xmmswrapper2 binaries are shipped
+ in /usr/lib/amarok instead of /usr/bin, differing from upstream.
+ + Explain a fix for the 'Socket-path is not a link or a directory' error.
+
+ + Explain what is needed to play audio CDs in amarok.
+
+ * Other changes:
+
+ + debian/amarok.1:
+ - correct "hyphen vs. minus sign" usage.
+
+ - Patched admin/configure.in.min to include AM_MAINTAINER_MODE. To make
+ the .diff.gz stuff smaller, force automake-1.6 (which upstream uses)
+ admin/detect-autoconf.sh.
+
+ -- Adeodato Simó <asp16@alu.ua.es> Fri, 14 Jan 2005 00:13:53 +0100
+
amarok (1.1.1-1) unstable; urgency=low
* New upstream release packaged. Most notably, fixes several GStreamer
Modified: people/dato/packages/trunk/amarok/debian/control
===================================================================
--- people/dato/packages/trunk/amarok/debian/control 2005-01-13 16:32:10 UTC (rev 394)
+++ people/dato/packages/trunk/amarok/debian/control 2005-01-13 23:12:18 UTC (rev 395)
@@ -2,13 +2,14 @@
Section: kde
Priority: optional
Maintainer: Adeodato Simó <asp16@alu.ua.es>
-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), libsqlite3-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), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2.1)
Standards-Version: 3.6.1
Package: amarok
Architecture: any
Depends: amarok-engines | amarok-engine, ${shlibs:Depends}
Recommends: kdemultimedia-kio-plugins
+Suggests: konqueror
Description: versatile and easy to use audio player for KDE
amaroK tries to be a little different, providing a simple drag and drop
interface that really makes playlist handling easy.
Added: people/dato/packages/trunk/amarok/debian/patches/disable_no_undefined.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/disable_no_undefined.patch 2005-01-13 16:32:10 UTC (rev 394)
+++ people/dato/packages/trunk/amarok/debian/patches/disable_no_undefined.patch 2005-01-13 23:12:18 UTC (rev 395)
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1665,15 +1665,6 @@
+ KDE_USE_CLOSURE_TRUE="#"
+ KDE_USE_CLOSURE_FALSE=""
+ KDE_NO_UNDEFINED=""
+- case $host in
+- *-*-linux-gnu)
+- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+- [KDE_NO_UNDEFINED=""])],
+- [KDE_NO_UNDEFINED=""])
+- ;;
+- esac
+ fi
+ AC_SUBST(KDE_USE_CLOSURE_TRUE)
+ AC_SUBST(KDE_USE_CLOSURE_FALSE)
Modified: people/dato/packages/trunk/amarok/debian/rules
===================================================================
--- people/dato/packages/trunk/amarok/debian/rules 2005-01-13 16:32:10 UTC (rev 394)
+++ people/dato/packages/trunk/amarok/debian/rules 2005-01-13 23:12:18 UTC (rev 395)
@@ -21,20 +21,8 @@
### POST-INSTALL HACKING
# Make directories in /usr/share/doc be symlinks for packages other than amarok
-# Install debian/bug (if uploading to experimental) to usr/share/bug/$package
common-binary-post-install-arch::
for p in $(filter-out amarok,$(DEB_ALL_PACKAGES)); do \
rm -rf debian/$$p/usr/share/doc/$$p; \
ln -sf amarok debian/$$p/usr/share/doc/$$p; \
done
-
- if test -d debian/bug && test "experimental" = \
- $(shell dpkg-parsechangelog | awk '/Distribution/ {print $$2}'); then \
- for p in $(DEB_ALL_PACKAGES); do \
- mkdir -p debian/$$p/usr/share/bug/$$p; \
- cp debian/bug/* debian/$$p/usr/share/bug/$$p; \
- done; \
- fi
-
- # Check for not installed files
- dh_install --no-act --list-missing