ubuntu/+source/amarok:ubuntu/oneiric-devel

Last commit made on 2011-12-05
Get this branch:
git clone -b ubuntu/oneiric-devel 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

Name:
ubuntu/oneiric-devel
Repository:
lp:ubuntu/+source/amarok

Recent commits

4ff4729... by Felix Geyer on 2011-11-28

Import patches-unapplied version 2:2.4.3-1ubuntu2.1 to ubuntu/oneiric-proposed

Imported using git-ubuntu import.

Changelog parent: 2e93a20e0237334edd201a8e66d207b1eb379765

New changelog entries:
  * Fix infinite loop in context view eating CPU until main window is shown.
    (LP: #854030)
    - Add kubuntu_fix_contextview_loop.diff

2e93a20... by Jonathan Thomas on 2011-09-16

Import patches-unapplied version 2:2.4.3-1ubuntu2 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: 8371ded6f87c7b4b2c70bc0b02eb0be51310aba1

New changelog entries:
  * Remove kubuntu_restricted_install.diff. Phonon-GStreamer (the default
    Phonon backend) handles plugin installation itself.

8371ded... by Felix Geyer on 2011-08-01

Import patches-unapplied version 2:2.4.3-1ubuntu1 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: 7d176c29d8bd0bdd08d47b7cd96aa356d2f9c18a

New changelog entries:
  * Merge from Debian unstable, remaining changes:
    - Don't build-depend on libavformat-dev and libofa0-dev as libavcodec*
      is not allowed on cd images.
    - Don't compress amarok-dbg with bzip2 as pkg-kde-tools uses lzma for
      all packages.
    - Set KUBUNTU_DESKTOP_POT in debian/rules.
    - Add epoch "2:" to the version number.
    - Keep the following patches:
      + kubuntu/03_restricted_install.diff
      + kubuntu/07_dont_ask_music_dir.diff
  * Drop kubuntu/14_soundmenu_fix_desktop_file_path.diff and
    kubuntu/16_mpris2_update_metadata.diff, applied upstream.
  * Only install the documentation files that are actually used.

7d176c2... by Modestas Vainius <email address hidden> on 2011-07-30

Import patches-unapplied version 2.4.3-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: a8e1f7f20d31d3835cc4a382f809107447c1d0d1

New changelog entries:
  * New upstream release.
  * Switch Vcs-* field to kde-extras repository. (Closes: #635292)
  * Drop backport_no_kwallet_prompt_on_track_change.patch and
    backport_arm_build_fix.patch - integrated upstream.
  * Add upstream_fix_lyrics_autorefresh_in_some_cases.patch to fix lyrics
    autorefresh in some cases.

a8e1f7f... by Modestas Vainius <email address hidden> on 2011-07-24

Import patches-unapplied version 2.4.2-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 6c47d57d1c983c9ebcd7be599f724fa9434f1583

New changelog entries:
  * Fix FTBFS on armel (backport_arm_build_fix.patch).

6c47d57... by Modestas Vainius <email address hidden> on 2011-07-24

Import patches-unapplied version 2.4.2-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 6e4f92a778279e44e5ea452341f05910612e17bc

New changelog entries:
  * New upstream release.
  * Switch maintainer to Debian KDE Extras team, add myself to Uploaders,
    document committing/uploading rules in README.source.
  * Update documentation about Phonon backends in Amarok bug-presubj.
    (Closes: #629208)
  * Adapt debian_disable_qtscriptbindings_check_fix.diff to upstream changes.
  * Add ${perl:Depends} to amarok-common Depends.
  * Update install files.
  * Backport a patch to fix a bug which caused KWallet to prompt for a password
    on every track change (backport_no_kwallet_prompt_on_track_change.patch).
  * Override lintian "amarok: no-symbols-control-file".
  * Drop amarok-engine-xine (<< 2) and amarok-engine-yauap (<< 2) from amarok
    Conflicts. No longer relevant for stable.

6e4f92a... by Modestas Vainius <email address hidden> on 2011-06-01

Import patches-unapplied version 2.4.1-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3a147343bfc140310b44a958ae692857627da444

New changelog entries:
  * Build depend on kdelibs5-dev 4:4.5 and ship plugins for NFS and SMB
    collection support. (Closes: #620741)

3a14734... by Modestas Vainius <email address hidden> on 2011-05-07

Import patches-unapplied version 2.4.1-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: cf6c04bf687c5acb262d67200c5b1823ab9abc76

New changelog entries:
  * New upstream release.
  * No longer recommend phonon-backend-xine. Stick to what phonon metapackage
    depends on.
  * Bump Standards-Version to 3.9.2: no changes needed.
  * Drop backport_fix_plugin_version.diff, it was backported from upstream.
  * Call dh in compat=8 compliant way.

cf6c04b... by Modestas Vainius <email address hidden> on 2011-03-20

Import patches-unapplied version 2.4.1~beta1-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 4c5b248dcde59a4911fa6d91711dc9f0f5c05eed

New changelog entries:
  * New upstream beta release.
  * Drop backport_mute_button_fix.diff - backported from upstream.
  * Build depend on libqjson-dev.
  * Update install files.
  * Override amarok: embedded-library ... : libmysqlclient.
  * Backport a patch as recommended by upstream to fix plugin version
    (backport_fix_plugin_version.diff).

4c5b248... by Modestas Vainius <email address hidden> on 2011-03-20

Import patches-unapplied version 2.4.0-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3dda6e61dfa004412a5183569c106b543fb17768

New changelog entries:
  * Make amarok-dbg suggest libqtwebkit4-dbg.
  * Build depend on libqtwebkit-dev | libqt4-dev (<< 4:4.7.0). Closes: #618209
  * Backport backport_mute_button_fix.diff patch to really fix mute button.
    (Closes: #600159)