[SCM] bitmeter/master: Modernize cdbs: Do copyright-check in maintainer script (not during build).

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4502ac311c4cf44a4fdb8c727b4da26b74005f6d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Aug 24 11:51:32 2017 +0200

    Modernize cdbs: Do copyright-check in maintainer script (not during build).

diff --git a/debian/copyright-check b/debian/copyright-check
new file mode 100755
index 0000000..6a0186c
--- /dev/null
+++ b/debian/copyright-check
@@ -0,0 +1,27 @@
+#!/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/>.
+
+set -eu
+
+# extract metadata from graphics files before copyright check
+export DEB_COPYRIGHT_EXTRACT_EXTS="png"
+
+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
diff --git a/debian/rules b/debian/rules
index 64e6c3c..bd929e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,3 @@
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
--include /usr/share/cdbs/1/rules/utils.mk
-
-# Avoid PNG files upsetting dpkg-source
-DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^\./(doc/.*\.png|debian/(changelog|copyright(|_hints|_newhints)))$

-- 
Bitmeter packaging