summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-02-07 22:42:45 +0000
committerUlrich Müller <ulm@gentoo.org>2013-02-07 22:42:45 +0000
commita499721d3b1866cc0c21c405aa5a147d3364ce4f (patch)
tree2e8ff34a6997cda4a580dee7e071f205e9277336 /www-client
parentMove Creative Commons licenses to shorter names. (diff)
downloadgentoo-2-a499721d3b1866cc0c21c405aa5a147d3364ce4f.tar.gz
gentoo-2-a499721d3b1866cc0c21c405aa5a147d3364ce4f.tar.bz2
gentoo-2-a499721d3b1866cc0c21c405aa5a147d3364ce4f.zip
Move Creative Commons licenses to shorter names.
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/conkeror/ChangeLog8
-rw-r--r--www-client/conkeror/conkeror-1.0_pre20120223.ebuild6
-rw-r--r--www-client/conkeror/conkeror-1.0_pre20120527.ebuild6
3 files changed, 12 insertions, 8 deletions
diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog
index 1d39a76e8b4f..e1cc18821df1 100644
--- a/www-client/conkeror/ChangeLog
+++ b/www-client/conkeror/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/conkeror
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.32 2012/06/09 09:06:18 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.33 2013/02/07 22:42:45 ulm Exp $
+
+ 07 Feb 2013; Ulrich Müller <ulm@gentoo.org> conkeror-1.0_pre20120223.ebuild,
+ conkeror-1.0_pre20120527.ebuild:
+ Move Creative Commons licenses to shorter names.
*conkeror-1.0_pre20120527 (09 Jun 2012)
diff --git a/www-client/conkeror/conkeror-1.0_pre20120223.ebuild b/www-client/conkeror/conkeror-1.0_pre20120223.ebuild
index fe92f73b9c27..9315ca7ef0a0 100644
--- a/www-client/conkeror/conkeror-1.0_pre20120223.ebuild
+++ b/www-client/conkeror/conkeror-1.0_pre20120223.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-1.0_pre20120223.ebuild,v 1.6 2012/04/19 01:35:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-1.0_pre20120223.ebuild,v 1.7 2013/02/07 22:42:45 ulm Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
mirror://gentoo/conkeror.png"
# CC-BY-SA-3.0 for conkeror.png
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CCPL-Attribution-ShareAlike-3.0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0"
SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE=""
diff --git a/www-client/conkeror/conkeror-1.0_pre20120527.ebuild b/www-client/conkeror/conkeror-1.0_pre20120527.ebuild
index f1236095a078..52cea01877a2 100644
--- a/www-client/conkeror/conkeror-1.0_pre20120527.ebuild
+++ b/www-client/conkeror/conkeror-1.0_pre20120527.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-1.0_pre20120527.ebuild,v 1.1 2012/06/09 09:06:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-1.0_pre20120527.ebuild,v 1.2 2013/02/07 22:42:45 ulm Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
mirror://gentoo/conkeror.png"
# CC-BY-SA-3.0 for conkeror.png
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CCPL-Attribution-ShareAlike-3.0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""