← Back to branch summary

~ubuntu-branches/ubuntu/trusty/k3b/trusty

« back to all changes in this revision

Viewing changes to debian/changelog

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2013-11-12 10:36:01 UTC
  • mfrom: (2.1.20 sid)
  • Revision ID: package-import@ubuntu.com-20131112103601-q6vvln9lv3mg7qxh
Tags: 2.0.2-7ubuntu1
* 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/changelog
 
1
k3b (2.0.2-7ubuntu1) trusty; urgency=low
 
2
 
 
3
  * Merge with Debian, remaining changes:
 
4
    - Suggest, not recommend libk3b6-extracodecs (Cannot be on the CD)
 
5
    - Do not ship k3b documentation, it's for the KDE3 version.
 
6
    - Do not install unused scalable icons to save space
 
7
    - Keep kubuntu_02_kubuntu_restricted.diff
 
8
    - Keep kubuntu_03_no_missing_mp3_warn.diff
 
9
    - Keep kubuntu_05_no_system_settings.diff
 
10
    - Keep kubuntu_07_quicklists.diff
 
11
    - Disable 111_advice_debian_libk3b3-extracodes.diff and
 
12
      112_dont_require_mp3.diff which aren't required due to our mp3 patches.
 
13
    - swap kubuntu_06_libav_0.7.diff for Debian's
 
14
      Fixed_compilation_with_new_FFMPEG.patch
 
15
 
 
16
 -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 12 Nov 2013 10:36:01 +0000
 
17
 
 
18
k3b (2.0.2-7) unstable; urgency=low
 
19
 
 
20
  * Team upload.
 
21
 
 
22
  [ Lisandro Damián Nicanor Pérez Meyer ]
 
23
  * Enable the lame-based MP3 encoding plugin (based on Pino's work):
 
24
    - Build-Depend on libmp3lame-dev.
 
25
    - Install the new plugin (and its configuration) in libk3b6-extracodecs.
 
26
 
 
27
  [ Pino Toscano ]
 
28
  * Update Vcs-* headers.
 
29
  * Bump Standards-Version to 3.9.4, no changes required.
 
30
  * Add Fix-K3B-to-build-with-recent-FFMPEG-versions.patch (backported from
 
31
    upstream branch 2.0) and ffmpeg-more.diff to fix compatibility with newer
 
32
    ffmpeg/libav versions. (Closes: #720799)
 
33
  * Add Prefer-growisofs-to-wodim-for-DVD-BluRay-burning.patch (backported from
 
34
    upstream branch 2.0) to prefer growisofs to wodim for DVD/BluRay; add the
 
35
    growisofs recommend. (Closes: #714944)
 
36
  * Suggest kde-config-cddb for the CDDB configuration page. (Closes: #696828)
 
37
 
 
38
 -- Pino Toscano <pino@debian.org>  Sun, 25 Aug 2013 18:42:53 +0200
 
39
 
1
40
k3b (2.0.2-6ubuntu1) raring-proposed; urgency=low
2
41
 
3
42
  * Merge with Debian unstable, remaining changes: