~kubuntu-packagers/kubuntu-packaging/+git/khtml:kubuntu_wily_archive

Last commit made on 2015-10-07
Get this branch:
git clone -b kubuntu_wily_archive https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/khtml
Members of Kubuntu Packagers can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
kubuntu_wily_archive
Repository:
lp:~kubuntu-packagers/kubuntu-packaging/+git/khtml

Recent commits

5c6541e... by Jonathan Riddell

NOCI
Release to wily.

2dd407b... by Jonathan Riddell

new upstream release

7b311f1... by Scarlett Gately Moore

Remove symbols file for backport only.

64e5c22... by Scarlett Gately Moore

Vivid backport

b105e89... by Jonathan Riddell

Release to wily.

a3fb39c... by Clive Johnston <clivejo@P500>

Adding symbols for both i386 and amd64 arch

13a6d4e... by Clive Johnston <clivejo@P500>

Adding new symbols to libkf5khtml5.symbols

6bb4513... by Clive Johnston <clivejo@P500>

new upstream release

5ea9fc9... by Harald Sitter

more copyright fixes

convert another convoluted license into its basic primitives of
gpl-2 or lgplg-2.1+ or mpl-1.1 this is an actual triple license so imply
add a license defintion for gpl-2 and mpl-1.1 instaed of the triple
definition

e8c9e24... by Harald Sitter

fix copyright spec compliance

A and B already means that the file contains code under A and code under B
'A and B' is not a distinct license it is rather a composite of
License: A
and
License: B

defining A and B therefore creats a duplicated definition if both are also
defined standalone.

change the copyright accordingly. the combo license stanzas are no more
and the previous or statement is now an and statement as the files in
question are not dual licensed in an either or fashion but parts are simply
one and other parts the other