[Pkg-voip-commits] [ring] 03/12: Merged two GNUAllPermissive licenced files

[Alexandre Viau]

This is an automated email from the git hooks/post-receive script.

aviau pushed a commit to branch master
in repository ring.

commit 02503df60284abddffb3b7751d7f53c23bb3a96a
Author: aviau <alexandre at alexandreviau.net>
Date:   Fri Apr 8 10:37:01 2016 -0400

    Merged two GNUAllPermissive licenced files
---
 debian/copyright | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 6e02867..eec87ef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -113,16 +113,14 @@ Copyright: 2008 Benjamin Kosnik <bkoz at redhat.com>
 License: GNUAllPermissive
 
 Files: daemon/m4/ax_cxx_compile_stdcxx.m4
+       daemon/m4/dolt.m4
 Copyright: 2008 Benjamin Kosnik <bkoz at redhat.com>
            2012 Zack Weinberg <zackw at panix.com>
            2013 Roy Stogner <roystgnr at ices.utexas.edu>
            2014-2015 Google Inc.
            2015 Paul Norman <penorman at mac.com>
            2015 Moritz Klammler <moritz at klammler.eu>
-License: GNUAllPermissive
-
-Files: daemon/m4/dolt.m4
-Copyright: 2007-2010 Josh Triplett <josh at joshtriplett.org>
+           2007-2010 Josh Triplett <josh at joshtriplett.org>
 License: GNUAllPermissive
 
 Files: daemon/src/media/video/androidvideo/video_device_monitor_impl.cpp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/ring.git