[Build-common-hackers] Bug#625448: cdbs: Do not remove copyright_newhints if it contains new information

[Olivier Aubert]

Package: cdbs
Version: 0.4.93
Severity: normal
Tags: patch

When new copyright information is detected by licensecheck, the displayed procedure advises to compare/replace copyright_hints with copyright_newhints. However, if COPYRIGHT_CHECK_STRICT is not set, the copyright_newhints is removed in all cases, which makes the file unavailable for further processing.

The proposed patch removes the copyright_newhints only if there is no further processing to do.


-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.38-2-686 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash

Versions of packages cdbs depends on:
ii  debhelper                     8.1.3      helper programs for debian/rules

Versions of packages cdbs recommends:
ii  autotools-dev                 20100122.1 Update infrastructure for config.{

Versions of packages cdbs suggests:
ii  devscripts                    2.10.72    scripts to make the life of a Debi

-- no debconf information
-------------- next part --------------
>From 2e9c137bec3f5fc708d4e52c77d01a3b5ad76bd9 Mon Sep 17 00:00:00 2001
From: Olivier Aubert <olivier.aubert at liris.cnrs.fr>
Date: Tue, 3 May 2011 14:29:13 +0200
Subject: [PATCH] Do not remove debian/copyright_newhints if it contains new
 information

---
 1/rules/utils.mk.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/1/rules/utils.mk.in b/1/rules/utils.mk.in
index da62397..60eb57d 100644
--- a/1/rules/utils.mk.in
+++ b/1/rules/utils.mk.in
@@ -103,8 +103,8 @@ debian/stamp-copyright-check:
 			$(if $(DEB_COPYRIGHT_CHECK_STRICT),exit 1,:); \
 		else \
 			echo 'No new copyright notices found - assuming no news is good news...'; \
+		        rm -f debian/copyright_newhints; \
 		fi; \
-		rm -f debian/copyright_newhints; \
 	fi
 	touch $@
 
-- 
1.7.4.4