ubuntu/+source/k3b:applied/ubuntu/trusty-devel

Last commit made on 2013-11-12
Get this branch:
git clone -b applied/ubuntu/trusty-devel https://git.launchpad.net/ubuntu/+source/k3b
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/trusty-devel
Repository:
lp:ubuntu/+source/k3b

Recent commits

d26987a... by Jonathan Riddell on 2013-11-12

Import patches-applied version 2.0.2-7ubuntu1 to applied/ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 8fa0b014b11eeab7298a5b95166ae6c7cede410c
Unapplied parent: 5842454b30c4fad863101d40a1bfe5ed2e9076da

New changelog entries:
  * Merge with Debian, remaining changes:
    - Suggest, not recommend libk3b6-extracodecs (Cannot be on the CD)
    - Do not ship k3b documentation, it's for the KDE3 version.
    - Do not install unused scalable icons to save space
    - Keep kubuntu_02_kubuntu_restricted.diff
    - Keep kubuntu_03_no_missing_mp3_warn.diff
    - Keep kubuntu_05_no_system_settings.diff
    - Keep kubuntu_07_quicklists.diff
    - Disable 111_advice_debian_libk3b3-extracodes.diff and
      112_dont_require_mp3.diff which aren't required due to our mp3 patches.
    - swap kubuntu_06_libav_0.7.diff for Debian's
      Fixed_compilation_with_new_FFMPEG.patch

5842454... by Jonathan Riddell on 2013-11-12

kubuntu_07_quicklists.diff

No DEP3 Subject or Description header found

Gbp-Pq: kubuntu_07_quicklists.diff.

fcbe517... by Jonathan Riddell on 2013-11-12

kubuntu_05_no_system_settings.diff

No DEP3 Subject or Description header found

Gbp-Pq: kubuntu_05_no_system_settings.diff.

a0c164e... by Jonathan Riddell on 2013-11-12

kubuntu_03_no_missing_mp3_warn.diff

No DEP3 Subject or Description header found

Gbp-Pq: kubuntu_03_no_missing_mp3_warn.diff.

e1d881b... by Jonathan Riddell on 2013-11-12

kubuntu_02_kubuntu_restricted.diff

No DEP3 Subject or Description header found

Gbp-Pq: kubuntu_02_kubuntu_restricted.diff.

9e37328... by Jonathan Riddell on 2013-11-12

[PATCH] Prefer growisofs to wodim for DVD/BluRay burning.

Gbp-Pq: Prefer-growisofs-to-wodim-for-DVD-BluRay-burning.patch.

208ce9c... by Jonathan Riddell on 2013-11-12

ffmpeg-more.diff

No DEP3 Subject or Description header found

Gbp-Pq: ffmpeg-more.diff.

37e96bb... by Jonathan Riddell on 2013-11-12

[PATCH] Fix K3B to build with recent FFMPEG versions

Gbp-Pq: Fix-K3B-to-build-with-recent-FFMPEG-versions.patch.

b82794c... by Jonathan Riddell on 2013-11-12

[PATCH] fix sox detection with sox >= 14.4.0

Gbp-Pq: fix-sox-detection-with-sox-14.4.0.patch.

57b5549... by Jonathan Riddell on 2013-11-12

[PATCH] k3bsetup: put the shebang in the first line

Gbp-Pq: k3bsetup-put-the-shebang-in-the-first-line.patch.