[SCM] hydrogen/master: Modernize cdbs: Do copyright-check in source script (manually invoked, not during build).

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0bdc4f9473dae303cea46fc34bc1f8e2360c628b
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jul 19 09:28:46 2017 +0200

    Modernize cdbs: Do copyright-check in source script (manually invoked, not during build).

diff --git a/debian/copyright-check b/debian/copyright-check
new file mode 100755
index 0000000..3c1f9a1
--- /dev/null
+++ b/debian/copyright-check
@@ -0,0 +1,29 @@
+#!/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 images before copyright check
+# - and skip compiled localizations and audio.
+export DEB_COPYRIGHT_EXTRACT_EXTS="png"
+export DEB_COPYRIGHT_CHECK_IGNORE_EXTS="flac qm"
+
+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 2d93ba8..217c8b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,6 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 include /usr/share/cdbs/1/rules/upstream-tarball.mk
-include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
@@ -30,8 +29,6 @@ DEB_CMAKE_EXTRA_FLAGS = -DWANT_SHARED=OFF \
 
 DEB_UPSTREAM_URL = http://downloads.sourceforge.net/hydrogen
 
-DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^.*\.(flac|png|qm)|debian/(changelog|copyright(|_hints|_newhints))$
-
 # according to upstream INSTALL.txt this avoids potential clash with Qt3
 export QTDIR=/usr/share/qt4
 

-- 
hydrogen packaging