ubuntu/+source/k3b:ubuntu/xenial-devel

Last commit made on 2016-03-17
Get this branch:
git clone -b ubuntu/xenial-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:
ubuntu/xenial-devel
Repository:
lp:ubuntu/+source/k3b

Recent commits

6fdbd82... by Robert Ancell on 2016-03-17

Import patches-unapplied version 2.0.3-0ubuntu5 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 894861629e7b10c0164ae7eb26ea688e4b94ccb8

New changelog entries:
  * debian/patches/cmake-duplicate-doc.diff:
    - Fix FTBFS

8948616... by Robert Ancell on 2016-03-17

Import patches-unapplied version 2.0.3-0ubuntu4 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 3c7e3f4dcdae1d3de05750abffa3aaeae91c3c54

New changelog entries:
  * debian/patches/audio_video_categories.diff:
    - Add to the Audio and Video categories (LP: #1558346)

3c7e3f4... by Steve Langasek on 2015-08-10

Import patches-unapplied version 2.0.3-0ubuntu3 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: a6f42e48215b95bfd85a92e3f0ae72727cbb17a3

New changelog entries:
  * No-change rebuild against libflac++6v5

a6f42e4... by Jonathan Riddell on 2015-04-01

Import patches-unapplied version 2.0.3-0ubuntu2 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 8307fdcbf286137b90faee198eae6b9770773f12

New changelog entries:
  * Update headers in kubuntu_02_kubuntu_restricted.diff
  * Fix K3B -> K3b typo in kubuntu_02_kubuntu_restricted.diff

8307fdc... by Scarlett Gately Moore on 2014-11-06

Import patches-unapplied version 2.0.3-0ubuntu1 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: faaa979d7e44fa4b07d9b0035509ea66d3999e0f

New changelog entries:
  * Merge from Debian unstable. Remaining changes:
    - Suggest, not recommend libk3b6-extracodecs (Cannot be on the CD)
    - 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_01_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.
  * New upstream release.
    - Remove patches applied upstream:
      Fixed_compilation_with_new_FFMPEG.patch
      114_bug587996_bdr_capacity_fix.diff
      k3bsetup-put-the-shebang-in-the-first-line.patch
      fix-sox-detection-with-sox-14.4.0.patch
      Fix-K3B-to-build-with-recent-FFMPEG-versions.patch
      Prefer-growisofs-to-wodim-for-DVD-BluRay-burning.patch
    - Remove patches that do not apply:
      k3bscsicommand_bsd-Do-not-access-the-scsi_sense_data.patch
      This was rewritten using switch case and this patch
      could not be applied in any way, if it is even required anymore.
      ffmpeg-more.diff
      Code was rewritten upstream and this patch could not be applied in
      any way.
    - Recreated kubuntu_05_no_system_settings.diff (could not get it
      to apply) as kubuntu_01_no_system_settings.diff and
      included DEP3 headers.
    - Added DEP3 Headers for the remain kubuntu_* patches.

faaa979... by Scott Kitterman on 2014-10-26

Import patches-unapplied version 2.0.2-8 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 2ae6a855a7263973a373413d9c69b95284959008

New changelog entries:
  * Team upload.
  * Add udisks2 to depends (Closes: #730130)

2ae6a85... by Reinhard Tartler on 2014-05-13

Import patches-unapplied version 2.0.2-7.1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 758d3307974ae21360096f04e134a66b04efe7b6

New changelog entries:
  * Non-maintainer upload.
  * Disable the FFmpeg plugin (Closes: #739312)

758d330... by Pino Toscano <email address hidden> on 2013-08-25

Import patches-unapplied version 2.0.2-7 to debian/sid

Imported using git-ubuntu import.

Changelog parent: a78c5658f1ea574e053cff3f39a5e19630626b1c

New changelog entries:
  * Team upload.
  [ Lisandro Damián Nicanor Pérez Meyer ]
  * Enable the lame-based MP3 encoding plugin (based on Pino's work):
    - Build-Depend on libmp3lame-dev.
    - Install the new plugin (and its configuration) in libk3b6-extracodecs.
  [ Pino Toscano ]
  * Update Vcs-* headers.
  * Bump Standards-Version to 3.9.4, no changes required.
  * Add Fix-K3B-to-build-with-recent-FFMPEG-versions.patch (backported from
    upstream branch 2.0) and ffmpeg-more.diff to fix compatibility with newer
    ffmpeg/libav versions. (Closes: #720799)
  * Add Prefer-growisofs-to-wodim-for-DVD-BluRay-burning.patch (backported from
    upstream branch 2.0) to prefer growisofs to wodim for DVD/BluRay; add the
    growisofs recommend. (Closes: #714944)
  * Suggest kde-config-cddb for the CDDB configuration page. (Closes: #696828)

a78c565... by Lisandro Damián Nicanor Pérez Meyer <email address hidden> on 2012-08-23

Import patches-unapplied version 2.0.2-6 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 6f8eba10c61200be85f935bf016fa1687371b33f

New changelog entries:
  * Team upload.
  [ Pino Toscano ]
  * Compress k3b-data and k3b-i18n as xz.
  * Add fix-sox-detection-with-sox-14.4.0.patch (backported from upstream
    branch 2.0) to fix the detection of sox >= 14.4. (Closes: #675737)

6f8eba1... by Pino Toscano <email address hidden> on 2012-06-01

Import patches-unapplied version 2.0.2-5 to debian/sid

Imported using git-ubuntu import.

Changelog parent: be2a033e6d92a3e6c7b9f5f2456f9a8a1bdec932

New changelog entries:
  * Team upload.
  * Bump Standards-Version to 3.9.3, no changes required.
  * Drop the libmusicbrainz4-dev build dependency, since musicbrainz v2 is
    long deprecated and will be removed soon. (Closes: #666531)
  * Bump to debhelper compatibility v9:
    - bump the debhelper build dependency to 9
    - bump compat to 9
  * Link with --as-needed.