--- amarok-2.0.1.1mysql5.1.30.orig/debian/amarok.install +++ amarok-2.0.1.1mysql5.1.30/debian/amarok.install @@ -0,0 +1,46 @@ +../../debian/icons/amarok-16.xpm usr/share/pixmaps +../../debian/icons/amarok.xpm usr/share/pixmaps +usr/bin/amarok +usr/bin/amarok_afttagger +usr/bin/amarokcollectionscanner +usr/bin/amarokmp3tunesharmonydaemon +usr/lib/kde4/amarok_containment_context.so +usr/lib/kde4/amarok_context_applet_albums.so +usr/lib/kde4/amarok_context_applet_currenttrack.so +usr/lib/kde4/amarok_context_applet_lyrics.so +usr/lib/kde4/amarok_context_applet_mediadevices.so +usr/lib/kde4/amarok_context_applet_serviceinfo.so +usr/lib/kde4/amarok_context_applet_wikipedia.so +usr/lib/kde4/amarok_data_engine_current.so +usr/lib/kde4/amarok_data_engine_lyrics.so +usr/lib/kde4/amarok_data_engine_service.so +usr/lib/kde4/amarok_data_engine_wikipedia.so +usr/lib/kde4/amarok_service_ampache.so +usr/lib/kde4/amarok_service_jamendo.so +usr/lib/kde4/amarok_service_lastfm.so +usr/lib/kde4/amarok_service_magnatunestore.so +usr/lib/kde4/amarok_service_mp3tunes.so +usr/lib/kde4/amarok_service_opmldirectory.so +usr/lib/kde4/amarok_service_shoutcast.so +usr/lib/kde4/kcm_amarok_service_ampache.so +usr/lib/kde4/kcm_amarok_service_lastfm.so +usr/lib/kde4/kcm_amarok_service_magnatunestore.so +usr/lib/kde4/kcm_amarok_service_mp3tunes.so +usr/lib/kde4/libamarok_collection-daapcollection.so +usr/lib/kde4/libamarok_collection-ipodcollection.so +usr/lib/kde4/libamarok_collection-mtpcollection.so +usr/lib/kde4/libamarok_collection-sqlcollection.so +usr/lib/kde4/plugins/script/libqtscript_core.so +usr/lib/kde4/plugins/script/libqtscript_gui.so +usr/lib/kde4/plugins/script/libqtscript_network.so +usr/lib/kde4/plugins/script/libqtscript_sql.so +usr/lib/kde4/plugins/script/libqtscript_uitools.so +usr/lib/kde4/plugins/script/libqtscript_xml.so +usr/lib/libamarok_service_liblastfm.so +usr/lib/libamarok_taglib.so.1* +usr/lib/libamaroklib.so.1* +usr/lib/libamarokplasma.so.2* +usr/lib/libamarokpud.so.1* +usr/lib/strigi/strigita_audible.so +usr/lib/strigi/strigita_mp4.so +usr/share/applications/kde4/amarok.desktop --- amarok-2.0.1.1mysql5.1.30.orig/debian/copyright +++ amarok-2.0.1.1mysql5.1.30/debian/copyright @@ -0,0 +1,544 @@ +Debianized by Peter Rockai 2004-04-11 +New maintainer Adeodato Simó 2004-09-22 +New maintainer Modestas Vainius 2007-12-24 + +It was downloaded from: + + + +And the project homepage is: + + + +Upstream Authors: + + Alexandre Oliveira + Bart Cerneels + Dan Meltzer + Ian Monroe + Jeff Mitchell + Leo Franchi + Mark Kretschmann + Maximilian Kossick + Nikolaj Hald Nielsen + Seb Ruiz + +Debian packaging (debian/*) is: +Copyright: © 2004-2007 Adeodato Simó + © 2007-2008 Modestas Vainius +License: GNU General Public License, version 2 or later (GPL-2+) + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in /usr/share/common-licenses/GPL-2. + +Upstream Copyright Holders: + +Copyright: © 2006-2008 Nikolaj Hald Nielsen +Copyright: © 2006-2007, 2007-8, 2008 Maximilian Kossick +Copyright: © 1992-2008 Trolltech ASA. All Rights Reserved. +Copyright: © 2005-2008 Aaron Seigo +Copyright: © 2005-2007 Last.fm Ltd +Copyright: © 2002-2008 Mark Kretschmann +Copyright: © 2002-2003, 2006 Jochen Issing +Copyright: © 2003, 2003-4, 2004-2007, 5 Max Howell +Copyright: © 2005-2008 Ian Monroe +Copyright: © 2004-2008 Seb Ruiz +Copyright: © 2002-2006 Roberto Raggi +Copyright: © 2007-2008 Leo Franchi +Copyright: © 2005-2007 Martin Aumueller +Copyright: © 1998, 2001, 2005 Initial All Rights Reserved. +Copyright: © 2003-2007 Christian Muehlhaeuser +Copyright: © 2007-2008 Casey Link +Copyright: © 2008 Peter ZHOU +Copyright: © 2005-2008 Jeff Mitchell +Copyright: © 2004, 2007-2008 Dan Meltzer +Copyright: © 2006-2007, 20078, 2008 Bart Cerneels +Copyright: © 2007-2008 Shane King +Copyright: © 2005-2007 Erik Jaelevik +Copyright: © 2005-2007 Lukáš Lalinský +Copyright: © 2008 Daniel Caleb Jones +Copyright: © 2008 Daniel Winter +Copyright: © 2005 Andy Leadbetter +Copyright: © 2005-2007 Alexandre Pereira de Oliveira +Copyright: © 2008 William Viana Soares +Copyright: © 2005-2006 Gábor Lehel +Copyright: © 2007 Ivan Cukic +Copyright: © 2007-2008 Alejandro Wainzinger +Copyright: © 2008 Teo Mrnjavac +Copyright: © Shy Shalom +Copyright: © 2007-2008 Marco Martin +Copyright: © 2002-2004 Scott Wheeler +Copyright: © 2007 Riccardo Iaconelli +Copyright: © 2004 Allan Sandfeld Jensen +Copyright: © 2008 Daniel Jones +Copyright: © 2005-2007 Jono Cole +Copyright: © 2005-2007 Erik Jalevik +Copyright: © 2004 Pierpaolo Di Panfilo +Copyright: © 2007-2008 Alexis Ménard +Copyright: © 2003-2004 Frederik Holljen +Copyright: © 2006 T.R.Shashwath +Copyright: © 2004, 2007 Adam Pigg +Copyright: © 2005-2006 Paul Cifarelli +Copyright: © 2001, 2006 Andres Oton +Copyright: © 2006 Andy Kelk +Copyright: © 2008 Ménard Alexis +Copyright: © 2005-2007 Alexandre Oliveira +Copyright: © 2007 Matt Broadstone +Copyright: © 2006-2008 Sebastian Trueg +Copyright: © 2004 Enrico Ros +Copyright: © 2005 Markus Brueffer +Copyright: © 2007 Bertjan Broeksema +Copyright: © 2001 Shaun Jackman +Copyright: © 2004 Thomas Loeber +Copyright: © 2007 Mirko Stocker +Copyright: © 2004, 2007 Kevin Ottens +Copyright: © 2007 Zack Rusin +Copyright: © 2006 Peter Putzer +Copyright: © 2004 Michael Pyne +Copyright: © 2001-2002 Anders Lund +Copyright: © 2004 David Hammerton +Copyright: © 2003 Stanislav Karchebny +Copyright: © 2007 Robert Knight +Copyright: © 2007 Philipp Maihart +Copyright: © 2006 Roel Meeuws +Copyright: © 2007 Jamie Faris +Copyright: © 2008 Bonne Eggleston +Copyright: © 2007 David Faure +Copyright: © 2004 Stefan Bogner +Copyright: © 2007 Richard J. Moore +Copyright: © 2004 Melchior Franz +Copyright: © 2006 Giovanni Venturi +Copyright: © 2004 Melchior FRANZ +Copyright: © 1998-2000 Peter Alm +Copyright: © 2007 Sebastian Kuegler +Copyright: © 2006 Peter C. Ndikuwera +Copyright: © 2008 Jordi Polo +Copyright: © 2008 Jeremy Whiting +Copyright: © 1995-2005 Jean-loup Gailly. +Copyright: © 2007 Alexander Wiedenbruch +Copyright: © 2005 Harald Fernengel +Copyright: © 2006-2007 Ryan P. Bitanga +Copyright: © 1996-2000 the kicker authors. +Copyright: © 2001 Christoph Cullmann +Copyright: © 2006 Martin Aumüller +Copyright: © 2007 André Duffeck +Copyright: © 2003 Frerich Raabe +Copyright: © 2001 Joseph Wenninger +Copyright: © 2005 Lukas Lalinsky +Copyright: © 1998-2000 Olle Hallnas +Copyright: © 2008 Andrew Lake +Copyright: © 2005 Martin Ehmke +Copyright: © 2006-2007 Fredrik Höglund +Copyright: © Edward Toroshchin +Copyright: © 1998-2000 4Front Technologies +Copyright: © Jim Huang +Copyright: © 2007 Matias Valdenegro +Copyright: © 2008 Gilles CHAUVIN +Copyright: © 2006 Martin Ellis +Copyright: © 1999-2002 Chris Schlaeger +Copyright: © 2005 Eyal Lotem +Copyright: © 2005 Angius Fabrizio. All Rights Reserved. +Copyright: © 1998-2000 Thomas Nilsson +Copyright: © 2005 Isaiah Damron +Copyright: © 1998-2000 Mikael Alm +Copyright: © Kurt Granroth +Copyright: © 2007 Petri Damsten +Copyright: © 2006 Mattias Fliesberg +Copyright: © 2006 Tom Kaitchuck +Copyright: © 2002, 2004 Jason H. Stover +Copyright: © 1995-1996 Free Software +Copyright: © 2006 John Tapsell +Copyright: © 2008 Aaron J. Seigo +Copyright: © 2006 Michael Fellinger +Copyright: © 2007 Siraj Razick +Copyright: © Simon Montagu +Copyright: © 2006 David Nicolson +Copyright: © G??bor Lehel +Copyright: © 2006 Mike Diehl +Copyright: © 2007 Ian Alexander Monroe +Copyright: © 2003 Laur Ivan +Copyright: © 2004 Shintaro Matsuoka +Copyright: © 2006 All Rights Reserved. +Copyright: © 1993 Colin Plumb +Copyright: © 2007 Benjamin Reed +Copyright: © 1995-2005 Mark Adler +Copyright: © 2007 Jani Huhtanen +Copyright: © Shoshannah Forbes +Copyright: © 2004 Kévin Ottens +Copyright: © 2007 Leonardo Franchi +Copyright: © 2007 Henry de Valence + +License for all components unless stated otherwise: +-- + GNU General Public License, version 2 or later (GPL-2+) + + On Debian systems, the complete text of the + GNU General Public License version 2 can be found in + /usr/share/common-licenses/GPL-2 +-- + +Other used licenses: +-- + GNU General Public License, version 2 (GPL-2) + 250 file(s) are licensed under this license: + + + src/amarok_proxy.rb + + src/browsers/servicebrowser/scriptableservice/shoutcast_service.rb + src/charset-detector/include/* + src/charset-detector/src/* + src/mediadevice/ipod/* + + src/mediadevice/njb/njbmediadevice.cpp + + src/mediadevice/njb/njbmediadevice.h + + src/scriptengine/generator + src/scriptengine/generator/generator/* + src/scriptengine/generator/generator/parser/* + src/scriptengine/generator/generator/parser/include/* + src/scriptengine/generator/generator/parser/rpp/* + src/scriptengine/generator/qtbindings/qs_eval/* + src/scriptengine/generator/qtbindings/qtscript_core/* + src/scripts/* + src/scripts/librivox_service/* + + On Debian systems, the complete text of the + GNU General Public License version 2 can be found in + /usr/share/common-licenses/GPL-2 +-- + +-- + GNU Lesser General Public License, version 2.1 (LGPL-2.1) + 132 file(s) are licensed under this license: + + + src/ktrm.cpp + + src/ktrm.h + + src/metadata/tplugins.cpp + + src/metadata/tplugins.h + src/metadata/aac/* + src/metadata/asf/* + src/metadata/audible/* + src/metadata/m4a/* + src/metadata/mp4/* + src/metadata/speex/* + src/metadata/trueaudio/* + src/metadata/wav/* + src/metadata/wavpack/* + + On Debian systems, the complete text of the + GNU Lesser General Public License version 2.1 can be found in + /usr/share/common-licenses/LGPL-2.1 +-- + +-- + GNU Library General Public License, version 2 (LGPL-2) + 9 file(s) are licensed under this license: + + + src/medium.cpp + + src/medium.h + + src/browsers/filebrowser/FileBrowser.cpp + + src/browsers/filebrowser/FileBrowser.h + + src/browsers/filebrowser/kbookmarkhandler.cpp + + src/browsers/filebrowser/kbookmarkhandler.h + + src/browsers/servicebrowser/lastfm/libUnicorn/URLLabel.cpp + + src/browsers/servicebrowser/lastfm/libUnicorn/URLLabel.h + src/context/plasma/effects/* + + On Debian systems, the complete text of the + GNU Library General Public License version 2 can be found in + /usr/share/common-licenses/LGPL-2 +-- + +-- + GNU Lesser General Public License, version 2.1 or later (LGPL-2.1+) + 6 file(s) are licensed under this license: + + src/browsers/servicebrowser/mp3tunes/libmp3tunes/* excluding: + -+ src/browsers/servicebrowser/mp3tunes/libmp3tunes/md5.h + + src/metadata/tfile_helper.cpp + + src/metadata/tfile_helper.h + + On Debian systems, the complete text of the + GNU Lesser General Public License version 2.1 can be found in + /usr/share/common-licenses/LGPL-2.1 +-- + +-- + GNU Library General Public License, version 2 or later (LGPL-2+) + 158 file(s) are licensed under this license: + + + src/Expression.cpp + + src/Expression.h + + src/MediaItem.cpp + + src/MediaItem.h + + src/Sidebar.h + + src/amarok_export.h + + src/amarok_libs_export.h + src/context/animators/default/* + + src/context/layouts/ContextLayout.cpp + + src/context/layouts/ContextLayout.h + src/context/plasma/* excluding: + -+ src/context/plasma/dialog.cpp + -+ src/context/plasma/dialog.h + src/context/plasma/appletbrowser/* + src/context/plasma/layouts/* + src/context/plasma/scripting/* + src/context/plasma/tests/* excluding: + -? src/context/plasma/tests/sharedtimertest.h + src/context/plasma/widgets/* + src/strigi/audible/* + src/strigi/mp4/* + + src/widgets/SidebarWidget.cpp + + src/widgets/SidebarWidget.h + + src/widgets/kratingpainter.cpp + + src/widgets/kratingpainter.h + + src/widgets/kratingwidget.cpp + + src/widgets/kratingwidget.h + + On Debian systems, the complete text of the + GNU Library General Public License version 2 can be found in + /usr/share/common-licenses/LGPL-2 +-- + +-- + src/collection/daap/daapreader/authentication/* excluding: + -+ src/collection/daap/daapreader/authentication/contentfetcher.cpp + -+ src/collection/daap/daapreader/authentication/contentfetcher.h + -+ src/collection/daap/daapreader/authentication/md5.h + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. +-- + +-- + + src/browsers/servicebrowser/lastfm/libUnicorn/mbid_mp3.h + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the author nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT UNLESS REQUIRED BY + LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER OR CONTRIBUTOR + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-- + +-- + + src/browsers/servicebrowser/lastfm/libUnicorn/zconf.h + + src/browsers/servicebrowser/lastfm/libUnicorn/zlib.h + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +-- + +== MySQL == + +The Debian package of MySQL was first debianzed on 1997-04-12 by Christian +Schwarz and ist maintained since 1999-04-20 by +Christian Hammers . + +It can be downloaded from http://www.mysql.com/ + +Copyright: + +According to the file "COPYING" all parts of this package are licenced +under the terms of the GNU GPL Version 2 of which a copy is available +in /usr/share/common-licenses. + +To allow free software with other licences than the GPL to link against the +shared library, special terms for "derived works" are defined in the file +"EXCEPTIONS-CLIENT" which is quoted below. + +More information can be found on http://www.mysql.com/company/legal/licensing/ + +The manual had to be removed as it is not free in the sense of the +Debian Free Software Guidelines (DFSG). + +> Appendix I MySQL FLOSS License Exception +> **************************************** +> +> Version 0.3, 10 February 2005 +> +> The MySQL AB Exception for Free/Libre and Open Source Software-only +> Applications Using MySQL Client Libraries (the "FLOSS Exception"). +> +> Exception Intent +> ================ +> +> We want specified Free/Libre and Open Source Software ("FLOSS") +> applications to be able to use specified GPL-licensed MySQL client +> libraries (the "Program") despite the fact that not all FLOSS licenses +> are compatible with version 2 of the GNU General Public License (the +> "GPL"). +> +> Legal Terms and Conditions +> ========================== +> +> As a special exception to the terms and conditions of version 2.0 of the +> GPL: +> +> 1. You are free to distribute a Derivative Work that is formed +> entirely from the Program and one or more works (each, a "FLOSS +> Work") licensed under one or more of the licenses listed below in +> section 1, as long as: +> +> a. You obey the GPL in all respects for the Program and the +> Derivative Work, except for identifiable sections of the +> Derivative Work which are not derived from the Program, and +> which can reasonably be considered independent and separate +> works in themselves, +> +> b. all identifiable sections of the Derivative Work which are not +> derived from the Program, and which can reasonably be +> considered independent and separate works in themselves, +> +> i +> are distributed subject to one of the FLOSS licenses +> listed below, and +> +> ii +> the object code or executable form of those sections are +> accompanied by the complete corresponding +> machine-readable source code for those sections on the +> same medium and under the same FLOSS license as the +> corresponding object code or executable forms of those +> sections, and +> +> c. any works which are aggregated with the Program or with a +> Derivative Work on a volume of a storage or distribution +> medium in accordance with the GPL, can reasonably be +> considered independent and separate works in themselves which +> are not derivatives of either the Program, a Derivative Work +> or a FLOSS Work. +> +> If the above conditions are not met, then the Program may only be +> copied, modified, distributed or used under the terms and +> conditions of the GPL or another valid licensing option from MySQL +> AB. +> +> 2. FLOSS License List +> +> *License name* *Version(s)/Copyright Date* +> Academic Free License 2.0 +> Apache Software License 1.0/1.1/2.0 +> Apple Public Source License 2.0 +> Artistic license From Perl 5.8.0 +> BSD license "July 22 1999" +> Common Public License 1.0 +> GNU Library or "Lesser" General Public 2.0/2.1 +> License (LGPL) +> Jabber Open Source License 1.0 +> MIT license - +> Mozilla Public License (MPL) 1.0/1.1 +> Open Software License 2.0 +> OpenSSL license (with original SSLeay "2003" ("1998") +> license) +> PHP License 3.0 +> Python license (CNRI Python License) - +> Python Software Foundation License 2.1.1 +> Sleepycat License "1999" +> W3C License "2001" +> X11 License "2001" +> Zlib/libpng License - +> Zope Public License 2.0 +> +> Due to the many variants of some of the above licenses, we require +> that any version follow the 2003 version of the Free Software +> Foundation's Free Software Definition +> (`http://www.gnu.org/philosophy/free-sw.html') or version 1.9 of +> the Open Source Definition by the Open Source Initiative +> (`http://www.opensource.org/docs/definition.php'). +> +> 3. Definitions +> +> a. Terms used, but not defined, herein shall have the meaning +> provided in the GPL. +> +> b. Derivative Work means a derivative work under copyright law. +> +> 4. Applicability This FLOSS Exception applies to all Programs that +> contain a notice placed by MySQL AB saying that the Program may be +> distributed under the terms of this FLOSS Exception. If you +> create or distribute a work which is a Derivative Work of both the +> Program and any other work licensed under the GPL, then this FLOSS +> Exception is not available for that work; thus, you must remove +> the FLOSS Exception notice from that work and comply with the GPL +> in all respects, including by retaining all GPL notices. You may +> choose to redistribute a copy of the Program exclusively under the +> terms of the GPL by removing the FLOSS Exception notice from that +> copy of the Program, provided that the copy has never been +> modified by you or any third party. + + +== innotop == + +Author: Baron Schwartz +URL: http://innotop.sourceforge.net + +License: +> This software is dual licensed, either GPL version 2 or Artistic License. +> +> This package is free software; you can redistribute it and/or modify +> it under the terms of the GNU General Public License as published by +> the Free Software Foundation; either version 2 of the License, or +> (at your option) any later version. +> +> This package is distributed in the hope that it will be useful, +> but WITHOUT ANY WARRANTY; without even the implied warranty of +> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +> GNU General Public License for more details. +> +> You should have received a copy of the GNU General Public License +> along with this package; if not, write to the Free Software +> Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General Public License and the +Artistic License can be found in `/usr/share/common-licenses/'. + +The upstream author explained here: http://bugs.gentoo.org/show_bug.cgi?id=14760 +that these licenses also apply to the following files: +- innotop.html +- InnoDBParser.pm --- amarok-2.0.1.1mysql5.1.30.orig/debian/source.lintian-overrides +++ amarok-2.0.1.1mysql5.1.30/debian/source.lintian-overrides @@ -0,0 +1,2 @@ +maintainer-script-lacks-debhelper-token debian/mysql-server-5.1.postinst +maintainer-script-lacks-debhelper-token debian/mysql-server-5.1.postrm --- amarok-2.0.1.1mysql5.1.30.orig/debian/control +++ amarok-2.0.1.1mysql5.1.30/debian/control @@ -0,0 +1,62 @@ +Source: amarok +Section: kde +Priority: optional +Maintainer: Kubuntu Developers +XSBC-Original-Maintainer: Modestas Vainius +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 7), cmake (>= 2.6.2), quilt, pkg-kde-tools (>= 0.2), + libtag1-dev (>= 1.5), + kdelibs5-dev (>= 4:4.1.96), libsoprano-dev (>= 2.1), + libstreamanalyzer-dev, libstrigiqtdbusclient-dev, libnjb-dev, libifp-dev, + libmtp-dev (>= 0.3.0), libglib2.0-dev, libgpod-nogtk-dev | libgpod-dev, + libqt4-opengl-dev, + libcurl4-gnutls-dev, libxml2-dev, libloudmouth1-dev, + kdemultimedia-dev (>= 4:4.1.96), cdbs, + libtool (>= 1.4.2-7), procps | hurd, file (>= 3.28-1), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, gs, dpatch, gawk, bison, lsb-release +Standards-Version: 3.8.0 +Homepage: http://amarok.kde.org +Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/amarok/ubuntu +Vcs-Bzr: https://code.launchpad.net/~kubuntu-members/amarok/ubuntu + +Package: amarok +Architecture: any +Depends: amarok-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: kdemultimedia-kio-plugins (>= 4:4.1.96) +Suggests: libqt4-sql-sqlite, libqt4-sql-mysql, libqt4-sql-psql +Replaces: amarok-kde4 +Conflicts: amarok-kde4 +Description: easy to use media player based on the KDE 4 technology platform + Amarok is the media player with an intuitive interface. Amarok makes playing + the music you love easier than ever before - and looks good doing it. + . + This package provides Amarok series 2 media player which is based on the KDE 4 + technology platform. Features include: + - new fascinating look. + - innovative user interface. + - almighty Internet service framework. + - powerful scripting. + - dynamic and new biased playlists. + - mobile devices support. + +Package: amarok-common +Architecture: all +Depends: ${misc:Depends} +Recommends: amarok (>= ${source:Version}) +Replaces: amarok-kde4, mysql-server-data-5.1 +Conflicts: amarok-kde4, mysql-server-data-5.1 +Description: architecture independent files for Amarok + This package contains architecture independent files needed for Amarok to run + properly. Therefore, unless you have 'amarok' package of the same version + installed, you will hardly find this package useful. + +Package: amarok-dbg +Priority: extra +Architecture: any +Depends: amarok (= ${binary:Version}), ${misc:Depends}, kdelibs5-dbg +Replaces: amarok-kde4-dbg +Conflicts: amarok-kde4-dbg +Description: debugging symbols for Amarok + This package provides debugging symbols for all binary packages built from + amarok source package. It's highly recommended to have this package installed + before reporting any Amarok crashes to either Amarok developers or Debian + package maintainers. --- amarok-2.0.1.1mysql5.1.30.orig/debian/amarok.lintian-overrides +++ amarok-2.0.1.1mysql5.1.30/debian/amarok.lintian-overrides @@ -0,0 +1,2 @@ +amarok: package-name-doesnt-match-sonames +amarok: shlib-missing-in-control-file libamarok_service_liblastfm.so for usr/lib/libamarok_service_liblastfm.so --- amarok-2.0.1.1mysql5.1.30.orig/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ amarok-2.0.1.1mysql5.1.30/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -0,0 +1,11 @@ +We embed mysql sources and amarok into one. This is because mysql 5.1 is not supported so its libraries can not be exposed in a package in main. +--- +* Keep our version of rules with cdbs kde4.mk - Obviously a lot of debian + internal buildsystems need to be removed +* Check to see if NEWS or any other readmy type file applies to our distributed + version. +* As of 2.0.1.1 We use mysql-server-5.1 as Depends for amarok. +* don't build depend on libgtk2-dev +* on amarok.insall debian uses '/debian/icons/* /usr/share/pixmaps + we use '../../debian/icons/amarok-16.xpm usr/share/pixmaps + and '../../debian/icons/amarok.xpm usr/share/pixmaps --- amarok-2.0.1.1mysql5.1.30.orig/debian/compat +++ amarok-2.0.1.1mysql5.1.30/debian/compat @@ -0,0 +1 @@ +5 --- amarok-2.0.1.1mysql5.1.30.orig/debian/rules +++ amarok-2.0.1.1mysql5.1.30/debian/rules @@ -0,0 +1,240 @@ +#!/usr/bin/make -f + +# This rules file is based on the one from mysql-dfsg-5.1 modified to work with +# the two tars, jriddell 2009-02 + +export DH_VERBOSE=1 + +PACKAGE=mysql-dfsg-5.1 + +#for tar within .orig, jriddell +DPATCH_WORKDIR = mysql-dfsg-5.1-5.1.30.orig + +include /usr/share/dpatch/dpatch.make + +TMP=$(CURDIR)/debian/tmp/ + +ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH) +ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' ) + +DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) +DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-) +DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') +DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p') + +DISTRIBUTION = $(shell lsb_release -i -s) + +MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi) +ifeq (${MAKE_J}, -j0) + MAKE_J = -j1 +endif + +MAKE_TEST_TARGET=test-force +ifneq ($(findstring $(DEB_BUILD_OPTIONS),fulltest),) +# make test-bt is the testsuite run by the MySQL build team +# before a release, but it is long + MAKE_TEST_TARGET=test-bt +endif + +USE_ASSEMBLER=--enable-assembler + +ifneq ($(findstring $(ARCH), alpha amd64 arm armel ia64 i386 hppa mipsel powerpc s390 sparc),) + TESTSUITE_FAIL_CMD=true +else + TESTSUITE_FAIL_CMD=exit 1 +endif + +ifeq ($(findstring $(ARCH), amd64),$(ARCH)) + FORCE_FPIC_CFLAGS=-fPIC + FORCE_FPIC=--with-pic --with-lib-ccflags="-fPIC" +endif + +# This causes seg11 crashes if LDAP is used for groups in /etc/nsswitch.conf +# so it is disabled by default although, according to MySQL, it brings >10% +# performance gain if enabled. See #299382. +ifeq ($(STATIC_MYSQLD), 1) + USE_STATIC_MYSQLD=--with-mysqld-ldflags=-all-static +endif + +# First thing is unpack the tars +pre-patch: + tar xf mysql*gz + tar xf amarok*gz + touch pre-patch + +configure: pre-patch patch configure-stamp +configure-stamp: + @echo "RULES.configure-stamp" + dh_testdir + +ifneq ($(ARCH_OS),hurd) + if [ ! -d /proc/self ]; then echo "/proc IS NEEDED" 1>&2; exit 1; fi +endif + + cd mysql*/; sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \ + CC=$${MYSQL_BUILD_CC:-gcc} \ + CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O3 -DBIG_JOINS=1 ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing"} \ + CXX=$${MYSQL_BUILD_CXX:-g++} \ + CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing"} \ + ./configure \ + --build=${DEB_BUILD_GNU_TYPE} \ + --host=${DEB_HOST_GNU_TYPE} \ + \ + --prefix=/usr \ + --exec-prefix=/usr \ + --libexecdir=/usr/sbin \ + --datadir=/usr/share/mysql-5.1 \ + --localstatedir=/var/lib/mysql \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + \ + --with-server-suffix="-$(DEBVERSION)" \ + --with-comment="($(DISTRIBUTION))" \ + --with-system-type="debian-linux-gnu" \ + \ + --enable-shared \ + --enable-static \ + --enable-thread-safe-client \ + $(USE_ASSEMBLER) \ + --enable-local-infile \ + $(FORCE_FPIC) \ + --with-pstack \ + --with-fast-mutexes \ + --with-big-tables \ + --with-unix-socket-path=/var/run/mysqld/mysqld.sock \ + --with-mysqld-user=mysql \ + --with-libwrap \ + $(USE_STATIC_MYSQLD) \ + --with-ssl \ + --without-docs \ + --with-extra-charsets=all \ + --with-plugins=max \ + \ + --without-ndbcluster \ + --with-embedded-server \ + --with-embedded-privilege-control' + + # --sysconfdir=/etc/mysql -- Appends /etc/mysql after ~/ in the my.cnf search patch! + # + # --with-debug + + touch configure-stamp + + +# build and install mysql, configure and build amarok +build: build-stamp-mysql +build-stamp-mysql: configure + dh_testdir + + cd mysql*/; $(MAKE) $(MAKE_J) + + cd mysql*/; $(MAKE) install DESTDIR=$(CURDIR)/debian/tmpmysql + + -cd amarok*/; patch -p1 < ../debian/patches-amarok/02_mysqle_fix_linkage.diff + -cd amarok*/; patch -p1 < ../debian/patches-amarok/kubuntu_03_restricted_install.diff + -cd amarok*/; patch -p1 < ../debian/patches-amarok/kubuntu_04_libgpod_0.7.diff + -cd amarok*/; patch -p1 < ../debian/patches-amarok/kubuntu_05_wikipaedia.diff + cd amarok*/; mkdir -p build + cd amarok*/build/; cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DMYSQL_EMBEDDED_LIBRARIES=$(CURDIR)/debian/tmpmysql/usr/lib/mysql/libmysqld.a \ + -DMYSQL_INCLUDE_DIR=$(CURDIR)/debian/tmpmysql/usr/include/mysql/ \ + -DMYSQL_LIBRARIES=$(CURDIR)/debian/tmpmysql/usr/lib/mysql/libmysqlclient.a \ + -DDATA_INSTALL_DIR=/usr/share/kde4/apps \ + -DHTML_INSTALL_DIR=/usr/share/doc/kde/HTML \ + -DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \ + -DLIB_INSTALL_DIR=/usr/lib \ + -DCMAKE_VERBOSE_MAKEFILE=ON .. + + cd amarok*/build/; make + + touch testsuite-stamp + + touch build-stamp-mysql + + +# unpatch removed, jriddell +clean: clean-patched + rm -rf mysql-*/ amarok-*/ pre-patch + rm -rf debian/patched + rm -rf debian/tmpmysql +clean-patched: + @echo "RULES.clean-patched" + dh_testdir + dh_testroot + rm -f configure-stamp + rm -f build-stamp-mysql + rm -f testsuite-stamp + rm -f patch-stamp + + dh_clean -v + + +install: +install: build + @echo "RULES.install" + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd amarok*/build/; make install DESTDIR=$(TMP) + + dh_install --sourcedir=debian/tmp + +# Build architecture-independent files here. +binary-indep: build install + @echo "RULES.binary-indep" + dh_testdir -i + dh_testroot -i + dh_installdebconf -i + dh_installdocs -i + dh_installexamples -i + dh_installmenu -i + dh_installlogrotate -i + dh_installinit -i + dh_installcron -i + dh_installman -i + dh_installinfo -i + dh_installlogcheck -i + dh_installchangelogs -i + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_perl -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + @echo "RULES.binary-arch" + dh_testdir + dh_testroot + + dh_installdebconf -a + dh_installdocs -a + dh_installman -a + dh_strip -a + dh_link -a + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a + #dh_makeshlibs -plibmysqlclient16 -V'libmysqlclient16 (>= 5.1.21-1)' + dh_installdeb -a + #dh_shlibdeps -a -l debian/libmysqlclient16/usr/lib -L libmysqlclient16 + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch + +.PHONY: clean clean-patched configure build binary binary-indep binary-arch install patch unpatch + +# vim: ts=8 --- amarok-2.0.1.1mysql5.1.30.orig/debian/changelog +++ amarok-2.0.1.1mysql5.1.30/debian/changelog @@ -0,0 +1,1831 @@ +amarok (2:2.0.1.1mysql5.1.30-0ubuntu3) jaunty; urgency=low + + * Add kubuntu_05_wikipaedia.diff from upstream, fixes Wikipaedia applet + + -- Jonathan Riddell Tue, 17 Feb 2009 10:21:38 +0000 + +amarok (2:2.0.1.1mysql5.1.30-0ubuntu2) jaunty; urgency=low + + * Add patch kubuntu_03_restricted_install.diff to call update-notifier-kde + and prompt for restricted codecs install + * Add kubuntu_04_libgpod_0.7.diff from upstream, compile with libgpod 0.7 + + -- Jonathan Riddell Thu, 12 Feb 2009 19:14:19 +0000 + +amarok (2:2.0.1.1mysql5.1.30-0ubuntu1) jaunty; urgency=low + + * New package with mysql sources included, as discussed with security team + * debian/rules file is now based on the one from mysql-dfsg-5.1 + + -- Jonathan Riddell Fri, 06 Feb 2009 08:34:35 +0000 + +amarok (2:2.0.1.1-0ubuntu5) jaunty; urgency=low + + * Depend on new package mysql-server-data-5.1, + do not need mysql-server-5.1 now + + -- Jonathan Riddell Tue, 27 Jan 2009 00:14:47 +0000 + +amarok (2:2.0.1.1-0ubuntu4) jaunty; urgency=low + + [ Harald Sitter ] + * Removed build deps: + - libvisual-0.4-dev (no support in Amarok 2 + unmaintained upstream) + - libgtk2.0-dev (we build against libgpod-nogtk to save CD space) + * Removed deps: + - ruby (scripting is provided via QtScript) + - kdebase-workspace-data (not necessary with plasma being in kdelibs) + * Removed suggests: + - libvisual-0.4-plugins (no support in Amarok 2 + unmaintained upstream) + * Removed recommends: + - kdelibs5-dbg from amarok-dbg (use dep, since it is required with the + current build system) + * Add Replaces/Conflicts on amarok-kde4(-dbg) to all packages + * Drop note about libvisual from Description + * Add ${misc:Depends} for all packages to make lintian happy + * Import packaging into Bzr and add Vcs-Browser/Vcs-Bzr fields + * Add final newline to debian/rules + * Update debian/watch for stable + * Include debian/icons and debian/amarok.menu from Debian + * Sync build-depends with current Debian package to reduce diff + + [ Steve Stalcup ] + * Debian/control: + - Drop build dependancy on mysql-server-5.1 (not required for build) + - Drop build dependancy on libmysqlclient-dev (moved to mysql 5.0) + - Added build dependancy on libmysqlclient16-dev (provided by mysql 5.1) + - Bump versions on build-deps + * Correct paths in amarok.install for .xpm icons + * Updated KUBUNTU-DEBIAND-DIFFERENCES + * Closes amarok associated bug (LP: #316957) + + -- Steve Stalcup Wed, 14 Jan 2009 18:42:40 -0500 + +amarok (2:2.0.1.1-0ubuntu3) jaunty; urgency=low + + * debian/contol, added following Depends for amarok: + - mysql-server-5.1 (>= 5.1.30-2ubuntu1) + - kdebase-workspace-data (>=4.1.85) + - ruby + * Updated KUBUNTU-DEBIAN-DIFFERENCES + + -- Steve Stalcup Mon, 12 Jan 2009 11:22:19 -0500 + +amarok (2:2.0.1.1-0ubuntu2) jaunty; urgency=low + + * Removed libmp4v2-dev as a build-dep + + -- Steve Stalcup Sun, 11 Jan 2009 23:54:52 -0500 + +amarok (2:2.0.1.1-0ubuntu1) jaunty; urgency=low + + * New Upstream Release + * Drop 05_mysqle_amarok_local_errmsg patch, fixed upstream + * Updat amarok-common.install file + * Merge from Debian Unstable, remaining changes: + - Change rules for kubuntu cdbs-kde4.mk + + dropped any build internal buildsystems + * debian/debhelper: + * debian/Debian/Buildsystems + * debian/Debian/Sequence + * debian/Debian/ + - Drop debian/icons + - Drop NEWS file + - Drop bug-presubj.disabled + - Remove 'debian/icons/*' from amarok.install + - Change amarok.install (see KUBUNTU-DEBIAN-DIFFERENCES) + * Add libmp4v2-dev to build-deps + * Bump build-dep versions + * Added Kubuntu Developers as maintainers + * Added git-orig-source rule to rules + * Added KUBUNTU-DEBIAN-DIFFERENCES + + -- Steve Stalcup Sat, 10 Jan 2009 11:35:03 -0500 + +amarok (2.0-1) experimental; urgency=low + + * New MAJOR upstream release. + * Disable bug-presubj. + * Remove 01_r887834_dynamic_playlist_exhaust_fix.diff, stolen from upstream. + * Refresh 05_mysqle_amarok_local_errmsg.diff patch. + + -- Modestas Vainius Wed, 10 Dec 2008 01:32:45 +0200 + +amarok (1.98-1) experimental; urgency=low + + * New upstream development release (2.0 RC1). + * Drop amarok dependency on libplasma2. It is not needed. + * No longer build depends on sqlite. + * Suggest Qt4 SQLite, MySQL and PostgresSQL plugins which allow + to import collections from Amarok 1.4. Document that in README.Debian. + * Remove note about scripts from README.Debian. + * Refresh 05_mysqle_amarok_local_errmsg.diff patch. + * Add 01_r887834_dynamic_playlist_exhaust_fix.diff patch which should solve + the problem with dynamic playlist running out of tracks after some time. + * Update install files. + + -- Modestas Vainius Sun, 23 Nov 2008 10:53:51 +0200 + +amarok (1.94-1) experimental; urgency=low + + * New upstream development release (2.0 Beta 3). + * Rewrite debian/debhelper/* and debian/Debian/* + - Get rid of the Debian symlink hack. Use PERLLIB environment variable + instead to allow dh to find custom Debhelper modules. + - Make it thread-safe by dropping double-collon rules. + - Change the way dh_auto_* handles buildsystems. + - Rewrite almost all custom Debhelper scripts. + - Pass -DCMAKE_USE_RELATIVE_PATHS=ON when cmake >= 2.6.2-1 is used. + * Build depend on cmake 2.6.2 or higher. + * Update install files. + * Refresh debian/patches. + * Make quilt build dependency unversioned again. Tweak README.source a bit. + * Tweak debian/copyright a bit. + * Build depend on pkg-kde-tools >= 0.2. Use variables.mk from there and + enable linking with --as-needed. + * Add lintian override for usr/lib/libamarok_service_liblastfm.so error. + + -- Modestas Vainius Sat, 01 Nov 2008 21:41:19 +0200 + +amarok (1.92.2-1) experimental; urgency=low + + * New upstream development release (1.92.2 aka REAL 2.0 Beta2). + * Rename and modify patches: + - 02_sqlcollection_no_openssl_linkage.diff to 02_mysqle_fix_linkage.diff. + Additionally link sqlcollection (MySQLe) against pthread. + * Drop patches, merged upstream: + - 01_mp3tunes_gcrypt_fixup.diff + - 03_r865140_r865531_mysqle_init_fixes.diff + - 04_mysqle_skip_grant_tables.diff + * Refresh patches: + - 05_mysqle_amarok_local_errmsg.diff + * Update amarok-common.install: + - importer script - removed; + - librivox_service script - new files added. + + -- Modestas Vainius Sun, 05 Oct 2008 10:15:09 +0300 + +amarok (1.92-1) experimental; urgency=low + + * New upstream development release (1.92 aka 2.0 Beta2): + * Drop 01_mp3tunes_support_gcrypt.diff. Merged upstream. + - Add 01_mp3tunes_gcrypt_fixup.diff - upstream merged incomplete patch. + This small fix is still needed to make amarok mp3tunes build against + libgcrypt. + * Drop dependency on ruby from amarok-common and from build depends. + * Build-depend on kdemultimedia-dev (>= 4.1.1) as it has dependencies + cleaned up now. Bump kdelibs5-dev and libsoprano-dev build depend versions + to match this one. + * Update install files. + * Install translations to amarok-common. + * Update debian/not-installed. + * Strip debian/tmp from install files. No longer necessary as of debhelper + compat level 7. + * debian/rules: now other scripts need permission fixes (lyrc and lyricwiki). + * Replace libmysqlclient15-dev build dependency with libmysqlclient-dev + (>= 5.1.26c) from experimental. libmysqld.a (MySQL Embedded) in the old + package cannot be linked with shared libraries (Amarok sqlcollection) and + as a result build fails. + * Add patch to drop useless sqlcollection plugin linking with openssl stuff + (crypto, ssl) (02_sqlcollection_no_openssl_linkage.diff). + * Add 03_r865140_r865531_mysqle_init_fixes.diff patch from amarok trunk + which is supposed to fix Amarok crash on startup related to MySQLe and + Innodb. However, MySQLe as of 5.1.26rc-1 does not want to use MyISAM even + when explicitly told so. + * Add 04_mysqle_skip_grant_tables.diff which disables MySQLe ACL checking + (--skip-grant-tables option) when MySQLe is built with + --with-embedded-privilege-control option. ACLs are useless for Amarok. + * It appears that MySQLe needs errmsg.sys to run. This file is supplied by + the mysql-server-5.1 package however it is overkill to depend on it. Hence + make the following changes: + - Build-depend on mysql-server-5.1. It will be the source of English + errmsg.sys. + - Copy mysql-server-5.1 English errmsg.sys to /mysqle. + Install it to the amarok-common package. + - Patch (05_mysqle_amarok_local_errmsg.diff) Amarok MySQLe to search for + the errmsg.sys in the /mysqle (--language option). + * Remove obsolete patches from debian/patches (they were disabled in 1.90-1): + - 10_queuemedia.patch + - 15_temptables_more_indices.diff + * Add debian/NEWS entry about MySQLe. + + -- Modestas Vainius Sun, 28 Sep 2008 12:10:02 +0300 + +amarok (1.90-1) experimental; urgency=low + + * New upstream development release (2.0 Beta 1, Nerrivik) (Closes: #481834): + - Improved & rewriten Last.fm support (Closes: #367910, #390412, #421810), + (Closes: #439795). If closed bugs still apply, please reopen. + - There is no counter anymore (Closes: #406937). + - "Manage Devices and Plugins" popup no longer exists (Closes: #420057). + - "setBpm" DBus call is not available. The bug is no longer applicable + (Closes: #458210). + - Playlist code was rewritten (Closes: #416783). + - Wikipedia information is reloaded when another song is played + (Closes: #453151). + + * Remove patches: + - 01, 02, 03, 04, 05, 06, 97 - no longer applicable as amarok 2 uses cmake + instead of autotools. + - 11_bug403340_cancel_rename_when_deleting_items.diff - playlist code was + rewritten. + - 12_devicemanager_dcopcall_no_timeout.diff - no longer applicable as DCOP + has been replaced by DBus. + - 13_lastfm_crash_434835.diff - Last.fm support was completely rewritten. + - 14_ruby_libs_not_scripts.diff - no longer applicable. + * Disable patches (needs evaluation and/or porting if still applicable): + - 10_queuemedia.patch + - 15_temptables_more_indices.diff + * Switch away from cdbs to debhelper v7: + - Port important stuff from pkg-kde KDE4 cdbs/kde.mk to my dh/kde.mk + - Appropriate changes to debian/rules. + * Add 01_mp3tunes_support_gcrypt.diff patch which adds support for linking + against Libgcrypt instead of OpenSSL (mp3tunes Internet Service). + * Bump Standards-Version to 3.8.0: + - add README.source and build-depend on quilt (>= 0.46-4.1) to ensure + presence of /usr/share/doc/quilt/README.source in the quilt package. + * Drop Vcs fields for now. amarok 2 packaging is not under any Vcs yet. + * Drop amarok-engine* packages amarok 2 Beta 1 supports only one engine + (Phonon) currently. Also: + - Drop individual engines from amarok Depends. + - Drop Conflicts with amarok-engine. No longer applicable. + - Do not suggest non-existant amarok-engines metapackage. + * Drop amarok-konqsidebar package as it is not present in this release. Also + drop it from amarok Recommends. + * Drop moodbar from amarok Suggests. Not supported in this release. + * Update amarok and amarok-common install files. + * Use (=) relationship for amarok depends on amarok-common. + * Remove Last.fm, Ruby and KDE socket notes from README.Debian. They are no + longer applicable. + * Update watch file to track unstable amarok 2 releases (until amarok 2 + final is released). + * Make amarok-common depend on libplasma2 for the animator and a few plasma + servicetypes (in kdebase-workspace-data). + * Cleanup amarok-common suggests too. I do not see any python scripts being + installed. + * Update amarok.1 manpage, add amarokmp3tunesharmonydaemon.1 manpage. + * Update lintian-overrides. + * Add presubj to discourage users from reporting upstream bugs to Debian BTS + until Amarok 2 is not stable. + * Build depend on libmtp-dev (>= 0.3.0). Newer library version is necessary. + * Build depend on libgtk2.0-dev to get Gdk 2.0 (iPod covers). + * Update debian/copyright. + + -- Modestas Vainius Fri, 22 Aug 2008 01:21:37 +0300 + +amarok (2:1.4.10-0ubuntu3) intrepid; urgency=low + + * Add kubuntu_12_eject_command.diff, change eject command to + umount, we no longer have kdeeject + + -- Jonathan Riddell Mon, 13 Oct 2008 22:16:22 +0100 + +amarok (2:1.4.10-0ubuntu2) intrepid; urgency=low + + * Update install-mp3 to use install-package + + -- Jonathan Riddell Mon, 08 Sep 2008 14:30:40 +0100 + +amarok (2:1.4.10-0ubuntu1) intrepid; urgency=low + + * New upstream release + * Add kubuntu_11_fix_libmtp-0.3.0-API.diff + + -- Harald Sitter Thu, 14 Aug 2008 18:04:13 +0200 + +amarok (2:1.4.9.1-2ubuntu3) intrepid; urgency=low + + * Add moodbar to the feature list + * Remove the amarok-engine virtual package, see debian version 1.4.8-2 for + reasoning + * amarok-common conflicts with amarok packages older than -2ubuntu1, but + doesn't replace them (LP: #244628) + + -- Harald Sitter Mon, 30 Jun 2008 19:19:04 +0200 + +amarok (2:1.4.9.1-2ubuntu2) intrepid; urgency=low + + * Add manpages - unbreak build + + -- Harald Sitter Fri, 27 Jun 2008 15:34:42 +0200 + +amarok (2:1.4.9.1-2ubuntu1) intrepid; urgency=low + + * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-DIFFERENCES + + -- Harald Sitter Wed, 25 Jun 2008 21:16:38 +0200 + +amarok (1.4.9.1-2) unstable; urgency=medium + + * Add 15_temptables_more_indices.diff patch which creates more indices for + some temporary tables that are used extensively while building collection + database. Apparently, SQLite 3.5.x is slower than 3.4.x when doing + matches on unindexed temporary table fields. This should solve (or improve + situation significantly) major performance problems with SQLite 3.5.x + (Closes: #479068). Urgency medium because this problem affects many + lenny and sid Amarok users having rather large (15k+ songs) collections. + + -- Modestas Vainius Sun, 11 May 2008 04:07:01 +0300 + +amarok (1.4.9.1-1) unstable; urgency=low + + * New upstream bugfix release: + - The last.fm dialog did not always properly disable options when the + username was not entered. + - Fix Amazon Cover fetching by using their new web service api. + (Closes: #474186) + - Don't insert items into Dynamic Mode that don't exist. + - If unavailable tracks are in the Playlist and random mode is on, don't + - stop those tracks if selected; continue with available tracks. + * Repackage original tarball as orig.tar.gz instead of doing tarball-in-orig + tarball thing. The previous way made patch testing and debugging more + painful unnecessarily. + * Resynchronize patches: + - 11_bug403340_cancel_rename_when_deleting_items.diff - fix offsets. + - 97_automake_cleanup.diff - adopt to upstream changes, fix offsets. + * Improve debian/rules stamp-automake and clean targets a bit not to rm + automake generated files uselessly (if they were not regenerated) + + -- Modestas Vainius Fri, 11 Apr 2008 10:12:31 +0300 + +amarok (1.4.8-2) unstable; urgency=low + + * Remove Adeodato Simó from Uploaders by his request. Thank you Adeodato for + all your hard work! + * Remove amarok-gstreamer.install because there is no gstreamer engine + anymore. + * Remove overrides/amarok-arts. arts engine is no longer available. + * Drop internal cdbs/kde.mk in favour of the one shipped with cdbs. Merge + missing functionality (cvs-make/automake) into debian/rules. + * Auto-guess automake /usr/share directory. + * Rework interdependences among amarok and its engines' packages: + - Drop amarok-engine virtual package. Amarok and its engines ABI are not + even compatible between Amarok point releases so virtual package, which, + unfortunately, is versionless by definition, is not practical here. + - Rename engine packages to amarok-engine-$engine. Make them conflict + and replace previous amarok-$engine packages. Also make amarok conflict + with amarok-engine virtual package. All these changes will ensure that + partial upgrades from etch are not allowed (Closes: #432219). + - Make amarok depend on any of its engines of the same binary version + via alternate dependences. Default engine is amarok-engine-xine. Edit + amarok-engine-xine description accordingly. + - Make all amarok engines recommend amarok strictly of the same binary + version. Recommends instead of Depends here breaks circular dependency + (Closes: #368485). + - Downgrade amarok-engines to amarok Suggests. + - Convert amarok-engines package to arch:all because it's a metapackage. + Edit amarok-engines description because it's no longer going to be + installed by default. + - Add amarok-yauap to amarok-engines Suggests. + * New binary packages: + - amarok-common - arch:all package for architecture independent files + split from amarok. It recommends amarok (>= ${source:Version}) to + avoid circular dependency as in case of stricter "Depends" relationship. + - amarok-konqsidebar - split konqsidebar into its own binary package. The + reason for this is that it's incompatible with konqueror (>= 4:4.0.0) + and needs to _conflict_ with it (due to *.desktop files). Add + amarok-konqsidebar to amarok Recommends and amarok to amarok-konqsidebar + Depends. + - amarok-dbg - package with debugging symbols (Closes: #368840). + - amarok-engine-yauap - Yauap Commandline Audio Player engine + (Closes: #445371): + * Add libdbus-qt-1-dev to Build-Depends + * Pass --with-yauap to configure + * Add amarok-yauap.install + * Depend on yauap. + * Add "Homepage" field to debian/control source section, remove homepage + reference from amarok binary package description. + * Disable /usr/share/doc/amarok-* symlinks in debian/rules. They just + complicate packaging unnecessarily and make lintian unhappy. + * Ship only README from upstream source in /usr/share/doc/amarok. + * debian/README.Debian: remove a note about installing ruby, because it's + a dependency and gets installed anyway. + * New patches: + - 01_libtool_update.diff - use ltmain.sh and libtool.m4.in from Debian + libtool. This patch is used instead of previous `cp` in debian/rules, + because the patch 02_ below depends on it. + - 02_admin_cleanup.diff - admin/* cleanup patch. + - 97_automake_cleanup.diff - automake cleanup patch to get rid of excess + dependencies and shut dpkg-shlibdeps up. Superseeds previous + 03_no_libadd_in_convenience_libs.diff patch. + - 11_bug403340_cancel_rename_when_deleting_items.diff - cancel a pending + 'rename' request for the playlist item that is about to be deleted. + The patch solves a popular crash. (Closes: #403340). + - 12_devicemanager_dcopcall_no_timeout.diff - do not use timeout for dcop + calls. It's very unsafe because it might break further dcop calls such + as the one in the debian bug #432752 (Closes: #432752). + - 13_lastfm_crash_434835.diff - resolve lastfm crash which could be + triggered by switching away from lastfm track while it was still + handshaking or buffering (Closes: #434835). Thanks to Raphael for the + excelent instructions how to reproduce the crash. + - 14_ruby_libs_not_scripts.diff - remove #! stanzas from ruby library + files. + * Prepend sequence number to the filenames of existing debian/patches/*. + Edit debian/patches/series accordingly. + * Move Depends/Recommends on ruby, python & friends from amarok to + amarok-common since they scripts have been moved here. + * Add moodbar to amarok Suggests (Closes: #421420). Tweak amarok package + description accordingly. + * Add DM-Upload-Allowed: yes to debian/control source section. + * s/XS-Vcs/Vcs/ in debian/control. + * Drop DEB_DH_SHLIBDEPS_ARGS_amarok from debian/rules. No longer needed with + recent dpkg-shlibdeps. + * Build-Depend on debhelper (>= 5.0.0) + * Add executable permissions for some amarok scripts to make lintian happy. + * s/.NF/.nf/ in debian/amarok.1 + * Drop DEB_INSTALL_DIRS_amarok from debian/rules. No longer needed. + * Use more accurate method to exclude (-X) amarok engines from being handled + by dh_makeshlibs instead of just DEB_DH_MAKESHLIBS_ARGS_ALL = -n. + * Do not amarok.install /usr/lib/libamarok.so and /usr/lib/libamarok.la. + They are devel-only and, hence, useless in the private library like + libamarok case. + * Install *.lintian files with overrides. + * Add manual pages: amarokapp.1 amarokcollectionscanner.1 amarok_libvisual.1 + * Do not install COPYING files which are present in some script directories. + Also remove useless (according to lintian) MacOS X resource fork file + rubygems/._gem_commands.rb + * Exclude amarok from amarok-engine-* packages dependency lists. + + -- Modestas Vainius Tue, 04 Mar 2008 15:28:46 +0200 + +amarok (1.4.8-1) unstable; urgency=low + + [ Adeodato Simó ] + * Build against libgpod-nogtk-dev. + + * Update Build-Standards to 3.7.3: + + move menu entry to Applications/Sound. + + * Build-depend on automake instead of automake1.9. + + [ Modestas Vainius ] + * Add myself as maintainer with the permission from Adeodato Simó. + * Add Adeodato Simó as uploader. + * debian/control: drop Vcs-Bazaar field. amarok debian packaging is + now hosted at kde-extras svn repo therefore I'm adding appropriate + XS-Vcs-Svn and XS-Vcs-Browser fields. + + * New upstream release (1.4.8) (Closes: #457352). + * Resync patches: + - proxy_lyrics.diff - removed, merged upstream. + - fix_gcc4.3_ftbfs.diff - removed, resolved upstream. + * Drop kdemultimedia-dev from Build-Depends. It's no longer needed. + * debian/rules: use /usr/share/automake-1.10 instead of *-1.9 + because 'automake' package provides version 1.10. + + -- Modestas Vainius Mon, 24 Dec 2007 23:10:02 +0200 + +amarok (2:1.4.9.1-0ubuntu3) hardy; urgency=low + + * Added kdebase-kio-plugins as a recommened package + + -- Jonathan Aquilina Tue, 15 Apr 2008 14:24:23 +0200 + +amarok (2:1.4.9.1-0ubuntu2) hardy; urgency=low + + [ Daniel Hahler] + * debian/patches/kubuntu_08_add_lastfm_recommended_radio.diff: + Add lastfm recommended radio station (LP: #103227) + * debian/patches/kubuntu_09_audio_mimetypes.diff: + - Add mimetypes audio/flac and audio/ogg (LP: #201291) + + [ Harald Sitter ] + * Unbreak manual media device configuration by enhancing + kubuntu_08_luks_device_detection.diff (LP: #207704) + + -- Harald Sitter Sat, 12 Apr 2008 13:47:12 +0200 + +amarok (2:1.4.9.1-0ubuntu1) hardy; urgency=low + + * Upstream patch release + + -- Jonathan Riddell Thu, 10 Apr 2008 23:07:12 +0100 + +amarok (2:1.4.9-0ubuntu1) hardy; urgency=low + + * New upstream release + + -- Harald Sitter Wed, 09 Apr 2008 13:09:03 +0200 + +amarok (2:1.4.8-0ubuntu5) hardy; urgency=low + + * Added kubuntu_08_luks_device_detection.diff to ajust Amarok's + media device detection to properly work with kdebase's + LUKS patch kubuntu_9913_kiomedialuks.diff) (LP: #186384) + + -- Harald Sitter Tue, 18 Mar 2008 01:10:01 +0100 + +amarok (2:1.4.8-0ubuntu4) hardy; urgency=low + + * Update install-mp3 to correctly error when something goes wrong + + -- Jonathan Riddell Thu, 13 Mar 2008 13:11:08 +0000 + +amarok (2:1.4.8-0ubuntu3) hardy; urgency=low + + [ Sven Boden ] + * Fix for bug "187406: Amarok install-mp3 fails silently" (LP #187406) + + [ Sarah Hobbs ] + * Sponsored upload. (Closes LP: #187406) + * Reworked patch to avoid setting absolute paths (eg /usr/bin/kdesu) + + -- Sarah Hobbs Wed, 12 Mar 2008 00:50:22 +1100 + +amarok (2:1.4.8-0ubuntu2) hardy; urgency=low + + * Fix install-mp3 installation path (LP: #179624) + + -- Guillaume Martres Mon, 31 Dec 2007 11:50:29 +0100 + +amarok (2:1.4.8-0ubuntu1) hardy; urgency=low + + * New upstream release. + * Removed kubuntu_05_utf8_to_mtp_devices_fix.diff (applied upstream). + * Removed kubuntu_06_fix_amarok_freeze_installing_mp3.diff (applied upstream). + * Removed proxy_lyrics.diff (applied upstream). + * Removed overrides/ and it's content since there is no amarok-arts anymore. + * Removed amarok-gstreamer.install since there is no amarok-gstreamer anymore. + * Changed Standards-Version to 3.7.3. + * Moved "Homepage" from Description stanza to the source section. + + -- Harald Sitter Mon, 17 Dec 2007 16:19:44 +0100 + +amarok (2:1.4.7-2ubuntu5) hardy; urgency=low + + * build without the libkerma-dev build dpendancy also ( realy fixed this + upload ) + + -- Brandon Holtsclaw Mon, 10 Dec 2007 01:56:48 -0600 + +amarok (2:1.4.7-2ubuntu4) hardy; urgency=low + + * build with --without-libkarma, as it seems to be default if left blank. + + -- Brandon Holtsclaw Sat, 08 Dec 2007 09:49:20 -0600 + +amarok (2:1.4.7-2ubuntu3) hardy; urgency=low + + * removed --with-libkarma, libkarma{0,-dev} is not in Main yet. + + -- Brandon Holtsclaw Wed, 05 Dec 2007 23:47:20 -0600 + +amarok (2:1.4.7-2ubuntu2) hardy; urgency=low + + * Rebuild for libmtp6 -> libmtp7 transition + + -- Jonathan Riddell Tue, 04 Dec 2007 14:01:22 +0000 + +amarok (2:1.4.7-2ubuntu1) hardy; urgency=low + + * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-DIFFERENCES + + -- Jonathan Riddell Mon, 03 Dec 2007 20:01:18 +0000 + +amarok (1.4.7-2) UNRELEASED; urgency=low + + * Build against libgpod-nogtk-dev. + + -- Adeodato Simó Sun, 26 Aug 2007 16:16:54 +0200 + +amarok (1.4.7-1) unstable; urgency=low + + * The "Are you breaking up with me?" release. + + -- Adeodato Simó Mon, 20 Aug 2007 11:00:49 +0200 + +amarok (1.4.6-1) unstable; urgency=low + + * New upstream version packaged. + + * Drop magnatune_CVE-2006-6980.diff; a (better) fix was applied upstream. + + -- Adeodato Simó Fri, 22 Jun 2007 22:12:29 +0100 + +amarok (1.4.5-5) unstable; urgency=low + + * Rebuild against libtunepimp 0.5; change Build-Depends from libtunepimp3-dev + to libtunepimp-dev. (Closes: #425884) + + -- Adeodato Simó Fri, 25 May 2007 11:02:17 +0200 + +amarok (1.4.5-4) unstable; urgency=low + + * Upload to unstable. (Closes: #421920) + + * Remove build-dependency on dpkg-dev (the version in stable groks + ${binary:Version}), and drop version requirement on debhelper and + libtag1-dev as well. + + * Drop the changes made to remove circular dependencies. (Reopens: #368485, + closes: #415484, #412464) + + * Add patch to fix FTBFS with gcc-4.3. (Closes: #417684) + + * Use ${binary:Version} instead of ${source:Version}. + + * Add XS-VCS-Bzr field. + + * Add watch file, and adjust download URL on debian/copyright. + + -- Adeodato Simó Fri, 11 May 2007 11:57:31 +0200 + +amarok (1.4.5-3) experimental; urgency=low + + * Add support for devices using MTP, build-dep on libmtp-dev added. + (Closes: #405399) + * Add support for karma devices, build-dep on libkarma-dev added. + (Closes: #400801) + * Added patch fixing CVE-2006-6980: amarok magnatune unsafe shell. + (Closes: #410850) + + -- Ana Beatriz Guerrero Lopez Mon, 12 Mar 2007 02:38:05 +0100 + +amarok (1.4.5-2) experimental; urgency=low + + * iPod support is back. Added versioned build-dep on libgpod-dev (>=0.4.2). + (Closes: #409985) + * Add patch to add the "Queue Track" functionality to the Amarok DCOP API: + queuemedia.patch. Patch by Isaac Clerencia + * Add patch to allow amarok get lyrics via http proxy with authentication. + Thanks to Filipe Lautert . (Closes: #409568) + * Added versioned dep on amarok-engines | amarok-engine, thanks to Andreas + Pakulat for pointing this. (Closes: #409996). + + -- Ana Beatriz Guerrero Lopez Sat, 10 Feb 2007 00:40:10 +0100 + +amarok (1.4.5-1) experimental; urgency=low + + * New upstream release: + - Remove patches merged by upstream: invoke_browser, sparc-asm, magnatune, + kde134333_negative_length_fix, revert-fix-for-bug-116127. + * The XMMS visualization interface has been removed by upstream: + - Remove xmms-dev build-dep. + - amarok's description updated. + - update amarok.install/rules. + * iPod support temporarily dropped. (It needs libgpod >= 0.4.2, which is not + yet in Debian). + + -- Ana Beatriz Guerrero Lopez Fri, 2 Feb 2007 05:15:29 +0100 + +amarok (1.4.4-4) unstable; urgency=high + + * Include final version of the magnatune.patch and really apply it. + + -- Ana Beatriz Guerrero Lopez Sun, 18 Feb 2007 01:17:49 +0100 + +amarok (1.4.4-3) unstable; urgency=high + + * Edited patch magnatune.patch fixing CVE-2006-6980: amarok magnatune + unsafe shell. (Closes: #410850). + The reference to the ruby scripts pointed in the bug report, is a problem + that was already solved in amarok 1.4.4. + * Add dep on unzip (needed to uncompress albums). + + -- Ana Beatriz Guerrero Lopez Thu, 15 Feb 2007 22:28:13 +0100 + +amarok (1.4.4-2) unstable; urgency=high + + * Patched magnatune code to avoid multiple credit-card charges. + (Closes: #402309) + + -- Ana Beatriz Guerrero Lopez Tue, 12 Dec 2006 16:51:13 +0100 + +amarok (1.4.4-1) unstable; urgency=medium + + * Adding myself as uploader. ACK my last three NMUs... + * Removed circular dependencies. Now amarok-engines and amarok-$engine + Recommends: amarok, instead of depends on amarok (Closes: #368485). + * Fix kde#134333: properly compute total playlist length if there are + tracks dynamic lengths (e.g. last.fm streams) in the playlist. Patch by + Modestas Vainius . + * Replaced ${Source-Version} with ${source:Version} and added versioned + build-dependency on dpkg-dev accordingly. + + -- Ana Beatriz Guerrero Lopez Sun, 26 Nov 2006 03:42:59 +0100 + +amarok (2:1.4.7-0ubuntu3) gutsy; urgency=low + + * Added kubuntu_05_utf8_to_mtp_devices_fix.diff from upstream. (KDE + Bug #139722) + * Added kubuntu_06_fix_amarok_freeze_installing_mp3.diff from + upstream. (KDE Bug #147126, LP: #58617) Thanks markey for fixing + this! + * Added amarok Suggests: libxine1-ffmpeg. (LP: #134741) + * Added kubuntu_07_gnome_multimedia_keys.diff, a script that lets the + multimedia keys in GNOME work in amarok. (LP: #87299) + * Use adept_batch update in install-mp3 not apt-get update + + -- Sarah Hobbs Sat, 01 Sep 2007 00:11:20 +1000 + +amarok (2:1.4.7-0ubuntu2) gutsy; urgency=low + + * Rebuild for libmtp5 -> libmtp6 library transition. + + -- Steve Kowalik Sat, 18 Aug 2007 00:55:59 +1000 + +amarok (2:1.4.7-0ubuntu1) gutsy; urgency=low + + * New Upstream version + * debian/control: replaced automake1.8 with automake1.9 + + -- Stephan Hermann Wed, 15 Aug 2007 09:47:17 +0200 + +amarok (2:1.4.6-0ubuntu2) gutsy; urgency=low + + * Rebuild for the libgpod1 -> libgpod2 library transition. + * Bump required version of the libgpod development headers. + + -- Steve Kowalik Tue, 17 Jul 2007 00:36:04 +1000 + +amarok (2:1.4.6-0ubuntu1) gutsy; urgency=low + + * New Upstream Release. (LP: #46526) + * Fixed kubuntu-media-amarok syntax (LP: #112252) + * Removed kubuntu_05_magnatune_security_fix.diff - fixed upstream + * Removed kubuntu_06_right_click_sound_control_fix.diff - fixed upstream + * Removed kubuntu_07_monge_exports_correct_symbols.diff - fixed + upstream + + -- Sarah Hobbs Tue, 19 Jun 2007 01:09:37 +1000 + +amarok (2:1.4.5-0ubuntu7) feisty; urgency=low + + * Spelling correction: amaroK -> Amarok + * Description update (no kio support with libxine - yet) + + -- Harald Sitter Tue, 3 Apr 2007 17:45:46 +0200 + +amarok (2:1.4.5-0ubuntu6) feisty; urgency=low + + * Fixed the install-mp3 script + + -- Ryan Kavanagh Tue, 6 Mar 2007 19:11:17 -0500 + +amarok (2:1.4.5-0ubuntu5) feisty; urgency=low + + * Added patches: + - kubuntu_05_magnatune_security_fix.diff. Fixes CVE #-2006-6979, + KDE Bug #138499 + - kubuntu_06_right_click_sound_control_fix.diff. KDE Bug #141672 + - kubuntu_07_monge_exports_correct_symbols.diff + * All patches from amarok SVN. + + -- Sarah Hobbs Thu, 15 Feb 2007 15:32:32 +1100 + +amarok (2:1.4.5-0ubuntu4) feisty; urgency=low + + * Correct thinko in .install for installing the missing files. + + -- Steve Kowalik Wed, 14 Feb 2007 00:17:29 +1100 + +amarok (2:1.4.5-0ubuntu3) feisty; urgency=low + + * Update libmtp build-dep to 0.1.3-0ubuntu1 + * Install missing files (cd player .desktop file, libhttp11, amarok_addaspodcast.desktop) + + -- Jonathan Riddell Wed, 7 Feb 2007 11:45:28 +0000 + +amarok (2:1.4.5-0ubuntu2) feisty; urgency=low + + * Added Build-dep libgpod-dev + * Fixed amarok.install + - Install collection bin files in the correct path + (Closes Malone #83454) + - Added back ipod lib (Closes Malone #83515) + + -- Anthony Mercatante Tue, 06 Feb 2007 19:36:32 +0100 + +amarok (2:1.4.5-0ubuntu1) feisty; urgency=low + + [ Brandon Holtsclaw ] + * New Upstream Release + * Removed the following patches , adopted upstream + - invoke_browser.patch + - kubuntu_05_lastfm_xine.diff + - some-binaries-in-usr-lib.patch + - sparc-asm.patch + + [ Sarah Hobbs ] + * Added dependancy kdebase-kio-plugins. Closes malone #66764 + * Compiling without stack smashing protection. Closes malone #81768 + + -- Brandon Holtsclaw Sun, 4 Feb 2007 00:46:12 -0600 + +amarok (2:1.4.4-0.3ubuntu4) feisty; urgency=low + + * No-change upload for the libpq4->libpq5 transition. + + -- Martin Pitt Mon, 15 Jan 2007 15:39:10 +0000 + +amarok (2:1.4.4-0.3ubuntu3) feisty; urgency=low + + * Rebuild against libtunepimp5 + + -- Jonathan Riddell Fri, 8 Dec 2006 10:47:51 +0000 + +amarok (2:1.4.4-0.3ubuntu2) feisty; urgency=low + + * Add patch kubuntu_05_lastfm_xine.diff from upstream to make + last.fm streams work with Xine 1.1.3 + + -- Jonathan Riddell Tue, 5 Dec 2006 13:03:34 +0000 + +amarok (2:1.4.4-0.3ubuntu1) feisty; urgency=low + + * Fake Sync from debian unstable + + -- Brandon Holtsclaw Thu, 23 Nov 2006 03:46:05 -0600 + +amarok (2:1.4.4-0ubuntu3) feisty; urgency=low + + * Compile with MTP Device Support + + -- Brandon Holtsclaw Tue, 14 Nov 2006 22:13:11 -0600 + +amarok (2:1.4.4-0ubuntu2) feisty; urgency=low + + * Add debian/kubuntu-media-amarok and + debian amarok_play_audiocd.desktop for good KDE integration + + -- Anthony Mercatante Fri, 03 Nov 2006 23:57:33 +0200 + +amarok (2:1.4.4-0ubuntu1) feisty; urgency=low + + * New Upstream Version + * Removed kubuntu_06_dapp_assert.diff and kubuntu_05_playlist_encoding.diff + adopted upstream + + -- Brandon Holtsclaw Thu, 26 Oct 2006 16:19:30 -0500 + +amarok (1.4.4-0.3) unstable; urgency=low + + * Non-maintainer upload. + * Applied patch invoke_browser.patch to allow amarok open external URLs. + (Closes: #397266). + * Removed dependency on xmms and updated README.Debian. Thanks to Bryan + Donlan and Michael Biebl. (Closes: #393141) + + -- Ana Beatriz Guerrero Lopez Sun, 19 Nov 2006 02:50:39 +0100 + +amarok (1.4.4-0.2) unstable; urgency=low + + * Non-maintainer upload. + * Applied patch to fix build on sparc. Thanks to Jurij Smakov for the patch. + + -- Ana Beatriz Guerrero Lopez Sat, 4 Nov 2006 10:19:37 +0100 + +amarok (1.4.4-0.1) unstable; urgency=low + + * Non-maintainer upload with permission from the maintainer. + * New upstream release. + * Dropped patch 143_provided_upstream_playlist_encoding.diff, + merged by upstream. + * Moved architecture-dependent files from /usr/share to + /usr/lib. Thanks to Ted Percival. (Closes: #392392) + * Updated debian/compat to 5. + + -- Ana Beatriz Guerrero Lopez Tue, 31 Oct 2006 21:59:59 +0100 + +amarok (2:1.4.3-0ubuntu10) edgy; urgency=low + + * Make sure amarok_njb support is installed to the correct location + * Closes Malone: #61492 + + -- Brandon Holtsclaw Sat, 14 Oct 2006 13:46:21 -0500 + +amarok (2:1.4.3-0ubuntu9) edgy; urgency=low + + * Set .pot name in debian/rules + + -- Jonathan Riddell Sun, 1 Oct 2006 12:44:07 +0100 + +amarok (2:1.4.3-0ubuntu8) edgy; urgency=low + + * The DAAP client would crash Amarok under certain conditions when + kdelibs was compiled with asserts on. Thanks to Ian Monroe + * Closes KDE: #132851 + + -- Brandon Holtsclaw Wed, 20 Sep 2006 21:10:11 -0500 + +amarok (2:1.4.3-0ubuntu7) edgy; urgency=low + + * Various fixes to install-mp3 + + -- Jonathan Riddell Wed, 20 Sep 2006 14:54:21 +0100 + +amarok (2:1.4.3-0ubuntu6) edgy; urgency=low + + * Added support for edgy ( and future TBA releases ) to install-mp3 + * Closes Malone #60637 + + -- Brandon Holtsclaw Sat, 16 Sep 2006 03:56:07 -0500 + +amarok (2:1.4.3-0ubuntu5) edgy; urgency=low + + * Fixed a typo that prevented Amarok configuring Nomad Jukebox + in debian/rules + + -- Brandon Holtsclaw Sat, 16 Sep 2006 01:48:11 -0500 + +amarok (2:1.4.3-0ubuntu4) edgy; urgency=low + + * Built --with-libnjb support ( Creative Nomad Devices ) + * Added kubuntu_05_playlist_encoding.diff. This bug could result + in failure to restore the current playlist. (BR 133613) + + -- Brandon Holtsclaw Fri, 15 Sep 2006 10:53:56 -0500 + +amarok (2:1.4.3-0ubuntu3) edgy; urgency=low + + * Fixed little error in install-mp3, in the case multiverse is + already activated. Code could be really optimized, but it works + as it is. I will probably make something clean after edgy release. + + -- Anthony Mercatante Tue, 13 Sep 2006 22:26:14 +0200 + +amarok (2:1.4.3-0ubuntu2) edgy; urgency=low + + * Improved install-mp3 to manage ubuntu/gnome and other desktops correctly. + (closes #59007) + + -- Anthony Mercatante Mon, 11 Sep 2006 17:02:14 +0200 + +amarok (2:1.4.3-0ubuntu1) edgy; urgency=low + + [ Brandon Holtsclaw ] + * New Upstream Release + * Removed kubuntu_0{5,6,7,8}_*.diff patches as they have been applyed upstream + * Added build-dep ruby1.8-dev and automake-1.9 as now required to build amarok + + [ Jonathan Riddell ] + * Remove automake1.7 build-dep + * Install all files + + -- Brandon Holtsclaw Mon, 4 Sep 2006 22:08:14 -0500 + +amarok (2:1.4.2-0ubuntu3) edgy; urgency=low + + [ Jonathan Riddell ] + * Remove kubuntu_03_podir.diff, not built with tar in .orig + + [ Sarah Hobbs ] + * Added a more verbose error message when install-mp3 script fails + + [ Brandon Holtsclaw ] + * Collection scanner would only restart a maximum of 2 times instead of + 20. (fixed in SVN revision 578922) - kubuntu_08_scanner.diff + * MTP mediadevice support would not compile against libmtp versions gt + 0.0.12. (fixed in SVN revision 576121) - kubuntu_06_mtp.diff + * AudioCD playback would stutter and sometimes freeze Amarok. (BR 133015) + - kubuntu_05_audiocd.diff + * Fixed bug which prevented Amarok from creating the collection database + in rare circumstances using SQLite. (BR 133072) - kubuntu_07_collection.diff + + -- Brandon Holtsclaw Thu, 31 Aug 2006 12:01:16 -0500 + +amarok (2:1.4.2-0ubuntu2) edgy; urgency=low + + * amarok_libvisual helper added to amarok.install (malone #57636) + * Fixed typo in Sugests for libvisual-0.4-plugins Closes Last Half malone #55779 + + -- Brandon Holtsclaw Sun, 27 Aug 2006 05:52:34 -0500 + +amarok (2:1.4.2-0ubuntu1) edgy; urgency=low + + [ Brandon Holtsclaw ] + * Removed libgstreamer0.10-dev as its not needed anylonger + gst support has been droped upstream and in kubuntu + * Added libhal-dev as a build dep (malone #55779) + + [ Daniel Molkentin ] + * Install DAAP media device + + [ Sarah Hobbs ] + * New upstream version. Closes #24063, #49098, #47179, #52958 and other bugs + * Moved python-qt3 from recommends to depends. Closes bugs #55075, #48724 + * Removed python from suggests (already a dep of python-qt3) + * Changed suggests libvisual-0.2 to libvisual0.4.0-plugins. Closes bug #55734 + * Compiled with libvisual support. Added build-dep libvisual-0.4-dev. Closes other half of bug #55734 + * Removed debian/amarok-gstreamer.install as we no longer distribute + amarok-gstreamer + * Change build-dep automake1.9 --> automake1.7 + * Changed build-dep debhelper --> debhelper (>=5) + * Bumped Compat to 5 + + -- Brandon Holtsclaw Wed, 23 Aug 2006 07:11:02 -0500 + +amarok (2:1.4.1-0ubuntu3) edgy; urgency=low + + * Make debian/install-mp3 executable. Closes bug #52994 + * Install amarokapp in /usr/bin. Closes bugs #16474, #52360 + * Stopped compiling with exscalibar support - upstream + removed the moodbar + + -- Sarah Hobbs Tue, 18 Jul 2006 13:55:53 +1000 + +amarok (2:1.4.1-0ubuntu2) edgy; urgency=low + + * Depend on amarok-xine not amarok-engines + + -- Jonathan Riddell Wed, 12 Jul 2006 00:01:33 +0000 + +amarok (2:1.4.1-0ubuntu1) edgy; urgency=low + + * New upstream release + + -- Jonathan Riddell Tue, 4 Jul 2006 22:46:21 +0000 + +amarok (1.4.0a-1) unstable; urgency=low + + * Revised tarball for 1.4.0 (closes: #367897), fixing the following issues: + + + does not botch migration from 1.3 SQLite collections, which in addition + caused further collection rebuilds to appear empty. (Closes: #368396) + + correctly closes database connections, thus not failing with "too many + open files" and deleting the collection after some hours in pause mode. + (Closes: #368086) + + audio CDs can be reproduced again. (Upstream #127388) + + * Switch to included SQLite; for some reason, dynamic linking against 3.3.5 + makes scores unfunctional. (Closes: #367468) + + -- Adeodato Simó Sat, 27 May 2006 15:23:14 +0200 + +amarok (1.4.0-1) unstable; urgency=low + + * New upstream release. The upstream tarball no longer ships the GStreamer + engine, and aRts support was dropped a while ago, and this upload only + includes the XINE engine. + + Bugs reported in the Debian BTS fixed in this version: + + + collection is updated at start up. (Closes: #330017) + + metadata for icecast streams is displayed. (Closes: #349796) + + the correct charset is used for lyrics URLs. (Closes: #352882) + + iPods are recognized even after emptying them. (Closes: #350305) + + non-ascii characters are displayed correctly under non UTF-8 + locales in the konqueror sidebar. (Closes: #353058) + + last.fm submission queue is flushed after network unavailability + even if no more tracks are played. (Closes: #344429) + + Regressions fixed since the latest beta: + + + iPod model detection works again, without needing libgpod-cvs. + (Closes: #364789) + + filling tags using MusicBrainz works again. (Closes: #364798) + + * Enable Moodbar support, now that Exscalibar has entered unstable. + (Closes: #364588) + + * Update Standards-Version to 3.7.2 (no changes required). + + -- Adeodato Simó Sun, 14 May 2006 16:42:14 -0500 + +amarok (1.4-beta3c-1) experimental; urgency=low + + * Third beta for the upcoming 1.4 version packaged. + + * Build against libtunepimp3-dev. + + -- Adeodato Simó Sat, 15 Apr 2006 19:47:54 +0200 + +amarok (1.4-beta2-3) experimental; urgency=low + + * Rebuild against libmysqlclient15off. (Closes: #358490) + + -- Adeodato Simó Thu, 23 Mar 2006 02:18:56 +0100 + +amarok (1.4-beta2-2) experimental; urgency=low + + * Fix yesterday's brainfart: aKode can't output to aRts, so remove this + statement from the description. + + * In addition, and after a bit of chit-chat with upstream, follow their + wishes and not package aKode at all (bye amarok-arts), and don't include + GStreamer 0.10 support for now. + + -- Adeodato Simó Mon, 6 Mar 2006 23:37:43 +0100 + +amarok (1.4-beta2-1) experimental; urgency=low + + * Second beta for the upcoming 1.4 version packaged. + + This release drops the aRts engine; in order to keep support for + outputting to aRts, ship the aKode engine in the amarok-arts package. + + Also, GStreamer 0.8 support is dropped in favour of GStreamer 0.10. Update + build-dependencies and amarok-gstreamer's dependencies accordingly. + + * Use strncpy instead of qstrdup in the patch for main.cpp, so that argv[0] + is overwritten correctly. This closes: #352171 (amaroK not remembering the + desktop it was on upon login), and incidentally makes Erich Schubert happy. + + * Drop build-dependency on libgtk2.0-dev now that #353590 is fixed. + + -- Adeodato Simó Mon, 6 Mar 2006 05:44:33 +0100 + +amarok (1.4-beta1-r511476b) experimental; urgency=low + + * First beta (plus SVN) for the upcoming 1.4 version packaged. + (Closes: #352590) + + * Update build-depends to support iRiver iFP (B-D: libifp-dev, libusb-dev), + and iPod via libgpod (B-D: libgpod-dev; plus libgtk2.0-dev due to #353590). + + * Since lyrics downloading is now implemented in a separate Ruby script, + promote ruby from Suggests to Recommends, so that functionality is ideally + not lost. Add a note with this information to README.Debian. + + * Link against sqlite dynamically again, since amaroK 1.4 can cope with the + restriction explained in the changelog entry for 1.3.1-1 and Bug#326648. + + -- Adeodato Simó Mon, 20 Feb 2006 05:42:15 +0100 + +amarok (1.3.9-1) unstable; urgency=medium + + * New upstream bugfix release. + + * Build against libtunepimp3-dev. (Closes: #359086) + + -- Adeodato Simó Thu, 27 Apr 2006 00:33:29 +0200 + +amarok (1.3.8-1) unstable; urgency=low + + * New upstream bugfix release: + + + fetching lyrics works again. (Closes: #344509) + + * Do not use g++-3.4 in arm, m68k and hppa anymore, sid's g++-4.0 is + expected to work. (Closes: #342953) + + * Update MySQL build-dependency to libmysqlclient15-dev. (Closes: #343759) + + * Switch patch management to quilt, and make use of patchsys-quilt.mk. + + * Drop build-depends version constraints that are satisfied with stable. + Drop the ones for kdebase-dev and kdemultimedia-dev as well, which were + transient and all arches have the minimum required versions in sid now. + + -- Adeodato Simó Wed, 18 Jan 2006 01:43:40 +0100 + +amarok (1.3.7-1) unstable; urgency=low + + * New upstream bugfix release. + + * Built against kdelibs4c2a, so installable in sid again. (Closes: #341959) + Temporarily bump build-deps on kdebase-dev and kdemultimedia-dev. + + * Remove debian/patches/taglib-1.3.1-suffices.diff, since taglib 1.4 is in + testing and unstable, and I'll be using a backport for sarge packages. + Bump version constraint in debian/control. + + * Again, update my e-mail address in debian/control, yada yada. + + -- Adeodato Simó Wed, 07 Dec 2005 06:44:59 +0100 + +amarok (2:1.3.9-0ubuntu4) dapper; urgency=low + + * debian/cdbs/kde.mk: + - added dh_iconcache. + + -- Daniel Holbach Sun, 21 May 2006 16:16:47 +0200 + +amarok (2:1.3.9-0ubuntu3) dapper; urgency=low + + * Don't install hr translations, it's really Hindi + Closes Malone #44517 + + -- Jonathan Riddell Tue, 16 May 2006 00:14:56 +0300 + +amarok (2:1.3.9-0ubuntu2) dapper; urgency=low + + * Rebuild against the new libmysqlclient15off with correct symbols. + + -- Adam Conrad Thu, 6 Apr 2006 12:46:44 +1000 + +amarok (2:1.3.9-0ubuntu1) dapper; urgency=low + + * New upstream release + * Use automake1.7, that's what the upstream file seems to use + + -- Jonathan Riddell Sat, 25 Mar 2006 17:32:01 +0000 + +amarok (2:1.3.8-0ubuntu7) dapper; urgency=low + + * Re-uploaded for new language-pack scripts, no changes + + -- Jonathan Riddell Wed, 15 Mar 2006 18:49:41 +0000 + +amarok (2:1.3.8-0ubuntu6) dapper; urgency=low + + * Re-uploaded for new language-pack scripts, no changes + + -- Jonathan Riddell Thu, 23 Feb 2006 12:28:47 +0000 + +amarok (2:1.3.8-0ubuntu5) dapper; urgency=low + + * Add kubuntu_03_podir.diff, change podir so .pot file gets + generated in a place that keeps the language pack scripts happy + + -- Jonathan Riddell Mon, 20 Feb 2006 19:09:30 +0000 + +amarok (2:1.3.8-0ubuntu4) dapper; urgency=low + + * Remove amarok-gstreamer from enginePackages substvars + + -- Jonathan Riddell Mon, 20 Feb 2006 11:44:19 +0000 + +amarok (2:1.3.8-0ubuntu3) dapper; urgency=low + + * Remove use of GCC 3.4 + + -- Jonathan Riddell Thu, 16 Feb 2006 10:52:51 +0000 + +amarok (2:1.3.8-0ubuntu2) dapper; urgency=low + + * Remove GStreamer 0.8 support, default to xine + * Change from libmysqlclient14-dev to libmysqlclient15-dev build-dep + + -- Jonathan Riddell Wed, 1 Feb 2006 11:56:01 +0000 + +amarok (2:1.3.8-0ubuntu1) dapper; urgency=low + + * New upstream release + + -- Jonathan Riddell Sun, 15 Jan 2006 19:10:14 +0000 + +amarok (2:1.3.7-0ubuntu4) dapper; urgency=low + + * weaken build dependencies + + -- Reinhard Tartler Fri, 30 Dec 2005 14:55:13 +0100 + +amarok (2:1.3.7-0ubuntu3) dapper; urgency=low + + * Add kubuntu_02_read_kubuntu_config.diff to make it read Kubuntu's + amarokrc file, which hides the splash screen + + -- Jonathan Riddell Thu, 15 Dec 2005 20:13:28 +0000 + +amarok (2:1.3.7-0ubuntu2) dapper; urgency=low + + * debian/control: Removed the text about libvisual. There is no libvisual + support right now in ubuntu + + -- Stephan Hermann Wed, 7 Dec 2005 23:52:58 +0100 + +amarok (2:1.3.7-0ubuntu1) dapper; urgency=low + + * New upstream release + + -- Jonathan Riddell Tue, 6 Dec 2005 20:59:31 +0000 + +amarok (2:1.3.6-1ubuntu3) dapper; urgency=low + + * Make amarok-gstreamer default engine + * Add kubuntu_01_kdepot.diff for pot generation + + -- Jonathan Riddell Tue, 29 Nov 2005 19:18:38 +0000 + +amarok (2:1.3.6-1ubuntu2) dapper; urgency=low + + * debian/substvars: moved gstreamer0.8-mad to Suggests section + * Update kde.mk for .pot generation + + -- Jonathan Riddell Sat, 26 Nov 2005 02:52:27 +0000 + +amarok (2:1.3.6-1ubuntu1) dapper; urgency=low + + * Sync with debian, and readded the Ubuntu specific Epoch + * Merged the debian/changelog + * debian/control: + - Removed libvisual-dev, libsdl1.2-dev from build-deps + - Removed libvisual-plugins from Suggests + * debian/amarok.install: prevent installing amarok_libvisual + + -- Stephan Hermann Sun, 20 Nov 2005 18:32:06 +0100 + +amarok (1.3.6-1) unstable; urgency=low + + * New upstream bugfix release: + + + last.fm submissions are properly saved on disk while offline again; they + had been broken by Qt 3.3.5. (Closes: #334469, #337109) + + includes missing semicolon in amarok.desktop. (Closes: #336026) + + * Update my e-mail address in debian/control. + + -- Adeodato Simó Tue, 08 Nov 2005 10:40:42 +0100 + +amarok (1.3.5-1) unstable; urgency=low + + * New upstream bugfix release, quickly released to fix a potential crash at + startup (upstream #114983). + + -- Adeodato Simó Tue, 25 Oct 2005 14:55:29 +0200 + +amarok (1.3.4-1) unstable; urgency=low + + * New upstream bugfix release, which makes this maintainer of yours + immensely happy because a fix for upstream #114195 is included. + ("Collection scanner ignored files with non-ascii characters"). + + * Add libvisual support (closes: #335053). Thanks to Jean-Rémy Falleri for + the heads-up. Changes needed: + + + add libvisual0.2-dev and libsdl1.2-dev to Build-Depends. + + add libvisual0.2-plugins to Suggests, and mention it in the paragraph + regarding visualization plugins in amarok's description. + + add the appropriate snippet to some-binaries-in-usr-lib.patch in order + to cope with amarok_libvisual installed in /usr/lib/amarok instead of + /usr/bin, as mandated by Policy. + + -- Adeodato Simó Mon, 24 Oct 2005 09:30:22 +0200 + +amarok (1.3.3-1) unstable; urgency=low + + * New upstream bugfix release: + + + does not loose playlist / podcasts on restart. (Closes: #329878) + + PostgreSQL configuration dialog no longer shows MySQL's. (Closes: #327630) + + * Updated the Debian menu icons to the new logo. + + * Updated copyright notice, list of authors, and FSF postal address in + debian/copyright. + + -- Adeodato Simó Thu, 13 Oct 2005 00:04:34 +0200 + +amarok (1.3.2-1) unstable; urgency=low + + * New upstream bugfix release, featuring the return of alsasink support. + + -- Adeodato Simó Wed, 21 Sep 2005 04:14:52 +0200 + +amarok (1.3.1-2) unstable; urgency=low + + * Use g++ 3.4 in arm, m68k and hppa. + + -- Adeodato Simó Tue, 06 Sep 2005 00:21:03 +0200 + +amarok (1.3.1-1) unstable; urgency=low + + * New upstream bugfix release. Beware, though, that the GStreamer engine has + been rewritten (!), and ALSASINK SUPPORT REMOVED due to temporary breakage. + + * Use the internal copy of sqlite for now. This fixes the collection being + non functional with SQLite 3.2.5 due to this version preventing a database + handle opened in one thread to be used in another. See Bug#326648 for + reference. (Closes: #326562, #312386) + + * Enable PostgreSQL support (closes: #326612, #326713): + + + debian/rules: pass --enable-postgresql to ./configure. + + debian/control: add libpq-dev to Build-Depends. + + (Before somebody comes around with the word "bloat" ready, libpq4 is 6 + times smaller than libmysqlclient14.) + + * Regain preciousss "my `grep -c NEEDED` is smaller than yours" karma by not + using LIBADD in the statusbar convenience lib. The Depends line had gained + some weight in 1.2.3-1. + + -- Adeodato Simó Mon, 05 Sep 2005 20:57:41 +0200 + +amarok (2:1.3.1-0ubuntu4) breezy; urgency=low + + * Add kubuntu_02_column_sort_crash.diff fix a + crash on column sort http://bugs.kde.org/113042 + + -- Jonathan Riddell Tue, 4 Oct 2005 16:14:12 +0100 + +amarok (2:1.3.1-0ubuntu3) breezy; urgency=low + + * Add kubuntu_01_alsasink.diff to fix and reenable alsasink + + -- Jonathan Riddell Mon, 3 Oct 2005 22:40:05 +0100 + +amarok (2:1.3.1-0ubuntu2) breezy; urgency=low + + * debian/control: added khelpcenter as suggestion + + -- Stephan Hermann Sat, 17 Sep 2005 02:23:08 +0200 + +amarok (2:1.3.1-0ubuntu1) breezy; urgency=low + + * New Upstream Release + * Merged the Debian package from Adeodato Simó + * debian/substvars: moved gstreamer0.8-mad to Suggests section + + -- Stephan Hermann Fri, 16 Sep 2005 19:59:06 +0200 + +amarok (1.3.0-1) unstable; urgency=low + + * New upstream release packaged (closes: #323249). Bugs reported in the + Debian BTS fixed in this version: + + + does not display advertisements in lyrics. (Closes: #321499) + + pre-amp in the equalizer works with XINE engine too. (Closes: #283750) + + includes PartyMode. (Closes: #293293) + + includes equalizer presets. (Closes: #283761) + + builds fine with GCC 4.0. (Closes: #314779) + + * Updated Build-Dependencies: + + + automake1.6 to automake1.9. + + libmysqlclient12-dev to libmysqlclient14-dev. + + temporarily bump version constraint in kdemultimedia-dev and kdebase-dev + in order to allow an early upload in the middle of the KDE transition. + + * Adjustments to the build-system: + + + do not require TagLib 1.4.0 since it's not in Debian yet (#323280). + + don't use KDE_FINAL in amarok/src since both MySQL and KDE have had the + brilliant idea to define a struct/class named "NET". + + * This version links against libtunepimp2c2, so libtunepimp2 0.3.0-4 + breakage does not affect us anymore. (Closes: #318000) + + * Update Standards-Version to 3.6.2 (no changes required). + + -- Adeodato Simó Sat, 03 Sep 2005 01:42:56 +0200 + +amarok (1.2.4-1) unstable; urgency=low + + * The "following Debian Policy is cool, except when it's not" release. + + * New upstream bugfix release: + + + amaroK now correctly displays the name of the first available engine, + instead of an empty line. (Closes: #307949) + + * The KDE Session Manager can now restore amaroK on login (closes: #302852, + #308099). Patch amarokapp to set its own argv[0] to 'amarok', since for the + session manager to restore an application the binary must be in the $PATH. + + * Made the crash handler aware that amarokapp is in /usr/lib/amarok, and not + in /usr/bin. + + * Include small patch to fix upstream bug 103510 ("systray icon continues + 'playing' after songs end, if 'clear list' was hit while playing"). + + -- Adeodato Simó Mon, 06 Jun 2005 00:08:28 +0200 + +amarok (2:1.2.4-0ubuntu4) breezy; urgency=low + + * Rebuild for the xorg -> mesa GL/GLU transition. + + -- Adam Conrad Sun, 21 Aug 2005 19:34:41 +1000 + +amarok (2:1.2.4-0ubuntu3) breezy; urgency=low + + * Add kubuntu_02_gstreamer_output.patch to default GStreamer to alsasink + + -- Jonathan Riddell Wed, 13 Jul 2005 18:19:28 +0000 + +amarok (2:1.2.4-0ubuntu2) breezy; urgency=low + + * Default to GStreamer plugin + + -- Jonathan Riddell Wed, 6 Jul 2005 15:30:52 +0000 + +amarok (2:1.2.4-0ubuntu1) breezy; urgency=low + + * New upstream release + * Add kubuntu_01_gcc4_fixes.patch to fix compiler errors + + -- Jonathan Riddell Fri, 3 Jun 2005 17:22:10 +0000 + +amarok (1.2.3-1) unstable; urgency=low + + * New upstream bugfix release. + + * This version fixes an important memory leak in the GStreamer engine that + happened when a radio stream stalled. (Closes: #299931) + + -- Adeodato Simó Tue, 29 Mar 2005 01:43:28 +0200 + +amarok (2:1.2.3-1ubuntu4) hoary; urgency=low + + * Revert back to amarok-arts on request of mdz + + -- Chris Halls Wed, 6 Apr 2005 09:33:35 +0100 + +amarok (2:1.2.3-1ubuntu3) hoary; urgency=low + + * Switch default engine to amarok-xine, which is better supported + upstream and is less buggy (Hoary: #8429, #8255) + + -- Chris Halls Mon, 4 Apr 2005 20:01:48 +0100 + +amarok (2:1.2.3-1ubuntu2) hoary; urgency=low + + * Add build-depend on libtool. + * Remove automake1.6 patch + + -- Jonathan Riddell Wed, 30 Mar 2005 14:35:20 +0100 + +amarok (2:1.2.3-1ubuntu1) hoary; urgency=low + + * Sync with Debian + + -- Jonathan Riddell Wed, 30 Mar 2005 04:25:27 +0000 + +amarok (1.2.2-1) kalyxo-unstable; urgency=low + + * New upstream bugfix release. + + * Added a menu file, plus XPM icons. + + * Switched to tarball-in-tarball for the .orig.tar.gz (which is sensibly + smaller now, since upstream uses bz2). Added bzip2 to Build-Depends. + + * Build-depend on automake1.6 and libtool, and regenerate configure and + Makefiles.in at build-time. + + * Use the kde.mk class maintained by the Debian KDE Maintainers, instead + of the one shipped with cdbs. + + -- Adeodato Simó Thu, 17 Mar 2005 19:38:34 +0100 + +amarok (1.2.1-1) unstable; urgency=low + + * New upstream bugfix release. + + * Include patch from CVS to make amaroK bind listening TCP connections to + the local interface only. Related to Bug#297693, but not the same. + + -- Adeodato Simó Fri, 04 Mar 2005 14:54:34 +0100 + +amarok (1.2.0-1) unstable; urgency=low + + * New upstream release packaged (closes: #296139). Lots of improvements and + new functionality, see the changelog or http://amarok.kde.org for details. + Bugs reported in the Debian BTS fixed with in this version: + + + the search text input element is now cleared when the user writes + something there. (Closes: #278359) + + + analyzers work with the XINE engine. (Closes: #287091) + + * amaroK's collection can be now stored in a MySQL database: + + + Build-Depend on libmysqlclient12-dev + + + Pass --enable-mysql to configure. + + * amaroK now includes a sidebar plugin for Konqueror: + + + debian/amarok.install: + - add files for the konqueror sidebar. + + + debian/control: + - added kdebase-dev as Build-Dependency. + + + debian/rules: + - exclude konqsidebar_universalamarok.so from dh_shlibdeps, so that + amarok doesn't end up depending on konqueror. (The plugin will be + ignored in systems without konqueror installed.) + + * Other changes: + + + amaroK now ships several scripts to enhance it. These are written in + Python and Ruby, so add those as suggested packages. Added note to + README.Debian about this, too. + + + removed sqlite3_in_configure.in.patch, no longer necessary in 1.2. + + + added www-browser as an alternative for the konqueror suggests, since + upstream fixed the code so that the configured browser is used. + + + renamed debian/README to debian/README.Debian, so that it gets + installed. D'oh! + + + debian/control: + - remove Build-Dependency on libkjsembed-dev, no longer needed. + + + debian/amarok.install: + - install amarok.profile.xml into /usr/share/apps/profiles. + + -- Adeodato Simó Wed, 23 Feb 2005 03:03:37 +0100 + +amarok (1.1.1-2) unstable; urgency=high + + * Upload to get rid of the dependency on libflac4, which is not longer in + the archive (closes: #289344). Urgency set to high as other packages with + RC bug fixes can't enter testing because of the libflac6 transition not + being ready. + + + 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/control: + - version Build-Dependency on libtunepimp2-dev to (>= 0.3.0-2.1). + + * Some new versions of libraries have become available in Debian since the + last upload: + + + Taglib 1.3 is now in the archive: + - removed debian/patches/taglib-1.2-suffices.patch. + - update Build-Depends to libtag1-dev (>> 1.3.1). + + + SQLite 3 is now in the archive: + - changed Build-Depends on libsqlite0-dev to libsqlite3-dev. + - pass --without-included-sqlite to ./configure. + - patch configure.in to check for sqlite3 (>= 3.0). Upstream forgot to + update this check in the 1.1 series. [sqlite3_in_configure.in.patch] + + * New package relationships: + + + amarok now recommends kdemultimedia-kio-plugins, which is needed to play + audio CDs. + + + amarok now suggests konqueror, since it's called in the MusicBrainz + dialog and some other places. (Closes: #282523) + + * Created a README.Debian files with the following: + + + Explain why the amarokapp and amarok_xmmswrapper2 binaries are shipped + in /usr/lib/amarok instead of /usr/bin, differing from upstream. + + + Describe a fix for the 'Socket-path is not a link or a directory' error. + + + Explicitly mention what is needed to play audio CDs in amarok. + + * Other changes: + + + Patched admin/configure.in.min to include AM_MAINTAINER_MODE. To make + the .diff.gz stuff smaller, force automake-1.6 (which upstream uses) in + admin/detect-autoconf.sh. [am_maintainer_mode.patch, automake-1.6.patch] + + + Prevent admin/cvs.sh from creating .gmo files at "make dist" time, since + those can't be shipped in the .diff.gz. [gmo_files_at_build_time.patch] + + + debian/amarok.1: + - correct "hyphen vs. minus sign" usage. + + -- Adeodato Simó Fri, 14 Jan 2005 01:54:47 +0100 + +amarok (1.1.1-1) unstable; urgency=low + + * New upstream release packaged. Most notably, fixes several GStreamer + engine related bugs. + + * debian/control: add to amarok-gstreamer's description that is not possible + to use artssink for output. + + * debian/rules: + - call dh_install with --list-missing (DEB_DH_INSTALL_ARGS). + + * debian/patches/: + - removed proper-otherlang-handbook-path.patch, issue fixed upstream. + + -- Adeodato Simó Sat, 09 Oct 2004 22:51:06 +0200 + +amarok (1.1.0-2) unstable; urgency=low + + * Fix the location of translated amaroK handbook: kde/HTML/$LANG/amarok, not + kde/HTML/$LANG directly. [debian/patches/proper-otherlang-handbook-path.patch] + + -- Adeodato Simó Mon, 27 Sep 2004 14:02:30 +0200 + +amarok (1.1.0-1) unstable; urgency=low + + * New upstream version: + - several last minute fixes. + - includes handbook in several languages (da, et, fr, it, pt, sv). + + * First upload to Debian (closes: #236696). + + -- Adeodato Simó Mon, 27 Sep 2004 01:53:56 +0200 + +amarok (1.1-cvs-0+kalyxo1) experimental; urgency=low + + * New maintainer. Thanks to Peter Rockai for his initial work. + + * Updated to amaroK 1.1 CVS (2004-09-24): + - temporarily link statically against libsqlite, since sqlite >= 3.0.7 is + required and is not available in Debian (requested in #272271). + - added debian/patches/taglib-1.2-suffices.patch to lower the requirement + from taglib 1.3 (requested in #273029) to 1.2, which is enough. + - new package amarok-xine (yet another engine for amaroK, hurray!) + - added the following Build-Dependencies: + + libkjsembed-dev (amaroK is now JavaScript scriptable). + + libtunepimp2-dev (MusicBrainz support). + + libxine-dev (for the xine engine). + + libtag1-dev (missing). + + * New package amarok-engines: + - depends on all the available engine packages and will be installed by + default unless the user specifies an specific engine. + - all the amarok-* packages Provide: amarok-engine, and amarok now + Depends: amarok-engines | amarok-engine. + + * Removed the amarok-xmms package: + - its single binary amarok_xmmswrapper2 is now included in the main amarok + package. + - include some hackery to prevent amarok from depending on xmms (!). + amaroK just does a no-op and issues a warning on stderr if xmms is not + installed and user opens the visualizations menu, so this seems safe. + A xmms-lib package (in which amarok could easily depend) is requested in + #272913. + + * Install amarokapp and amarok_xmmswrapper2 in /usr/lib/amarok instead of + /usr/bin: + - needed for FHS/Debian Policy compliance. + - added debian/patches/some-binaries-in-usr-lib.patch to fix locations in + source (amarok/src/loader/loader.cpp, amarok/src/socketserver.cpp). + + * Added lintian overrides for an aRts module which must go in /usr/lib + despite not being a shared library. noatun and some other arts-related + packages have the same problem, if someone has a solution please share. + + * Made /usr/share/doc/amarok-* symlinks to /usr/share/doc/amarok. + + * Do not make amarok-arts depend on the meta-package "arts"; the + dependencies given by ${shlib:Depends} do suffice. + + * debian/control: updated to Standars-Version 3.6.1. + + -- Adeodato Simó Fri, 24 Sep 2004 02:49:46 +0200 + +amarok (1.0.2-1) unstable; urgency=low + + * New upstream version. + + -- Peter Rockai (mornfall) Thu, 5 Aug 2004 14:23:23 +0200 + +amarok (1.0.1-1) unstable; urgency=low + + * New upstream version + * Make depends among amarok packages versioned + * Prepare to upload into Debian, closes: #236696 + * Add manpage for amarok by Alejandro Exojo + + -- Peter Rockai (mornfall) Wed, 30 Jun 2004 23:24:16 +0200 + +amarok (1.0.0-3) unstable; urgency=low + + * Dynamically link against libsqlite0 + * Fix gstreamer dependencies + * Various small fixes (sections, descriptions, doc dirs) + * Thanks go to Adeodato Simó for help with various issues + + -- Peter Rockai (mornfall) Sat, 26 Jun 2004 23:06:00 +0200 + +amarok (1.0.0-2) unstable; urgency=low + + * Make the depends on amarok-gstreamer a bit more tight. Only depend on + audiosink, recommend the decoder plugins. + * Make the amarok engines depend on amarok itself. + * Compile with xmms visualisation support. + + -- Peter Rockai (mornfall) Wed, 23 Jun 2004 13:58:12 +0200 + +amarok (1.0.0-1) unstable; urgency=low + + * Build official 1.0.0 release. + + -- Peter Rockai (mornfall) Wed, 16 Jun 2004 23:48:52 +0200 + +amarok (1.0-pre1-2) unstable; urgency=low + + * Fix amarok-arts package, was missing mcop files. Duh. + + -- Peter Rockai (mornfall) Wed, 16 Jun 2004 23:25:29 +0200 + +amarok (1.0-pre1-1) unstable; urgency=low + + * First 1.0.0 prerelease. + + -- Peter Rockai (mornfall) Wed, 16 Jun 2004 10:18:31 +0200 + +amarok (1.0-beta4-2) unstable; urgency=low + + * Patch to final beta4 version. + + -- Peter Rockai (mornfall) Tue, 1 Jun 2004 17:47:53 +0200 + +amarok (1.0-beta4-1) unstable; urgency=low + + * New upstream RC (beta4-rc1). + * Build with GST support. + + -- Peter Rockai (mornfall) Tue, 1 Jun 2004 10:24:09 +0200 + +amarok (1.0-beta3-1) unstable; urgency=low + + * New upstream release. + + -- Peter Rockai (mornfall) Sat, 29 May 2004 17:08:55 +0200 + +amarok (1.0-beta1-0) workstation-unstable; urgency=low + + * Initial packaging + + -- Peter Rockai (mornfall) Sun, 11 Apr 2004 17:05:00 +0200 + --- amarok-2.0.1.1mysql5.1.30.orig/debian/amarok-common.install +++ amarok-2.0.1.1mysql5.1.30/debian/amarok-common.install @@ -0,0 +1,57 @@ +usr/share/icons/hicolor/* +usr/share/kde4/apps/amarok/data/* +usr/share/kde4/apps/amarok/icons/* +usr/share/kde4/apps/amarok/images/* +usr/share/kde4/apps/amarok/scripts/librivox_service/LibrivoxEmblem.png +usr/share/kde4/apps/amarok/scripts/librivox_service/LibrivoxIcon.png +usr/share/kde4/apps/amarok/scripts/librivox_service/LibrivoxLogo.png +usr/share/kde4/apps/amarok/scripts/librivox_service/LibrivoxService.html +usr/share/kde4/apps/amarok/scripts/librivox_service/README +usr/share/kde4/apps/amarok/scripts/librivox_service/audio_book128.png +usr/share/kde4/apps/amarok/scripts/librivox_service/main.js +usr/share/kde4/apps/amarok/scripts/librivox_service/script.spec +usr/share/kde4/apps/amarok/scripts/lyrics_lyricwiki/main.js +usr/share/kde4/apps/amarok/scripts/lyrics_lyricwiki/script.spec +usr/share/kde4/apps/amarok/scripts/radio_station_service/main.js +usr/share/kde4/apps/amarok/scripts/radio_station_service/script.spec +usr/share/kde4/apps/amarok/scripts/script_console/main.js +usr/share/kde4/apps/amarok/scripts/script_console/script.spec +usr/share/kde4/apps/desktoptheme/* +usr/share/kde4/config.kcfg/* +usr/share/kde4/config/amarok.knsrc +usr/share/kde4/services/ServiceMenus/* +usr/share/kde4/services/amarok-containment-context.desktop +usr/share/kde4/services/amarok-context-applet-albums.desktop +usr/share/kde4/services/amarok-context-applet-currenttrack.desktop +usr/share/kde4/services/amarok-context-applet-lyrics.desktop +usr/share/kde4/services/amarok-context-applet-mediadevices.desktop +usr/share/kde4/services/amarok-context-applet-serviceinfo.desktop +usr/share/kde4/services/amarok-context-applet-wikipedia.desktop +usr/share/kde4/services/amarok-data-engine-current.desktop +usr/share/kde4/services/amarok-data-engine-lyrics.desktop +usr/share/kde4/services/amarok-data-engine-service.desktop +usr/share/kde4/services/amarok-data-engine-wikipedia.desktop +usr/share/kde4/services/amarok_collection-daapcollection.desktop +usr/share/kde4/services/amarok_collection-ipodcollection.desktop +usr/share/kde4/services/amarok_collection-mtpcollection.desktop +usr/share/kde4/services/amarok_collection-sqlcollection.desktop +usr/share/kde4/services/amarok_service_ampache.desktop +usr/share/kde4/services/amarok_service_ampache_config.desktop +usr/share/kde4/services/amarok_service_jamendo.desktop +usr/share/kde4/services/amarok_service_lastfm.desktop +usr/share/kde4/services/amarok_service_lastfm_config.desktop +usr/share/kde4/services/amarok_service_magnatunestore.desktop +usr/share/kde4/services/amarok_service_magnatunestore_config.desktop +usr/share/kde4/services/amarok_service_mp3tunes.desktop +usr/share/kde4/services/amarok_service_mp3tunes_config.desktop +usr/share/kde4/services/amarok_service_opmldirectory.desktop +usr/share/kde4/services/amarok_service_shoutcast.desktop +usr/share/kde4/services/amaroklastfm.protocol +usr/share/kde4/servicetypes/amarok_codecinstall.desktop +usr/share/kde4/servicetypes/amarok_containment.desktop +usr/share/kde4/servicetypes/amarok_context_applet.desktop +usr/share/kde4/servicetypes/amarok_data_engine.desktop +usr/share/kde4/servicetypes/amarok_plugin.desktop +usr/share/locale/* +../../debian/tmpmysql/usr/share/mysql-5.1/mysql/*/ usr/share/mysql-5.1/mysql +../../debian/tmpmysql/usr/share/mysql-5.1/mysql/errmsg.txt usr/share/mysql-5.1/mysql --- amarok-2.0.1.1mysql5.1.30.orig/debian/.directory +++ amarok-2.0.1.1mysql5.1.30/debian/.directory @@ -0,0 +1,6 @@ +[Dolphin] +Timestamp=2009,1,14,12,31,25 +ViewMode=1 + +[Settings] +ShowDotFiles=true --- amarok-2.0.1.1mysql5.1.30.orig/debian/icons/amarok.xpm +++ amarok-2.0.1.1mysql5.1.30/debian/icons/amarok.xpm @@ -0,0 +1,220 @@ +/* XPM */ +static char *amarok[] = { +/* columns rows colors chars-per-pixel */ +"32 32 182 2", +" c #000000", +". c #020508", +"X c #03090E", +"o c #0E0E0E", +"O c #050A10", +"+ c #09131E", +"@ c #101112", +"# c #14191F", +"$ c #0A1622", +"% c #0B1926", +"& c #0D1C2C", +"* c #0E1F30", +"= c #161E26", +"- c #0F2032", +"; c #18222D", +": c #102336", +"> c #12273C", +", c #1A2632", +"< c #1C2B3B", +"1 c #142C44", +"2 c #162F48", +"3 c #16304A", +"4 c #18324E", +"5 c #183450", +"6 c #1B3A5A", +"7 c #20344A", +"8 c #223A52", +"9 c #1E4064", +"0 c #22456B", +"q c #23486E", +"w c #28496F", +"e c #244A72", +"r c #244D78", +"t c #2B4C72", +"y c #26517E", +"u c #2C5077", +"i c #2B537B", +"p c #325175", +"a c #355479", +"s c #33587E", +"d c #395575", +"f c #38567A", +"g c #3B597C", +"h c #405C7D", +"j c #49627D", +"k c #52677E", +"l c #275280", +"z c #285685", +"x c #295788", +"c c #2D5982", +"v c #2A598A", +"b c #2C5D91", +"n c #355C83", +"m c #395E83", +"M c #2E6094", +"N c #336189", +"B c #3A658C", +"V c #336395", +"C c #356892", +"Z c #386798", +"A c #3C6C93", +"S c #3C6A9A", +"D c #3D729A", +"F c #425D80", +"G c #456083", +"H c #41678D", +"J c #496485", +"K c #4C6688", +"L c #4F6889", +"P c #466E93", +"I c #426E9B", +"U c #417096", +"Y c #42739B", +"T c #47789F", +"R c #4B749C", +"E c #506782", +"W c #536A84", +"Q c #536C8B", +"! c #586C82", +"~ c #5D7084", +"^ c #5D748D", +"/ c #51769D", +"( c #55799E", +") c #5A7190", +"_ c #447AA1", +"` c #457CA8", +"' c #4F78A2", +"] c #5C7EA1", +"[ c #627B96", +"{ c #6A7F96", +"} c #4681AB", +"| c #4984AB", +" . c #4E8BB2", +".. c #5082A7", +"X. c #5084AA", +"o. c #5E80A4", +"O. c #5B81A9", +"+. c #548CB2", +"@. c #5390B6", +"#. c #5594BD", +"$. c #5B94BC", +"%. c #5E99BE", +"&. c #6C8197", +"*. c #69809B", +"=. c #758699", +"-. c #778A9D", +";. c #7C8691", +":. c #798A9D", +">. c #6080A2", +",. c #6A86A3", +"<. c #6E8CAB", +"1. c #608FB2", +"2. c #7389A3", +"3. c #7B91A6", +"4. c #7B9AB9", +"5. c #579AC1", +"6. c #5B9EC5", +"7. c #669EC2", +"8. c #68A8CC", +"9. c #6AACD0", +"0. c #72ABCD", +"q. c #78AFCE", +"w. c #71B0D2", +"e. c #7BB4D4", +"r. c #858F9B", +"t. c #87909A", +"y. c #8D949B", +"u. c #94989C", +"i. c #9D9D9D", +"p. c #8493A3", +"a. c #8395A8", +"s. c #8798A9", +"d. c #859FB9", +"f. c #9199A3", +"g. c #8EA2B7", +"h. c #8CA5BF", +"j. c #96A2AB", +"k. c #9BA4AD", +"l. c #9DA9B5", +"z. c #A3A3A3", +"x. c #A6A9AC", +"c. c #ACACAC", +"v. c #A3ABB2", +"b. c #A4AEB8", +"n. c #AAAEB1", +"m. c #ADB0B3", +"M. c #ADB4BB", +"N. c #B3B3B3", +"B. c #B0B7BE", +"V. c #B6B8B9", +"C. c #BBBBBB", +"Z. c #8FA7C1", +"A. c #87B6D1", +"S. c #85BBD7", +"D. c #A2B1C1", +"F. c #AFBBC7", +"G. c #ADBAC8", +"H. c #B2BCC7", +"J. c #B0BCCA", +"K. c #B8BDC3", +"L. c #93C2DA", +"P. c #9EC9DE", +"I. c #BFC3C7", +"U. c #B0C1D3", +"Y. c #AFD1E1", +"T. c #B4D6E4", +"R. c #C3C3C4", +"E. c #C1C4C8", +"W. c #CCCCCC", +"Q. c #C1CEDC", +"!. c #CFD4D9", +"~. c #D3D3D3", +"^. c #D6DADE", +"/. c #DBDBDB", +"(. c #DAE0E6", +"). c #E2E3E3", +"_. c #E2E5E8", +"`. c #ECECEC", +"'. c #EAEEF1", +"]. c #F4F4F4", +"[. c #FBFBFB", +"{. c None", +/* pixels */ +"{.{.{.{.{.{.{.{.{.{.{.o # , 7 8 8 < ; @ o {.{.{.{.{.{.{.{.{.{.{.", +"{.{.{.{.{.{.{.{.{.X 4 l M I / ( ( R Z v 9 * {.{.{.{.{.{.{.{.", +"{.{.{.{.{.{.{.X 6 M ( s.n.N.N.N.N.N.N.k.,.S r & {.{.{.{.{.{.{.", +"{.{.{.{.{.{.- v ( k.N.C.W.W.~.~.W.R.R.V.N.N.3.Z 6 . {.{.{.{.{.", +"{.{.{.{. 3 V a.N.C.~.)./././.~.~.~.W.W.R.V.N.n./ r X {.{.{.{.", +"{.{.{.{.2 Z j.N.W./././././.~.~.~.W.W.W.W.R.K.N.N.o.y . {.{.{.", +"{.{.{.& V j.N.W.).)././.~.~.~.~.~.W.W.W.W.R.n.R.C.V.] q {.{.", +"{.{.. v a.N.R.)././././.~./.~.~.W.~.W.W.R.E q n.R.C.V.I 1 {.{.", +"{.{.6 ( N.C././././.~.~.~.~.~.~.W.~.~.b.j ^ p j R.C.C.v.v X {.", +"{.X b k.N.W././././.~./.~.~.~.~.~.W.:.e Q ) K k x.R.R.R.o.5 {.", +"{.4 ' N.V././.~.~./.~.~.~.~.~.~.E.J p F ) ) p y.i.R.R.R.b.v . ", +"o r s.N.R./.~.~.~.~.~.~.~.W.I.B.h d s Q Q K ! z.c.W.W.R.R.I % ", +"@ M n.N.W.~.~.~.~.~.~.E.Q g g f p w L Q Q t u.z.W.W.W.W.W.<.4 . ", +", S N.N.W.~.~.~.~.~.K.h G &.D.Q 0 F K L j j z.C.l.M.~.W.W.g.0 . ", +"< / N.N.W.W.W.W.W.M.f h [ [.'.a g K G L p 0 d g w &.~.~.~.M.0 . ", +"8 ( N.N.W.W.W.p.Q w p w (.F.f f F F G K g a g d j t.c.!.~.K.i . ", +"7 ( N.N.R.R.{ 2.F 0 0 Q H.e g g F F F F G g g u.c.n.C././.H.r . ", +", I N.m.f.^ h 0 0 0 0 d t a f g g F F F p ! c.N.W./.)././.D.q ", +"= V y.h f t d m p 0 0 q p p d a g g F p ! N.C.).).).).).).d.6 ", +"o x :.t w t a d t 0 q t p a d s f f a 0 c.C.).`.`.`.).).).] , . ", +"o 8 ,.r.q 0 q 0 0 q t u p s s g m f e g V./.`.`.`.`.`._.^.M X . ", +"{.% Z m.;.q 0 0 q e i i s N h N m s r ^ C.`.].].].].`.`.Z.9 . ", +"{. r 2.N.! q q t n c m N B B B B c s =.R.].].].].].]._.S $ {.", +"{.. $ Z =.q q u m c H B A U U U B B n p.~.].].[.[.[.].4.9 {.", +"{.{. 6 z q r i c P U Y Y T _ _ D Y N j.~.].[.[.[.].U.v X {.{.", +"{.{.{.. e y r c A Y T ..| @. . .| ..D l./.`.].].[.Q.V % {.{.", +"{.{.{. . e c N A D @.@.8.6.6.%.%.+.T n./.`.].].J.Z * {.{.{.", +"{.{.{.{. . 9 M D X.@.6.q.w.w.8.8.%.| N./.`.(.4.v % {.{.{.{.", +"{.{.{.{.{. > N } #.9.S.L.L.S.w.0.@.c.~.h.S 9 X {.{.{.{.{.", +"{.{.{.{.{.{. X 2 C $.A.Y.T.P.q.#.` ' b 0 + {.{.{.{.{.{.", +"{.{.{.{.{.{.{.{. # < 9 p w w 0 5 - . {.{.{.{.{.{.{.{.", +"{.{.{.{.{.{.{.{.{.{. . . . . . . . . {.{.{.{.{.{.{.{.{.{." +}; --- amarok-2.0.1.1mysql5.1.30.orig/debian/icons/amarok-16.xpm +++ amarok-2.0.1.1mysql5.1.30/debian/icons/amarok-16.xpm @@ -0,0 +1,210 @@ +/* XPM */ +static char *amarok-16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 188 2", +" c black", +". c #010203", +"X c #010304", +"o c #030405", +"O c #030406", +"+ c #05070A", +"@ c #03080C", +"# c #05090D", +"$ c #04090F", +"% c #050A10", +"& c #070F17", +"* c #071019", +"= c #0A1521", +"- c #0B1825", +"; c #0D1824", +": c #0D1926", +"> c #0F1A26", +", c #0F1E2C", +"< c #0E1F30", +"1 c #101D2A", +"2 c #0F2133", +"3 c #102030", +"4 c #132436", +"5 c #132639", +"6 c #142638", +"7 c #17293B", +"8 c #14283C", +"9 c #152A40", +"0 c #193047", +"q c #193149", +"w c #19324B", +"e c #203A55", +"r c #223D59", +"t c #26415E", +"y c #234562", +"u c #22456C", +"i c #23486F", +"p c #26486E", +"a c #284360", +"s c #294663", +"d c #244A71", +"f c #264F7A", +"g c #294A70", +"h c #2A4B71", +"j c #2D4D73", +"k c #29537B", +"l c #2D5178", +"z c #304F74", +"x c #35506D", +"c c #325176", +"v c #325277", +"b c #335377", +"n c #355377", +"m c #365575", +"M c #37567A", +"N c #32597F", +"B c #33587E", +"V c #375A7F", +"C c #385472", +"Z c #395572", +"A c #3A5675", +"S c #38567A", +"D c #3B5876", +"F c #3A597A", +"G c #3B587A", +"H c #3B5A7B", +"J c #3B587C", +"K c #405C7F", +"L c #445E7F", +"P c #46607E", +"I c #2B5781", +"U c #385C82", +"Y c #376088", +"T c #37628A", +"R c #3A688F", +"E c #3E6A90", +"W c #3F6B92", +"Q c #415D80", +"! c #435E81", +"~ c #445F80", +"^ c #445F82", +"/ c #466686", +"( c #476687", +") c #4A6486", +"_ c #4E6989", +"` c #4F6E8F", +"' c #42769E", +"] c #46769D", +"[ c #50698A", +"{ c #506A89", +"} c #516A89", +"| c #506F8F", +" . c #546D8C", +".. c #556E8E", +"X. c #5B7088", +"o. c #5B718A", +"O. c #587591", +"+. c #5B7491", +"@. c #5E7B9A", +"#. c #487BA2", +"$. c #6F7D8C", +"%. c #607790", +"&. c #637B97", +"*. c #627E9B", +"=. c #6B7D90", +"-. c #4980A8", +";. c #4A83AA", +":. c #5491B8", +">. c #5693B9", +",. c #5E99BE", +"<. c #658DAC", +"1. c #6A87A0", +"2. c #6A87A4", +"3. c #6D89A7", +"4. c #758BA2", +"5. c #758FA9", +"6. c #7E8FA1", +"7. c #7F93A7", +"8. c #7997AC", +"9. c #63A5CA", +"0. c #6CA7CA", +"q. c #6CA8CB", +"w. c #8B949E", +"e. c #8093A7", +"r. c #8594A4", +"t. c #8395A8", +"y. c #8D99A6", +"u. c #8F9DAB", +"i. c #93A0AD", +"p. c #9AA0A8", +"a. c #9EA7B1", +"s. c #A5A6A7", +"d. c #A3ACB7", +"f. c #A9AFB7", +"g. c #A5B2BF", +"h. c #B0B1B2", +"j. c #B2B2B2", +"k. c gray70", +"l. c #B1B3B6", +"z. c #B4B5B6", +"x. c #B6B6B6", +"c. c #BBBBBB", +"v. c #B8BBBE", +"b. c #BCBCBC", +"n. c #BDBEBF", +"m. c gray75", +"M. c #A8B8C9", +"N. c #B9BDC2", +"B. c #BABEC3", +"V. c #93C1D9", +"C. c #9BC7DD", +"Z. c #BFC5CB", +"A. c #B9C4D0", +"S. c #C1C1C1", +"D. c #C3C3C3", +"F. c #C6C6C6", +"G. c gray78", +"H. c #C5C8CB", +"J. c gray79", +"K. c #CACACA", +"L. c #CBCBCB", +"P. c gray80", +"I. c #CDCDCD", +"U. c #CECECE", +"Y. c gray81", +"T. c #C1C8D0", +"R. c #D0D0D0", +"E. c gray82", +"W. c #D1D1D2", +"Q. c #D2D2D2", +"!. c LightGray", +"~. c gray83", +"^. c #D5D5D5", +"/. c #D7D7D7", +"(. c #DADADA", +"). c gray86", +"_. c gainsboro", +"`. c gray87", +"'. c #CFD8E1", +"]. c #D0D9E1", +"[. c #E4E4E4", +"{. c gray90", +"}. c gray91", +"|. c gray92", +" X c #EAEDF1", +".X c gray94", +"XX c gray97", +"oX c None", +/* pixels */ +"oXoXoXoXX 6 a D Z r 1 oXoXoXoX", +"oXoXoX2 | i.n.D.n.l.t.F * oXoXoX", +"oXoXw e.G.).).~.Q.L.D.z.*.- oXoX", +"oX< 7.K._.(.(.~.Q.P.f.y.c.@.% oX", +"X ` b._.(./.~.~.Q.r. .L b.v.s ", +"4 u.L./.~.~.Q.H.+.! .$.z.G.5.# ", +"t k.Y.Q.Q.d._ +.c _ ~ s.B.P.g.3 ", +"Z k.P.B.6.n A.&.L ) z F o.G.H.9 ", +"x j.d._ h b _ J K ~ ! w.D.~.T.8 ", +"e X.j S h p c M J c p.).{.{.M.: ", +"> 4.D u u l N U J H R..X.X|.3.O ", +" C =.d I T E E T O.`.XXXX].w ", +"oX& f k E ] -.;.#.1.[.XX X/ oX", +"oXoX= I ' >.q.9.,.8.{.]./ @ oX", +"oXoXoX# y :.V.C.0.<.2.w X oXoX", +"oXoXoXoX + , 7 4 ; O oXoXoXoX" +}; --- amarok-2.0.1.1mysql5.1.30.orig/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch +++ amarok-2.0.1.1mysql5.1.30/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 33_scripts__mysql_create_system_tables__no_test.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: scripts__mysql_create_system_tables__no_test +## DP: A user with no password prevents a normal user from login under certain +## DP: circumstances as it is checked first. See #301741. +## DP: http://bugs.mysql.com/bug.php?id=6901 + +@DPATCH@ +--- old/scripts/mysql_system_tables_data.sql 2008-12-04 22:59:44.000000000 +0100 ++++ new/scripts/mysql_system_tables_data.sql 2008-12-04 23:00:07.000000000 +0100 +@@ -11,8 +11,6 @@ + -- Fill "db" table with default grants for anyone to + -- access database 'test' and 'test_%' if "db" table didn't exist + CREATE TEMPORARY TABLE tmp_db LIKE db; +-INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y'); +-INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y'); + INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0; + DROP TABLE tmp_db; + +@@ -24,7 +22,5 @@ + INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0); + REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0 FROM dual WHERE LOWER( @current_hostname) != 'localhost'; + REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0); +-INSERT INTO tmp_user (host,user) VALUES ('localhost',''); +-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost'; + INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0; + DROP TABLE tmp_user; --- amarok-2.0.1.1mysql5.1.30.orig/debian/patches/00list +++ amarok-2.0.1.1mysql5.1.30/debian/patches/00list @@ -0,0 +1,7 @@ +01_MAKEFILES__Docs_Images_Makefile.in.dpatch +01_MAKEFILES__Docs_Makefile.in.dpatch +33_scripts__mysql_create_system_tables__no_test.dpatch +38_scripts__mysqld_safe.sh__signals.dpatch +41_scripts__mysql_install_db.sh__no_test.dpatch +42_scripts__mysql_install_db.sh__share_dir.dpatch +44_scripts__mysql_config__libs.dpatch --- amarok-2.0.1.1mysql5.1.30.orig/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch +++ amarok-2.0.1.1mysql5.1.30/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch @@ -0,0 +1,776 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_MAKEFILES__Docs_Makefile.in.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Creates Docs/Makefile.in + +@DPATCH@ + +--- old/Docs/Images/Makefile.in 2005-03-01 02:08:01.877429040 +0100 ++++ new/Docs/Images/Makefile.in 2005-02-28 21:21:24.000000000 +0100 +@@ -0,0 +1,765 @@ ++# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# @configure_input@ ++ ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++@SET_MAKE@ ++ ++# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++# Process this file with automake to create Makefile.in ++ ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = . ++ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = @build@ ++host_triplet = @host@ ++target_triplet = @target@ ++ACLOCAL = @ACLOCAL@ ++ALLOCA = @ALLOCA@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ ++AMTAR = @AMTAR@ ++AR = @AR@ ++AS = @AS@ ++ASSEMBLER_FALSE = @ASSEMBLER_FALSE@ ++ASSEMBLER_TRUE = @ASSEMBLER_TRUE@ ++ASSEMBLER_sparc32_FALSE = @ASSEMBLER_sparc32_FALSE@ ++ASSEMBLER_sparc32_TRUE = @ASSEMBLER_sparc32_TRUE@ ++ASSEMBLER_sparc64_FALSE = @ASSEMBLER_sparc64_FALSE@ ++ASSEMBLER_sparc64_TRUE = @ASSEMBLER_sparc64_TRUE@ ++ASSEMBLER_x86_FALSE = @ASSEMBLER_x86_FALSE@ ++ASSEMBLER_x86_TRUE = @ASSEMBLER_x86_TRUE@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ ++AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ ++AWK = @AWK@ ++CC = @CC@ ++CCAS = @CCAS@ ++CCASFLAGS = @CCASFLAGS@ ++CCDEPMODE = @CCDEPMODE@ ++CC_VERSION = @CC_VERSION@ ++CFLAGS = @CFLAGS@ ++CHARSETS_NEED_SOURCE = @CHARSETS_NEED_SOURCE@ ++CHARSET_OBJS = @CHARSET_OBJS@ ++CHARSET_SRCS = @CHARSET_SRCS@ ++CHECK_PID = @CHECK_PID@ ++CHMOD = @CHMOD@ ++CLIENT_EXTRA_LDFLAGS = @CLIENT_EXTRA_LDFLAGS@ ++CLIENT_LIBS = @CLIENT_LIBS@ ++CMP = @CMP@ ++COMPILATION_COMMENT = @COMPILATION_COMMENT@ ++COMPILE_PSTACK_FALSE = @COMPILE_PSTACK_FALSE@ ++COMPILE_PSTACK_TRUE = @COMPILE_PSTACK_TRUE@ ++CONF_COMMAND = @CONF_COMMAND@ ++CP = @CP@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CXXLDFLAGS = @CXXLDFLAGS@ ++CXX_VERSION = @CXX_VERSION@ ++CYGPATH_W = @CYGPATH_W@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++DOT_FRM_VERSION = @DOT_FRM_VERSION@ ++DVIS = @DVIS@ ++ECHO = @ECHO@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ ++FIND_PROC = @FIND_PROC@ ++GETCONF = @GETCONF@ ++GXX = @GXX@ ++HAVE_NETWARE_FALSE = @HAVE_NETWARE_FALSE@ ++HAVE_NETWARE_TRUE = @HAVE_NETWARE_TRUE@ ++HOSTNAME = @HOSTNAME@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++IS_LINUX = @IS_LINUX@ ++KILL = @KILL@ ++LD = @LD@ ++LDFLAGS = @LDFLAGS@ ++LIBDL = @LIBDL@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LIBTOOL = @LIBTOOL@ ++LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ ++LM_CFLAGS = @LM_CFLAGS@ ++LN = @LN@ ++LN_CP_F = @LN_CP_F@ ++LN_S = @LN_S@ ++LOCAL_FALSE = @LOCAL_FALSE@ ++LOCAL_TRUE = @LOCAL_TRUE@ ++LTLIBOBJS = @LTLIBOBJS@ ++MACHINE_TYPE = @MACHINE_TYPE@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ ++MAKEINFO = @MAKEINFO@ ++MAKE_BINARY_DISTRIBUTION_OPTIONS = @MAKE_BINARY_DISTRIBUTION_OPTIONS@ ++MAKE_SHELL = @MAKE_SHELL@ ++MT_INCLUDES = @MT_INCLUDES@ ++MT_LD_ADD = @MT_LD_ADD@ ++MV = @MV@ ++MYSQLD_DEFAULT_SWITCHES = @MYSQLD_DEFAULT_SWITCHES@ ++MYSQLD_EXTRA_LDFLAGS = @MYSQLD_EXTRA_LDFLAGS@ ++MYSQLD_USER = @MYSQLD_USER@ ++MYSQL_BASE_VERSION = @MYSQL_BASE_VERSION@ ++MYSQL_NO_DASH_VERSION = @MYSQL_NO_DASH_VERSION@ ++MYSQL_SERVER_SUFFIX = @MYSQL_SERVER_SUFFIX@ ++MYSQL_TCP_PORT = @MYSQL_TCP_PORT@ ++MYSQL_TCP_PORT_DEFAULT = @MYSQL_TCP_PORT_DEFAULT@ ++MYSQL_UNIX_ADDR = @MYSQL_UNIX_ADDR@ ++MYSQL_VERSION_ID = @MYSQL_VERSION_ID@ ++NOINST_LDFLAGS = @NOINST_LDFLAGS@ ++OBJEXT = @OBJEXT@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PDFMANUAL = @PDFMANUAL@ ++PERL = @PERL@ ++PERL5 = @PERL5@ ++PROTOCOL_VERSION = @PROTOCOL_VERSION@ ++PS = @PS@ ++RANLIB = @RANLIB@ ++RM = @RM@ ++SAVE_ASFLAGS = @SAVE_ASFLAGS@ ++SAVE_CFLAGS = @SAVE_CFLAGS@ ++SAVE_CXXFLAGS = @SAVE_CXXFLAGS@ ++SAVE_CXXLDFLAGS = @SAVE_CXXLDFLAGS@ ++SAVE_LDFLAGS = @SAVE_LDFLAGS@ ++SED = @SED@ ++SET_MAKE = @SET_MAKE@ ++SHARED_LIB_VERSION = @SHARED_LIB_VERSION@ ++SHELL = @SHELL@ ++STRIP = @STRIP@ ++SYSTEM_TYPE = @SYSTEM_TYPE@ ++TAR = @TAR@ ++TERMCAP_LIB = @TERMCAP_LIB@ ++THREAD_LOBJECTS = @THREAD_LOBJECTS@ ++THREAD_LPROGRAMS = @THREAD_LPROGRAMS@ ++VERSION = @VERSION@ ++WRAPLIBS = @WRAPLIBS@ ++YACC = @YACC@ ++ac_ct_AR = @ac_ct_AR@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_F77 = @ac_ct_F77@ ++ac_ct_GETCONF = @ac_ct_GETCONF@ ++ac_ct_RANLIB = @ac_ct_RANLIB@ ++ac_ct_STRIP = @ac_ct_STRIP@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++bdb_includes = @bdb_includes@ ++bdb_libs = @bdb_libs@ ++bdb_libs_with_path = @bdb_libs_with_path@ ++bench_dirs = @bench_dirs@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++datadir = @datadir@ ++default_charset = @default_charset@ ++docs_dirs = @docs_dirs@ ++exec_prefix = @exec_prefix@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++includedir = @includedir@ ++infodir = @infodir@ ++innodb_includes = @innodb_includes@ ++innodb_libs = @innodb_libs@ ++innodb_system_libs = @innodb_system_libs@ ++install_sh = @install_sh@ ++isam_libs = @isam_libs@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++libmysqld_dirs = @libmysqld_dirs@ ++linked_client_targets = @linked_client_targets@ ++linked_netware_sources = @linked_netware_sources@ ++localstatedir = @localstatedir@ ++man_dirs = @man_dirs@ ++mandir = @mandir@ ++netware_dir = @netware_dir@ ++oldincludedir = @oldincludedir@ ++openssl_includes = @openssl_includes@ ++openssl_libs = @openssl_libs@ ++orbit_idl = @orbit_idl@ ++orbit_includes = @orbit_includes@ ++orbit_libs = @orbit_libs@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++pstack_dirs = @pstack_dirs@ ++pstack_libs = @pstack_libs@ ++readline_dir = @readline_dir@ ++readline_link = @readline_link@ ++sbindir = @sbindir@ ++server_scripts = @server_scripts@ ++sharedstatedir = @sharedstatedir@ ++sql_client_dirs = @sql_client_dirs@ ++sql_server_dirs = @sql_server_dirs@ ++sysconfdir = @sysconfdir@ ++target = @target@ ++target_alias = @target_alias@ ++target_cpu = @target_cpu@ ++target_os = @target_os@ ++target_vendor = @target_vendor@ ++thread_dirs = @thread_dirs@ ++tools_dirs = @tools_dirs@ ++uname_prog = @uname_prog@ ++vio_dir = @vio_dir@ ++vio_libs = @vio_libs@ ++ ++AUTOMAKE_OPTIONS = foreign ++ ++# These are built from source in the Docs directory ++EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT ++SUBDIRS = . include @docs_dirs@ @readline_dir@ \ ++ @thread_dirs@ pstack @sql_client_dirs@ \ ++ @sql_server_dirs@ scripts @man_dirs@ tests \ ++ BUILD netware os2 @libmysqld_dirs@ \ ++ @bench_dirs@ support-files @tools_dirs@ ++ ++ ++# Relink after clean ++linked_sources = linked_client_sources linked_server_sources \ ++ linked_libmysql_sources linked_libmysql_r_sources \ ++ linked_libmysqld_sources linked_libmysqldex_sources \ ++ linked_include_sources @linked_netware_sources@ ++ ++ ++CLEANFILES = $(linked_sources) ++subdir = . ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = config.h ++CONFIG_CLEAN_FILES = bdb/Makefile ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure COPYING \ ++ ChangeLog Makefile.am acconfig.h acinclude.m4 aclocal.m4 \ ++ config.guess config.h.in config.sub configure configure.in \ ++ depcomp install-sh ltconfig ltmain.sh missing mkinstalldirs ++DIST_SUBDIRS = $(SUBDIRS) ++all: config.h ++ $(MAKE) $(AM_MAKEFLAGS) all-recursive ++ ++.SUFFIXES: ++ ++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ++ configure.lineno ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign Makefile ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) ++ ++$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ $(SHELL) ./config.status --recheck ++$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) ++ cd $(srcdir) && $(AUTOCONF) ++ ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 ++ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++ ++stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status ++ @rm -f stamp-h1 ++ cd $(top_builddir) && $(SHELL) ./config.status config.h ++ ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h ++ cd $(top_srcdir) && $(AUTOHEADER) ++ touch $(srcdir)/config.h.in ++ ++distclean-hdr: ++ -rm -f config.h stamp-h1 ++bdb/Makefile: $(top_builddir)/config.status $(top_srcdir)/bdb/Makefile.in ++ cd $(top_builddir) && $(SHELL) ./config.status $@ ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++# This directory's subdirectories are mostly independent; you can cd ++# into them and run `make' without going through this Makefile. ++# To change the values of `make' variables: instead of editing Makefiles, ++# (1) if the variable is set in `config.status', edit `config.status' ++# (which will cause the Makefiles to be regenerated when you run `make'); ++# (2) otherwise, pass the desired values on the `make' command line. ++$(RECURSIVE_TARGETS): ++ @set fnord $$MAKEFLAGS; amf=$$2; \ ++ dot_seen=no; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ dot_seen=yes; \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ done; \ ++ if test "$$dot_seen" = "no"; then \ ++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ++ fi; test -z "$$fail" ++ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ ++ dot_seen=no; \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ rev=''; for subdir in $$list; do \ ++ if test "$$subdir" = "."; then :; else \ ++ rev="$$subdir $$rev"; \ ++ fi; \ ++ done; \ ++ rev="$$rev ."; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ for subdir in $$rev; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ done && test -z "$$fail" ++tags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ done ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ mkid -fID $$unique ++ ++TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ else \ ++ include_option=--include; \ ++ fi; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test -f $$subdir/TAGS && \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ fi; \ ++ done; \ ++ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ ++ctags: CTAGS ++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$tags $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = . ++distdir = $(PACKAGE)-$(VERSION) ++ ++am__remove_distdir = \ ++ { test ! -d $(distdir) \ ++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr $(distdir); }; } ++ ++GZIP_ENV = --best ++distuninstallcheck_listfiles = find . -type f -print ++distcleancheck_listfiles = find . -type f -print ++ ++distdir: $(DISTFILES) ++ $(am__remove_distdir) ++ mkdir $(distdir) ++ $(mkinstalldirs) $(distdir)/bdb $(distdir)/include ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ ++ if test -d $$d/$$file; then \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ ++ || exit 1; \ ++ (cd $$subdir && \ ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ ++ distdir) \ ++ || exit 1; \ ++ fi; \ ++ done ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$(top_distdir)" distdir="$(distdir)" \ ++ dist-hook ++ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ++ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ++ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ++ || chmod -R a+r $(distdir) ++dist-gzip: distdir ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) ++ ++dist dist-all: distdir ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) ++ ++# This target untars the dist file and tries a VPATH configuration. Then ++# it guarantees that the distribution is self-contained by making another ++# tarfile. ++distcheck: dist ++ $(am__remove_distdir) ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ++ chmod -R a-w $(distdir); chmod a+w $(distdir) ++ mkdir $(distdir)/_build ++ mkdir $(distdir)/_inst ++ chmod a-w $(distdir) ++ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ ++ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ ++ && cd $(distdir)/_build \ ++ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ++ $(DISTCHECK_CONFIGURE_FLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) dvi \ ++ && $(MAKE) $(AM_MAKEFLAGS) check \ ++ && $(MAKE) $(AM_MAKEFLAGS) install \ ++ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ++ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ++ distuninstallcheck \ ++ && chmod -R a-w "$$dc_install_base" \ ++ && ({ \ ++ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ++ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ++ } || { rm -rf "$$dc_destdir"; exit 1; }) \ ++ && rm -rf "$$dc_destdir" \ ++ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ ++ && rm -f $(distdir).tar.gz \ ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ++ $(am__remove_distdir) ++ @echo "$(distdir).tar.gz is ready for distribution" | \ ++ sed 'h;s/./=/g;p;x;p;x' ++distuninstallcheck: ++ @cd $(distuninstallcheck_dir) \ ++ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ ++ || { echo "ERROR: files left after uninstall:" ; \ ++ if test -n "$(DESTDIR)"; then \ ++ echo " (check DESTDIR support)"; \ ++ fi ; \ ++ $(distuninstallcheck_listfiles) ; \ ++ exit 1; } >&2 ++distcleancheck: distclean ++ @if test '$(srcdir)' = . ; then \ ++ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ ++ exit 1 ; \ ++ fi ++ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ++ || { echo "ERROR: files left in build directory after distclean:" ; \ ++ $(distcleancheck_listfiles) ; \ ++ exit 1; } >&2 ++check-am: all-am ++check: check-recursive ++all-am: Makefile config.h ++installdirs: installdirs-recursive ++installdirs-am: ++ ++install: install-recursive ++install-exec: install-exec-recursive ++install-data: install-data-recursive ++uninstall: uninstall-recursive ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-recursive ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) ++ ++distclean-generic: ++ -rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-recursive ++ ++clean-am: clean-generic clean-libtool mostlyclean-am ++ ++distclean: distclean-recursive ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ ++ distclean-tags ++ ++dvi: dvi-recursive ++ ++dvi-am: ++ ++info: info-recursive ++ ++info-am: ++ ++install-data-am: ++ ++install-exec-am: ++ ++install-info: install-info-recursive ++ ++install-man: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-recursive ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -rf $(top_srcdir)/autom4te.cache ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-recursive ++ ++mostlyclean-am: mostlyclean-generic mostlyclean-libtool ++ ++pdf: pdf-recursive ++ ++pdf-am: ++ ++ps: ps-recursive ++ ++ps-am: ++ ++uninstall-am: uninstall-info-am ++ ++uninstall-info: uninstall-info-recursive ++ ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ++ clean-generic clean-libtool clean-recursive ctags \ ++ ctags-recursive dist dist-all dist-gzip distcheck distclean \ ++ distclean-generic distclean-hdr distclean-libtool \ ++ distclean-recursive distclean-tags distcleancheck distdir \ ++ distuninstallcheck dvi dvi-am dvi-recursive info info-am \ ++ info-recursive install install-am install-data install-data-am \ ++ install-data-recursive install-exec install-exec-am \ ++ install-exec-recursive install-info install-info-am \ ++ install-info-recursive install-man install-recursive \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am installdirs-recursive maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ++ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ++ tags-recursive uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive ++ ++ ++# This is just so that the linking is done early. ++config.h: $(linked_sources) ++ ++linked_include_sources: ++ cd include; $(MAKE) link_sources ++ echo timestamp > linked_include_sources ++ ++linked_client_sources: @linked_client_targets@ ++ cd client; $(MAKE) link_sources ++ echo timestamp > linked_client_sources ++ ++linked_libmysql_sources: ++ cd libmysql; $(MAKE) link_sources ++ echo timestamp > linked_libmysql_sources ++ ++linked_libmysql_r_sources: linked_libmysql_sources ++ cd libmysql_r; $(MAKE) link_sources ++ echo timestamp > linked_libmysql_r_sources ++ ++linked_libmysqld_sources: ++ cd libmysqld; $(MAKE) link_sources ++ echo timestamp > linked_libmysqld_sources ++ ++linked_libmysqldex_sources: ++ cd libmysqld/examples; $(MAKE) link_sources ++ echo timestamp > linked_libmysqldex_sources ++ ++linked_netware_sources: ++ cd @netware_dir@; $(MAKE) link_sources ++ echo timestamp > linked_netware_sources ++ ++#avoid recursive make calls in sql directory ++linked_server_sources: ++ cd sql; rm -f mini_client_errors.c;@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c ++ echo timestamp > linked_server_sources ++ ++# Create permission databases ++init-db: all ++ $(top_builddir)/scripts/mysql_install_db ++ ++bin-dist: all ++ $(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@ ++ ++# Remove BK's "SCCS" subdirectories from source distribution ++dist-hook: ++ rm -rf `find $(distdir) -type d -name SCCS` ++ ++tags: ++ support-files/build-tags ++.PHONY: init-db bin-dist ++ ++# Test installation ++ ++test: ++ cd mysql-test ; ./mysql-test-run ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: --- amarok-2.0.1.1mysql5.1.30.orig/debian/patches/42_scripts__mysql_install_db.sh__share_dir.dpatch +++ amarok-2.0.1.1mysql5.1.30/debian/patches/42_scripts__mysql_install_db.sh__share_dir.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 42_scripts_mysql_install_dh.sh__share_dir.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add share/mysql-5.1/mysql/ to lookup when searching for pkgdatadir +## DP: MySQL 5.1 installs some of its file in /usr/share/mysql-5.1/ rather then ## DP: /usr/share/mysql/ so that it's co-installable with 5.0. + +@DPATCH@ +diff -urNad mysql-dfsg-5.1-5.1.30~/scripts/mysql_install_db.sh mysql-dfsg-5.1-5.1.30/scripts/mysql_install_db.sh +--- mysql-dfsg-5.1-5.1.30~/scripts/mysql_install_db.sh 2009-01-29 12:25:12.000000000 -0500 ++++ mysql-dfsg-5.1-5.1.30/scripts/mysql_install_db.sh 2009-01-29 12:25:47.000000000 -0500 +@@ -240,7 +240,7 @@ + bindir="$basedir/bin" + extra_bindir="$bindir" + mysqld=`find_in_basedir mysqld libexec sbin bin` +- pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql` ++ pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql share/mysql-5.1/mysql` + scriptdir="$basedir/scripts" + else + basedir="@prefix@" --- amarok-2.0.1.1mysql5.1.30.orig/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch +++ amarok-2.0.1.1mysql5.1.30/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_scripts__mysqld_safe.sh__signals.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Executes /etc/init.d/mysql on signals +## DP: Reported as http://bugs.mysql.com/bug.php?id=31361 + +@DPATCH@ + +--- old/scripts/mysqld_safe.sh 2006-07-29 13:12:34.000000000 +0200 ++++ old/scripts/mysqld_safe.sh 2006-07-29 13:14:08.000000000 +0200 +@@ -16,8 +16,6 @@ + # This command can be used as pipe to syslog. With "-s" it also logs to stderr. + ERR_LOGGER="logger -p daemon.err -t mysqld_safe -i" + +-trap '' 1 2 3 15 # we shouldn't let anyone kill us +- + umask 007 + + defaults= +@@ -122,7 +122,7 @@ + # sed buffers output (only GNU sed supports a -u (unbuffered) option) + # which means that messages may not get sent to syslog until the + # mysqld process quits. +- cmd="$cmd 2>&1 | logger -t '$syslog_tag_mysqld' -p daemon.error" ++ cmd="$cmd 2>&1 | logger -t '$syslog_tag_mysqld' -p daemon.error & wait" + ;; + *) + echo "Internal program error (non-fatal):" \ +@@ -352,6 +350,13 @@ + fi + + # ++# From now on, we catch signals to do a proper shutdown of mysqld ++# when signalled to do so. ++# ++trap '/usr/bin/mysqladmin --defaults-extra-file=/etc/mysql/debian.cnf refresh' 1 # HUP ++trap '/usr/bin/mysqladmin --defaults-extra-file=/etc/mysql/debian.cnf shutdown' 2 3 15 # INT QUIT and TERM ++ ++# + # Uncomment the following lines if you want all tables to be automatically + # checked and repaired during startup. You should add sensible key_buffer + # and sort_buffer values to my.cnf to improve check performance or require --- amarok-2.0.1.1mysql5.1.30.orig/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch +++ amarok-2.0.1.1mysql5.1.30/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 41_scripts__mysql_install_db.sh__no_test.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: scripts__mysql_install_db.sh__no_test +## DP: http://bugs.mysql.com/bug.php?id=6901 + +@DPATCH@ + +--- mysql-dfsg-5.1-5.1.23rc.orig/scripts/mysql_install_db.sh 2008-01-29 22:41:20.000000000 +0100 ++++ mysql-dfsg-5.1-5.1.23rc/scripts/mysql_install_db.sh 2008-02-28 10:08:11.000000000 +0100 +@@ -306,7 +306,7 @@ + fi + + # Create database directories +-for dir in $ldata $ldata/mysql $ldata/test ++for dir in $ldata $ldata/mysql + do + if test ! -d $dir + then --- amarok-2.0.1.1mysql5.1.30.orig/debian/patches/44_scripts__mysql_config__libs.dpatch +++ amarok-2.0.1.1mysql5.1.30/debian/patches/44_scripts__mysql_config__libs.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 99-unnamed.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Removes unnecessary library dependencies. See #390692 + +@DPATCH@ + +--- old/scripts/mysql_config.sh 2006-08-25 23:12:10.000000000 +0200 ++++ new/scripts/mysql_config.sh 2006-10-02 21:05:52.000000000 +0200 +@@ -98,10 +98,10 @@ + + # Create options + # We intentionally add a space to the beginning and end of lib strings, simplifies replace later +-libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" ++libs=" $ldflags -L$pkglibdir -lmysqlclient" + libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " +-libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ " +-embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ " ++libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @openssl_libs@ " ++embedded_libs=" $ldflags -L$pkglibdir -lmysqld @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ " + + cflags="-I$pkgincludedir @CFLAGS@ " #note: end space! + include="-I$pkgincludedir" --- amarok-2.0.1.1mysql5.1.30.orig/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch +++ amarok-2.0.1.1mysql5.1.30/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch @@ -0,0 +1,776 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_MAKEFILES__Docs_Makefile.in.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Creates Docs/Makefile.in + +@DPATCH@ + +--- old/Docs/Makefile.in 2005-03-01 02:08:01.877429040 +0100 ++++ new/Docs/Makefile.in 2005-02-28 21:21:24.000000000 +0100 +@@ -0,0 +1,765 @@ ++# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# @configure_input@ ++ ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++@SET_MAKE@ ++ ++# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++# Process this file with automake to create Makefile.in ++ ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = . ++ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = @build@ ++host_triplet = @host@ ++target_triplet = @target@ ++ACLOCAL = @ACLOCAL@ ++ALLOCA = @ALLOCA@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ ++AMTAR = @AMTAR@ ++AR = @AR@ ++AS = @AS@ ++ASSEMBLER_FALSE = @ASSEMBLER_FALSE@ ++ASSEMBLER_TRUE = @ASSEMBLER_TRUE@ ++ASSEMBLER_sparc32_FALSE = @ASSEMBLER_sparc32_FALSE@ ++ASSEMBLER_sparc32_TRUE = @ASSEMBLER_sparc32_TRUE@ ++ASSEMBLER_sparc64_FALSE = @ASSEMBLER_sparc64_FALSE@ ++ASSEMBLER_sparc64_TRUE = @ASSEMBLER_sparc64_TRUE@ ++ASSEMBLER_x86_FALSE = @ASSEMBLER_x86_FALSE@ ++ASSEMBLER_x86_TRUE = @ASSEMBLER_x86_TRUE@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ ++AVAILABLE_LANGUAGES_ERRORS = @AVAILABLE_LANGUAGES_ERRORS@ ++AWK = @AWK@ ++CC = @CC@ ++CCAS = @CCAS@ ++CCASFLAGS = @CCASFLAGS@ ++CCDEPMODE = @CCDEPMODE@ ++CC_VERSION = @CC_VERSION@ ++CFLAGS = @CFLAGS@ ++CHARSETS_NEED_SOURCE = @CHARSETS_NEED_SOURCE@ ++CHARSET_OBJS = @CHARSET_OBJS@ ++CHARSET_SRCS = @CHARSET_SRCS@ ++CHECK_PID = @CHECK_PID@ ++CHMOD = @CHMOD@ ++CLIENT_EXTRA_LDFLAGS = @CLIENT_EXTRA_LDFLAGS@ ++CLIENT_LIBS = @CLIENT_LIBS@ ++CMP = @CMP@ ++COMPILATION_COMMENT = @COMPILATION_COMMENT@ ++COMPILE_PSTACK_FALSE = @COMPILE_PSTACK_FALSE@ ++COMPILE_PSTACK_TRUE = @COMPILE_PSTACK_TRUE@ ++CONF_COMMAND = @CONF_COMMAND@ ++CP = @CP@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CXXLDFLAGS = @CXXLDFLAGS@ ++CXX_VERSION = @CXX_VERSION@ ++CYGPATH_W = @CYGPATH_W@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++DOT_FRM_VERSION = @DOT_FRM_VERSION@ ++DVIS = @DVIS@ ++ECHO = @ECHO@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ ++FIND_PROC = @FIND_PROC@ ++GETCONF = @GETCONF@ ++GXX = @GXX@ ++HAVE_NETWARE_FALSE = @HAVE_NETWARE_FALSE@ ++HAVE_NETWARE_TRUE = @HAVE_NETWARE_TRUE@ ++HOSTNAME = @HOSTNAME@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++IS_LINUX = @IS_LINUX@ ++KILL = @KILL@ ++LD = @LD@ ++LDFLAGS = @LDFLAGS@ ++LIBDL = @LIBDL@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LIBTOOL = @LIBTOOL@ ++LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ ++LM_CFLAGS = @LM_CFLAGS@ ++LN = @LN@ ++LN_CP_F = @LN_CP_F@ ++LN_S = @LN_S@ ++LOCAL_FALSE = @LOCAL_FALSE@ ++LOCAL_TRUE = @LOCAL_TRUE@ ++LTLIBOBJS = @LTLIBOBJS@ ++MACHINE_TYPE = @MACHINE_TYPE@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ ++MAKEINFO = @MAKEINFO@ ++MAKE_BINARY_DISTRIBUTION_OPTIONS = @MAKE_BINARY_DISTRIBUTION_OPTIONS@ ++MAKE_SHELL = @MAKE_SHELL@ ++MT_INCLUDES = @MT_INCLUDES@ ++MT_LD_ADD = @MT_LD_ADD@ ++MV = @MV@ ++MYSQLD_DEFAULT_SWITCHES = @MYSQLD_DEFAULT_SWITCHES@ ++MYSQLD_EXTRA_LDFLAGS = @MYSQLD_EXTRA_LDFLAGS@ ++MYSQLD_USER = @MYSQLD_USER@ ++MYSQL_BASE_VERSION = @MYSQL_BASE_VERSION@ ++MYSQL_NO_DASH_VERSION = @MYSQL_NO_DASH_VERSION@ ++MYSQL_SERVER_SUFFIX = @MYSQL_SERVER_SUFFIX@ ++MYSQL_TCP_PORT = @MYSQL_TCP_PORT@ ++MYSQL_TCP_PORT_DEFAULT = @MYSQL_TCP_PORT_DEFAULT@ ++MYSQL_UNIX_ADDR = @MYSQL_UNIX_ADDR@ ++MYSQL_VERSION_ID = @MYSQL_VERSION_ID@ ++NOINST_LDFLAGS = @NOINST_LDFLAGS@ ++OBJEXT = @OBJEXT@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PDFMANUAL = @PDFMANUAL@ ++PERL = @PERL@ ++PERL5 = @PERL5@ ++PROTOCOL_VERSION = @PROTOCOL_VERSION@ ++PS = @PS@ ++RANLIB = @RANLIB@ ++RM = @RM@ ++SAVE_ASFLAGS = @SAVE_ASFLAGS@ ++SAVE_CFLAGS = @SAVE_CFLAGS@ ++SAVE_CXXFLAGS = @SAVE_CXXFLAGS@ ++SAVE_CXXLDFLAGS = @SAVE_CXXLDFLAGS@ ++SAVE_LDFLAGS = @SAVE_LDFLAGS@ ++SED = @SED@ ++SET_MAKE = @SET_MAKE@ ++SHARED_LIB_VERSION = @SHARED_LIB_VERSION@ ++SHELL = @SHELL@ ++STRIP = @STRIP@ ++SYSTEM_TYPE = @SYSTEM_TYPE@ ++TAR = @TAR@ ++TERMCAP_LIB = @TERMCAP_LIB@ ++THREAD_LOBJECTS = @THREAD_LOBJECTS@ ++THREAD_LPROGRAMS = @THREAD_LPROGRAMS@ ++VERSION = @VERSION@ ++WRAPLIBS = @WRAPLIBS@ ++YACC = @YACC@ ++ac_ct_AR = @ac_ct_AR@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_F77 = @ac_ct_F77@ ++ac_ct_GETCONF = @ac_ct_GETCONF@ ++ac_ct_RANLIB = @ac_ct_RANLIB@ ++ac_ct_STRIP = @ac_ct_STRIP@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++bdb_includes = @bdb_includes@ ++bdb_libs = @bdb_libs@ ++bdb_libs_with_path = @bdb_libs_with_path@ ++bench_dirs = @bench_dirs@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++datadir = @datadir@ ++default_charset = @default_charset@ ++docs_dirs = @docs_dirs@ ++exec_prefix = @exec_prefix@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++includedir = @includedir@ ++infodir = @infodir@ ++innodb_includes = @innodb_includes@ ++innodb_libs = @innodb_libs@ ++innodb_system_libs = @innodb_system_libs@ ++install_sh = @install_sh@ ++isam_libs = @isam_libs@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++libmysqld_dirs = @libmysqld_dirs@ ++linked_client_targets = @linked_client_targets@ ++linked_netware_sources = @linked_netware_sources@ ++localstatedir = @localstatedir@ ++man_dirs = @man_dirs@ ++mandir = @mandir@ ++netware_dir = @netware_dir@ ++oldincludedir = @oldincludedir@ ++openssl_includes = @openssl_includes@ ++openssl_libs = @openssl_libs@ ++orbit_idl = @orbit_idl@ ++orbit_includes = @orbit_includes@ ++orbit_libs = @orbit_libs@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++pstack_dirs = @pstack_dirs@ ++pstack_libs = @pstack_libs@ ++readline_dir = @readline_dir@ ++readline_link = @readline_link@ ++sbindir = @sbindir@ ++server_scripts = @server_scripts@ ++sharedstatedir = @sharedstatedir@ ++sql_client_dirs = @sql_client_dirs@ ++sql_server_dirs = @sql_server_dirs@ ++sysconfdir = @sysconfdir@ ++target = @target@ ++target_alias = @target_alias@ ++target_cpu = @target_cpu@ ++target_os = @target_os@ ++target_vendor = @target_vendor@ ++thread_dirs = @thread_dirs@ ++tools_dirs = @tools_dirs@ ++uname_prog = @uname_prog@ ++vio_dir = @vio_dir@ ++vio_libs = @vio_libs@ ++ ++AUTOMAKE_OPTIONS = foreign ++ ++# These are built from source in the Docs directory ++EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT ++SUBDIRS = . include @docs_dirs@ @readline_dir@ \ ++ @thread_dirs@ pstack @sql_client_dirs@ \ ++ @sql_server_dirs@ scripts @man_dirs@ tests \ ++ BUILD netware os2 @libmysqld_dirs@ \ ++ @bench_dirs@ support-files @tools_dirs@ ++ ++ ++# Relink after clean ++linked_sources = linked_client_sources linked_server_sources \ ++ linked_libmysql_sources linked_libmysql_r_sources \ ++ linked_libmysqld_sources linked_libmysqldex_sources \ ++ linked_include_sources @linked_netware_sources@ ++ ++ ++CLEANFILES = $(linked_sources) ++subdir = . ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = config.h ++CONFIG_CLEAN_FILES = bdb/Makefile ++DIST_SOURCES = ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure COPYING \ ++ ChangeLog Makefile.am acconfig.h acinclude.m4 aclocal.m4 \ ++ config.guess config.h.in config.sub configure configure.in \ ++ depcomp install-sh ltconfig ltmain.sh missing mkinstalldirs ++DIST_SUBDIRS = $(SUBDIRS) ++all: config.h ++ $(MAKE) $(AM_MAKEFLAGS) all-recursive ++ ++.SUFFIXES: ++ ++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ++ configure.lineno ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign Makefile ++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) ++ ++$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ $(SHELL) ./config.status --recheck ++$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) ++ cd $(srcdir) && $(AUTOCONF) ++ ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 ++ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++ ++stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status ++ @rm -f stamp-h1 ++ cd $(top_builddir) && $(SHELL) ./config.status config.h ++ ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h ++ cd $(top_srcdir) && $(AUTOHEADER) ++ touch $(srcdir)/config.h.in ++ ++distclean-hdr: ++ -rm -f config.h stamp-h1 ++bdb/Makefile: $(top_builddir)/config.status $(top_srcdir)/bdb/Makefile.in ++ cd $(top_builddir) && $(SHELL) ./config.status $@ ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++# This directory's subdirectories are mostly independent; you can cd ++# into them and run `make' without going through this Makefile. ++# To change the values of `make' variables: instead of editing Makefiles, ++# (1) if the variable is set in `config.status', edit `config.status' ++# (which will cause the Makefiles to be regenerated when you run `make'); ++# (2) otherwise, pass the desired values on the `make' command line. ++$(RECURSIVE_TARGETS): ++ @set fnord $$MAKEFLAGS; amf=$$2; \ ++ dot_seen=no; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ dot_seen=yes; \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ done; \ ++ if test "$$dot_seen" = "no"; then \ ++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ++ fi; test -z "$$fail" ++ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ ++ dot_seen=no; \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ rev=''; for subdir in $$list; do \ ++ if test "$$subdir" = "."; then :; else \ ++ rev="$$subdir $$rev"; \ ++ fi; \ ++ done; \ ++ rev="$$rev ."; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ for subdir in $$rev; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ done && test -z "$$fail" ++tags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ done ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ mkid -fID $$unique ++ ++TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ else \ ++ include_option=--include; \ ++ fi; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test -f $$subdir/TAGS && \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ fi; \ ++ done; \ ++ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ ++ctags: CTAGS ++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$tags $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = . ++distdir = $(PACKAGE)-$(VERSION) ++ ++am__remove_distdir = \ ++ { test ! -d $(distdir) \ ++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr $(distdir); }; } ++ ++GZIP_ENV = --best ++distuninstallcheck_listfiles = find . -type f -print ++distcleancheck_listfiles = find . -type f -print ++ ++distdir: $(DISTFILES) ++ $(am__remove_distdir) ++ mkdir $(distdir) ++ $(mkinstalldirs) $(distdir)/bdb $(distdir)/include ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ ++ if test -d $$d/$$file; then \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ ++ || exit 1; \ ++ (cd $$subdir && \ ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ ++ distdir) \ ++ || exit 1; \ ++ fi; \ ++ done ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$(top_distdir)" distdir="$(distdir)" \ ++ dist-hook ++ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ++ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ++ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ++ || chmod -R a+r $(distdir) ++dist-gzip: distdir ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) ++ ++dist dist-all: distdir ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) ++ ++# This target untars the dist file and tries a VPATH configuration. Then ++# it guarantees that the distribution is self-contained by making another ++# tarfile. ++distcheck: dist ++ $(am__remove_distdir) ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ++ chmod -R a-w $(distdir); chmod a+w $(distdir) ++ mkdir $(distdir)/_build ++ mkdir $(distdir)/_inst ++ chmod a-w $(distdir) ++ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ ++ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ ++ && cd $(distdir)/_build \ ++ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ++ $(DISTCHECK_CONFIGURE_FLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) dvi \ ++ && $(MAKE) $(AM_MAKEFLAGS) check \ ++ && $(MAKE) $(AM_MAKEFLAGS) install \ ++ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ++ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ++ distuninstallcheck \ ++ && chmod -R a-w "$$dc_install_base" \ ++ && ({ \ ++ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ++ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ++ } || { rm -rf "$$dc_destdir"; exit 1; }) \ ++ && rm -rf "$$dc_destdir" \ ++ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ ++ && rm -f $(distdir).tar.gz \ ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ++ $(am__remove_distdir) ++ @echo "$(distdir).tar.gz is ready for distribution" | \ ++ sed 'h;s/./=/g;p;x;p;x' ++distuninstallcheck: ++ @cd $(distuninstallcheck_dir) \ ++ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ ++ || { echo "ERROR: files left after uninstall:" ; \ ++ if test -n "$(DESTDIR)"; then \ ++ echo " (check DESTDIR support)"; \ ++ fi ; \ ++ $(distuninstallcheck_listfiles) ; \ ++ exit 1; } >&2 ++distcleancheck: distclean ++ @if test '$(srcdir)' = . ; then \ ++ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ ++ exit 1 ; \ ++ fi ++ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ++ || { echo "ERROR: files left in build directory after distclean:" ; \ ++ $(distcleancheck_listfiles) ; \ ++ exit 1; } >&2 ++check-am: all-am ++check: check-recursive ++all-am: Makefile config.h ++installdirs: installdirs-recursive ++installdirs-am: ++ ++install: install-recursive ++install-exec: install-exec-recursive ++install-data: install-data-recursive ++uninstall: uninstall-recursive ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-recursive ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) ++ ++distclean-generic: ++ -rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-recursive ++ ++clean-am: clean-generic clean-libtool mostlyclean-am ++ ++distclean: distclean-recursive ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ ++ distclean-tags ++ ++dvi: dvi-recursive ++ ++dvi-am: ++ ++info: info-recursive ++ ++info-am: ++ ++install-data-am: ++ ++install-exec-am: ++ ++install-info: install-info-recursive ++ ++install-man: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-recursive ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -rf $(top_srcdir)/autom4te.cache ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-recursive ++ ++mostlyclean-am: mostlyclean-generic mostlyclean-libtool ++ ++pdf: pdf-recursive ++ ++pdf-am: ++ ++ps: ps-recursive ++ ++ps-am: ++ ++uninstall-am: uninstall-info-am ++ ++uninstall-info: uninstall-info-recursive ++ ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ++ clean-generic clean-libtool clean-recursive ctags \ ++ ctags-recursive dist dist-all dist-gzip distcheck distclean \ ++ distclean-generic distclean-hdr distclean-libtool \ ++ distclean-recursive distclean-tags distcleancheck distdir \ ++ distuninstallcheck dvi dvi-am dvi-recursive info info-am \ ++ info-recursive install install-am install-data install-data-am \ ++ install-data-recursive install-exec install-exec-am \ ++ install-exec-recursive install-info install-info-am \ ++ install-info-recursive install-man install-recursive \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am installdirs-recursive maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ++ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ++ tags-recursive uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive ++ ++ ++# This is just so that the linking is done early. ++config.h: $(linked_sources) ++ ++linked_include_sources: ++ cd include; $(MAKE) link_sources ++ echo timestamp > linked_include_sources ++ ++linked_client_sources: @linked_client_targets@ ++ cd client; $(MAKE) link_sources ++ echo timestamp > linked_client_sources ++ ++linked_libmysql_sources: ++ cd libmysql; $(MAKE) link_sources ++ echo timestamp > linked_libmysql_sources ++ ++linked_libmysql_r_sources: linked_libmysql_sources ++ cd libmysql_r; $(MAKE) link_sources ++ echo timestamp > linked_libmysql_r_sources ++ ++linked_libmysqld_sources: ++ cd libmysqld; $(MAKE) link_sources ++ echo timestamp > linked_libmysqld_sources ++ ++linked_libmysqldex_sources: ++ cd libmysqld/examples; $(MAKE) link_sources ++ echo timestamp > linked_libmysqldex_sources ++ ++linked_netware_sources: ++ cd @netware_dir@; $(MAKE) link_sources ++ echo timestamp > linked_netware_sources ++ ++#avoid recursive make calls in sql directory ++linked_server_sources: ++ cd sql; rm -f mini_client_errors.c;@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c ++ echo timestamp > linked_server_sources ++ ++# Create permission databases ++init-db: all ++ $(top_builddir)/scripts/mysql_install_db ++ ++bin-dist: all ++ $(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@ ++ ++# Remove BK's "SCCS" subdirectories from source distribution ++dist-hook: ++ rm -rf `find $(distdir) -type d -name SCCS` ++ ++tags: ++ support-files/build-tags ++.PHONY: init-db bin-dist ++ ++# Test installation ++ ++test: ++ cd mysql-test ; ./mysql-test-run ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: --- amarok-2.0.1.1mysql5.1.30.orig/debian/patches-amarok/kubuntu_05_wikipaedia.diff +++ amarok-2.0.1.1mysql5.1.30/debian/patches-amarok/kubuntu_05_wikipaedia.diff @@ -0,0 +1,11 @@ +--- amarok/src/context/engines/wikipedia/WikipediaEngine.cpp 2009/01/17 07:05:59 912280 ++++ amarok/src/context/engines/wikipedia/WikipediaEngine.cpp 2009/02/02 11:36:03 920066 +@@ -244,7 +244,7 @@ + } + + // Ok lets remove the top and bottom parts of the page +- m_wiki = m_wiki.mid( m_wiki.indexOf( "

" ) ); ++ m_wiki = m_wiki.mid( m_wiki.indexOf( "

" ) ); + // Adding back license information + m_wiki += copyright; --- amarok-2.0.1.1mysql5.1.30.orig/debian/patches-amarok/02_mysqle_fix_linkage.diff +++ amarok-2.0.1.1mysql5.1.30/debian/patches-amarok/02_mysqle_fix_linkage.diff @@ -0,0 +1,13 @@ +--- a/src/collection/sqlcollection/CMakeLists.txt ++++ b/src/collection/sqlcollection/CMakeLists.txt +@@ -72,9 +72,8 @@ + ) + + if(NOT WIN32) +- target_link_libraries(amarok_collection-sqlcollection crypto ssl) + if(NOT APPLE) +- target_link_libraries(amarok_collection-sqlcollection crypt) ++ target_link_libraries(amarok_collection-sqlcollection crypt pthread) + endif(NOT APPLE) + endif(NOT WIN32) + --- amarok-2.0.1.1mysql5.1.30.orig/debian/patches-amarok/kubuntu_03_restricted_install.diff +++ amarok-2.0.1.1mysql5.1.30/debian/patches-amarok/kubuntu_03_restricted_install.diff @@ -0,0 +1,20 @@ +--- amarok/src/App.cpp 2009-02-12 17:56:21.000000000 +0000 ++++ amarok/src/App.cpp 2009-02-12 17:55:57.000000000 +0000 +@@ -180,6 +180,17 @@ + PERF_LOG( "Done App ctor" ) + + continueInit(); ++ ++ //Added by Kubuntu for update-notifier-kde to prompt for restricted codec install ++ QDBusMessage m = QDBusMessage::createMethodCall("org.kubuntu.restrictedInstall", ++ "/org/kubuntu/restrictedInstall", ++ "org.kubuntu.restrictedInstall", ++ "installRestricted"); ++ QList dbusargs; ++ dbusargs.append("Amarok Player"); ++ dbusargs.append("libxine1-ffmpeg"); ++ m.setArguments(dbusargs); ++ bool queued = QDBusConnection::sessionBus().send(m); + } + + App::~App() --- amarok-2.0.1.1mysql5.1.30.orig/debian/patches-amarok/kubuntu_04_libgpod_0.7.diff +++ amarok-2.0.1.1mysql5.1.30/debian/patches-amarok/kubuntu_04_libgpod_0.7.diff @@ -0,0 +1,163 @@ +Index: amarok_collection-ipodcollection.desktop +=================================================================== +--- amarok/src/collection/ipodcollection/amarok_collection-ipodcollection.desktop (revision 916187) ++++ amarok/src/collection/ipodcollection/amarok_collection-ipodcollection.desktop (working copy) +@@ -11,6 +11,7 @@ + Name[el]=Συλλογή Ipod + Name[es]=Colección Ipod + Name[et]=Ipodi kogu ++Name[fi]=Ipod-kokoelma + Name[fr]=Collection iPod + Name[ga]=Bailiúchán Ipod + Name[gl]=Colección do Ipod +@@ -48,6 +49,7 @@ + Comment[el]=Πρόσθετο συλλογής Ipod για το AmaroK + Comment[es]=Complemento de colección de Ipod para Amarok + Comment[et]=Amaroki Ipodi kogu plugin ++Comment[fi]=Amarokin iPod-liitännäinen + Comment[fr]=Module de collection iPod pour Amarok + Comment[ga]=Breiseán bailiúchán Ipod le haghaidh Amarok + Comment[gl]=Extensión de colección do Ipod para Amarok +Index: IpodMeta.cpp +=================================================================== +--- amarok/src/collection/ipodcollection/IpodMeta.cpp (revision 916187) ++++ amarok/src/collection/ipodcollection/IpodMeta.cpp (working copy) +@@ -875,7 +875,7 @@ + { + //DEBUG_BLOCK + if( m_hasCover ) +- return QPixmap::fromImage( m_image ); ++ return ( QPixmap::fromImage( m_image.scaled( QSize( size, size ), Qt::KeepAspectRatio ) ) ); + + return Meta::Album::image( size ); + } +Index: CMakeLists.txt +=================================================================== +--- amarok/src/collection/ipodcollection/CMakeLists.txt (revision 916187) ++++ amarok/src/collection/ipodcollection/CMakeLists.txt (working copy) +@@ -7,7 +7,7 @@ + SET(GDK_LIBRARIES "") + endif(NOT GDK_FOUND) + +-if (IPOD_FOUND) ++if (IPOD_FOUND AND IPOD_0_7) + include_directories( ../.. + ../../plugin + ../../meta +@@ -18,7 +18,7 @@ + handler + ${GLIB2_INCLUDE_DIR} + ${GDK_INCLUDE_DIR} +- ${IPOD_INCLUDE_DIR} ++ ${IPOD_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR}/../.. + ${AMAROK_COLLECTION_SUPPORT_DIR} + ${KDE4_INCLUDE_DIR} +@@ -60,5 +60,4 @@ + ########### install files ############### + + install( FILES amarok_collection-ipodcollection.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +- +-endif (IPOD_FOUND) ++endif (IPOD_FOUND AND IPOD_0_7) +Index: handler/IpodHandler.cpp +=================================================================== +--- amarok/src/collection/ipodcollection/handler/IpodHandler.cpp (revision 916187) ++++ amarok/src/collection/ipodcollection/handler/IpodHandler.cpp (working copy) +@@ -778,7 +778,7 @@ + do + { + create.setPath(path); +- path = path.section("/", 0, path.indexOf('/')-1); ++ path = path.section('/', 0, path.indexOf('/')-1); + parentdir.setPath(path); + } + while( !path.isEmpty() && !(path==mountPoint()) && !parentdir.exists() ); +@@ -1335,82 +1335,25 @@ + { + KTemporaryFile tempImageFile; + +- tempImageFile.setSuffix( ".jpeg" ); // default suffix jpeg ++ tempImageFile.setSuffix( ".png" ); // default suffix jpeg + QFileInfo tempImageFileInfo( tempImageFile ); // get info for path + QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path + +- Itdb_Thumb *thumb = NULL; + GdkPixbuf *gpixbuf = NULL; +- QString thumbPath; + + // pull image out of ipod + ++ // NOTE: 0x01 = has, 0x02 = has not ++ + if( ipodtrack->has_artwork == 0x01 ) + { +- // try small first +- +- thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_SMALL ); +- +- // then large if needed +- if( thumb == NULL) +- { +- thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_LARGE ); +- } +- +- if( thumb != NULL) +- { +- gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb ); +- } +- else +- { +- GList *thumbs = ipodtrack->artwork->thumbnails; +- +- for(; thumbs; thumbs = thumbs->next) +- { +- Itdb_Thumb *curThumb = ( Itdb_Thumb * )thumbs->data; +- if( curThumb == NULL) +- continue; +- +- switch( curThumb->type ) +- { +- case ITDB_THUMB_PHOTO_SMALL: +- break; +- case ITDB_THUMB_PHOTO_LARGE: +- break; +- case ITDB_THUMB_PHOTO_FULL_SCREEN: +- break; +- case ITDB_THUMB_PHOTO_TV_SCREEN: +- break; +- case ITDB_THUMB_COVER_XLARGE: +- break; +- case ITDB_THUMB_COVER_MEDIUM: +- break; +- case ITDB_THUMB_COVER_SMEDIUM: +- break; +- case ITDB_THUMB_COVER_XSMALL: +- break; +- +- default: +- break; +- } +- +- thumb = curThumb; +- break; +- +- } +- +- if( thumb != NULL) +- { +- thumbPath = QString::fromUtf8( itdb_thumb_get_filename( m_device, thumb ) ); +- gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb ); +- } +- } ++ gpixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( m_device, ipodtrack->artwork, -1, -1 ); + } + + if(gpixbuf != NULL) + { + // temporarily save to file +- gdk_pixbuf_save( gpixbuf, QFile::encodeName( tempImagePath ), "jpeg", 0, (const char*) 0 ); ++ gdk_pixbuf_save( gpixbuf, QFile::encodeName( tempImagePath ), "png", NULL, NULL ); + + // pull temporary file's image out as QImage + QImage image( tempImagePath );