lp:~neon/kajongg/master

Created by Philip Muškovac on 2012-09-20 and last modified on 2020-04-04
Get this branch:
bzr branch lp:~neon/kajongg/master

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Deprecated Projected Neon
Project:
kajongg
Status:
Development

Import details

Import Status: Reviewed

This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/kajongg.

The next import is scheduled to run in 3 hours.

Last successful import was 2 hours ago.

Import started 2 hours ago on alnitak and finished 2 hours ago taking 20 seconds — see the log
Import started 8 hours ago on izar and finished 8 hours ago taking 20 seconds — see the log
Import started 14 hours ago on izar and finished 14 hours ago taking 20 seconds — see the log
Import started 20 hours ago on alnitak and finished 20 hours ago taking 20 seconds — see the log
Import started on 2020-04-08 on alnitak and finished on 2020-04-08 taking 20 seconds — see the log
Import started on 2020-04-08 on izar and finished on 2020-04-08 taking 20 seconds — see the log
Import started on 2020-04-08 on alnitak and finished on 2020-04-08 taking 20 seconds — see the log
Import started on 2020-04-08 on izar and finished on 2020-04-08 taking 15 seconds — see the log
Import started on 2020-04-07 on alnitak and finished on 2020-04-07 taking 20 seconds — see the log
Import started on 2020-04-07 on alnitak and finished on 2020-04-07 taking 20 seconds — see the log

Recent revisions

3779. By l10n daemon script <email address hidden> on 2020-04-04

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"

3778. By Laurent Montel <email address hidden> on 2020-03-28

GIT_SILENT: ignore .cmake generated by qtc

3777. By l10n daemon script <email address hidden> on 2020-03-27

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"

3776. By l10n daemon script <email address hidden> on 2020-03-27

GIT_SILENT made messages (after extraction)

3775. By Antonio Rojas <email address hidden> on 2020-03-25

Fix DESTDIR usage

kajongg's build system uses DESTDIR during cmake to construct the command that creates the kajongg and kajonggserver symlinks in bindir.
This is a problem for distributions, which usually have separated cmake/make/make install stages with DESTDIR only available in the later one.
So distros are currently working around this in different ways, either creating the symlinks manually after make install (Gentoo, Fedora) or defining DESTDIR before running cmake (Arch, Opensuse).

This patch changes the symlink installation process to only make the DESTDIR substitution during make install.

Differential Revision: https://phabricator.kde.org/D27330

3774. By Pino Toscano on 2020-03-01

Merge remote-tracking branch 'origin/release/19.12'

3773. By l10n daemon script <email address hidden> on 2020-01-28

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"

3772. By l10n daemon script <email address hidden> on 2020-01-28

GIT_SILENT made messages (after extraction)

3771. By Yuri Chornoivan <email address hidden> on 2019-12-27

Update stale URLs

3770. By Luigi Toscano on 2019-12-17

Merge remote-tracking branch 'origin/release/19.12'

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.