Last commit made on 2009-03-17
Get this branch:
git clone -b ubuntu/intrepid-security https://git.launchpad.net/ubuntu/+source/amarok
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

3d25a4e... by Harald Sitter on 2009-01-19

Import patches-unapplied version 2:1.4.10-0ubuntu3.1 to ubuntu/intrepid-security

Imported using git-ubuntu import.

Changelog parent: 3d0710efb9815d26b62860c6e1a02f8d2eff59cf

New changelog entries:
  * SECURITY UPDATE: integer overflows allow remote attackers to execute
    arbitrary code via an Audible Audio (.aa) file (LP: #318555)
    - debian/patches/security_audible_tags.diff fix integer overflow while
      reading audible aa file tags. Based on upstream patch.
    - http://websvn.kde.org/?view=rev&revision=908415
    - http://www.trapkit.de/advisories/TKADV2009-002.txt
    - CVE-2009-0135
    - CVE-2009-0136

3d0710e... by Jonathan Riddell on 2008-10-13

Import patches-unapplied version 2:1.4.10-0ubuntu3 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: c27064fb3665b246b13e2e24bf2263021fa637d4

New changelog entries:
  * Add kubuntu_12_eject_command.diff, change eject command to
    umount, we no longer have kdeeject

c27064f... by Jonathan Riddell on 2008-09-08

Import patches-unapplied version 2:1.4.10-0ubuntu2 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: 87f11680c3a4efa93b00407b5984cde2a4c0aadb

New changelog entries:
  * Update install-mp3 to use install-package

87f1168... by Harald Sitter on 2008-08-14

Import patches-unapplied version 2:1.4.10-0ubuntu1 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: ea5f1c4e0768b5af79c1a4e90999e135f9c63052

New changelog entries:
  * New upstream release
  * Add kubuntu_11_fix_libmtp-0.3.0-API.diff

ea5f1c4... by Harald Sitter on 2008-06-30

Import patches-unapplied version 2: to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: d6c7a6c3b895431132f221e74bf5e65101b38930

New changelog entries:
  * Add moodbar to the feature list
  * Remove the amarok-engine virtual package, see debian version 1.4.8-2 for
  * amarok-common conflicts with amarok packages older than -2ubuntu1, but
    doesn't replace them (LP: #244628)

d6c7a6c... by Harald Sitter on 2008-06-27

Import patches-unapplied version 2: to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: 54753edaf635794576244d4109017323d65f7706

New changelog entries:
  * Add manpages - unbreak build

54753ed... by Harald Sitter on 2008-06-25

Import patches-unapplied version 2: to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: 149a5a1777b7f2e2d06c423077e5a713cd74ab52

New changelog entries:
  * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-DIFFERENCES
  * 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.
  * 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)
  * 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
  * 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
    - 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
  * 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
  * Exclude amarok from amarok-engine-* packages dependency lists.
  [ 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.

149a5a1... by Jonathan Aquilina on 2008-04-15

Import patches-unapplied version 2: to ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: efdd82b403eb6dd7d3fc234a8194e977747c4af7

New changelog entries:
  * Added kdebase-kio-plugins as a recommened package

efdd82b... by Harald Sitter on 2008-04-12

Import patches-unapplied version 2: to ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: 9c43e2e6576ee8113fc8e9ed5397b1deaf59c414

New changelog entries:
  [ 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)

9c43e2e... by Jonathan Riddell on 2008-04-10

Import patches-unapplied version 2: to ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: 8c8cbef56b3c12ba5557d3a6cad96f9dcccc7979

New changelog entries:
  * Upstream patch release