From 3271803a378e8e6694d8fbb307921200d40f4c396a7c1bcb992941b2256c33e5 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Mon, 4 Feb 2013 16:26:10 +0000 Subject: [PATCH] Accepting request 150930 from openSUSE:Factory:Staging:spdx update license to new format OBS-URL: https://build.opensuse.org/request/show/150930 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/devscripts?expand=0&rev=6 --- devscripts.changes | 5 +++++ devscripts.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/devscripts.changes b/devscripts.changes index 2374813..cc206bb 100644 --- a/devscripts.changes +++ b/devscripts.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 4 09:15:37 UTC 2013 - coolo@suse.com + +- update license to new format + ------------------------------------------------------------------- Fri Oct 5 18:36:51 UTC 2012 - frank.lichtenheld@sophos.com diff --git a/devscripts.spec b/devscripts.spec index de15b91..2577a24 100644 --- a/devscripts.spec +++ b/devscripts.spec @@ -1,7 +1,7 @@ # # spec file for package devscripts # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Name: devscripts Version: 2.12.4 Release: 0 Summary: Scripts to make the life of a Debian Package maintainer easier -License: GPL-2.0+; GPL-2.0; GPL-3.0+; GPL-3.0; Artistic-2.0; GPL-1.0+ or Artistic-1.0; SUSE-Public-Domain; ISC +License: GPL-2.0+ and GPL-2.0 and GPL-3.0+ and GPL-3.0 and Artistic-2.0 and GPL-1.0+ or Artistic-1.0 and SUSE-Public-Domain and ISC Group: Development/Tools/Building Source0: http://ftp.de.debian.org/debian/pool/main/d/devscripts/devscripts_%{version}.tar.gz # PATCH-FIX-UPSTREAM remove bash auto completion and fix docbook template directories path.