Amarok

lp:amarok

Created by Philip Muškovac and last modified
Get this branch:
bzr branch lp:amarok

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Deprecated Projected Neon
Project:
Amarok
Status:
Development

Import details

Import Status: Failed

This branch is an import of the HEAD branch of the Git repository at https://invent.kde.org/multimedia/amarok.

The import has been suspended because it failed 5 or more times in succession.

Last successful import was .

Import started on alnitak and finished taking 25 seconds — see the log
Import started on alnitak and finished taking 20 seconds — see the log
Import started on izar and finished taking 2 minutes — see the log
Import started on izar and finished taking 2 minutes — see the log

Recent revisions

32318. By l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

32317. By Yuri Chornoivan <email address hidden>

Extract messages from QML

32316. By maelcum

Make include compatible with mariadb

When using mariadb (I still had to set a few things in the CMake
cache manually), the mysql / mariadb include path is added to the
include paths, so no need to include the mysql/ before the header
name. Omitting it allows to get mysql.h from either
[...]/include/mysql/ or [...]/include/mariadb/.

Note that using mariadb seems to be mandatory in Kubuntu 20.04
because the MySQL version it ships does not include libmysqld
anymore.

32315. By Yuri Chornoivan <email address hidden>

GIT_SILENT: add Amarok icon as repository logo

32314. By l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

32313. By l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

32312. By Heiko Becker

Merge branch 'freebsd_compil_mysql' into 'master'

fix compilation on FreeBSD where --libmysql-libs does not exist

See merge request kde/amarok!5

32311. By Heiko Becker

Merge branch 'remove-mpris1' into 'master'

Remove MPRIS1 support

See merge request kde/amarok!1

32310. By l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

32309. By l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.