[Pkg-voip-commits] [pjproject] 16/17: Update copyright info: Rewrite maintainer script copyright-check.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository pjproject.

commit c1a3cab19623656afb13c3bb3185e7637e7bf37f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Sep 30 23:03:23 2017 +0200

    Update copyright info: Rewrite maintainer script copyright-check.
---
 debian/copyright       |  7 +++++++
 debian/copyright-check | 33 ++++++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 1da1b76..69bee1b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -169,6 +169,10 @@ Files: debian/*
 Copyright: 2013, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 License: GPL-2+
 
+Files: debian/copyright-check
+Copyright: 2016-2017, Jonas Smedegaard <dr at jones.dk>
+License: GPL-3+
+
 License: Apache-2
 License-Reference: /usr/share/common-licenses/Apache-2.0
 
@@ -199,6 +203,9 @@ License: FSFUL
 License: GPL-2+
 License-Reference: /usr/share/common-licenses/GPL-2
 
+License: GPL-3+
+License-Reference: /usr/share/common-licenses/GPL-3
+
 License: LGPL-2+
 License-Reference: /usr/share/common-licenses/LGPL-2
 
diff --git a/debian/copyright-check b/debian/copyright-check
index e0eef4f..4a4a2bf 100755
--- a/debian/copyright-check
+++ b/debian/copyright-check
@@ -1,11 +1,30 @@
 #!/bin/sh
+# Copyright © 2016-2017  Jonas Smedegaard <dr at jones.dk>
+# Description: helper script to update copyright_hints
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# fail if check fails
-export DEB_MAINTAINER_MODE=1
+set -eu
 
-# bootstrap if this is first ever copyright-check
-test -f debian/copyright_hints | touch debian/copyright_hints
+# extract metadata from binary media files, and
+# skip binary media files unlikely to contain copyright/licensing metadata
+export DEB_COPYRIGHT_EXTRACT_EXTS="png jpg"
+export DEB_COPYRIGHT_CHECK_IGNORE_EXTS="bmp dia pfx vsd"
+export DEB_COPYRIGHT_EXTRACT_PATHS_EXIF="pjmedia/docs/media-srtp-transport.PNG pjmedia/docs/media-transport.PNG"
 
-# these may both fail - we want its fallout for further analysis
-debian/rules.copyright-check pre-build || true
-debian/rules.copyright-check clean || true
+make -f /usr/share/cdbs/1/rules/utils.mk pre-build || true
+make -f /usr/share/cdbs/1/rules/utils.mk clean DEB_COPYRIGHT_CHECK_STRICT=1
+
+# unconditionally merge changes - safe to do with git-tracked package
+[ ! -f debian/copyright_newhints ] || mv -f debian/copyright_newhints debian/copyright_hints

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