New upstream stable releasedebian/1.8.0-1

  - add debian/copyright stanzas for some new BSD-licensed cmake macros

2 files changed, 43 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index deb048d6..88d53d47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dbus (1.8.0-1) unstable; urgency=low
+
+  * New upstream stable release
+    - add debian/copyright stanzas for some new BSD-licensed cmake macros
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 20 Jan 2014 15:05:53 +0000
+
 dbus (1.7.10-2) unstable; urgency=low
 
   * Conditionalize libaudit and libcap-ng build-dependencies to [linux-any]
diff --git a/debian/copyright b/debian/copyright
index c68fc0da..a1d15c83 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -72,6 +72,17 @@ Copyright: © 1991-1993 The Regents of the University of California
 License: BSD-3-clause
 
 Files:
+ cmake/modules/FindGLib2.cmake
+ cmake/modules/FindGObject.cmake
+Copyright:
+ © 2008 Laurent Montel
+ © 2011 Raphael Kubo da Costa
+ © 2013 Ralf Habacker
+License: BSD-3-clause-generic
+Comment:
+ BSD-3-clause with more generic terms for the authors and copyright holders
+
+Files:
  dbus/dbus-hash.c
 Copyright:
  © 1991-1993 The Regents of the University of California
@@ -90,6 +101,7 @@ Copyright:
 License: GPL-2+ or AFL-2.1, and LGPL-2+
 Comment:
  The presence of LGPL code in this file makes its effective license GPL-2+.
+ It is not used in the shared library, or on Unix platforms.
 
 Files: dbus/versioninfo.rc.in
 Copyright: © 2005 g10 Code GmbH
@@ -226,6 +238,30 @@ License: BSD-3-clause
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
+License: BSD-3-clause-generic
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 License: AFL-2.1
  The Academic Free License
  v. 2.1