[Build-common-hackers] Bug#451476: cdbs: DEB_INSTALL_CHANGELOGS_curpkg doesn't override DEB_INSTALL_CHANGELOGS_ALL

[Matthew Rosewarne]

Package: cdbs
Version: 0.4.50
Severity: minor
Tags: patch

While packaging libvncserver, I ran into the problem of the upstream source 
having multiple different changelogs for several components.  While most of 
the packages use the changelog specified in the default 
DEB_INSTALL_CHANGELOGS_ALL (which is ChangeLog), for some packages I define 
DEB_INSTALL_CHANGELOGS_foo = foo/ChangeLog.  However, the resulting 
package "foo" does not seem to respect DEB_INSTALL_CHANGELOGS_foo and 
contains changelog from DEB_INSTALL_CHANGELOGS_ALL.

Attached is a patch against rules/debhelper.mk that makes it install 
DEB_INSTALL_CHANGELOGS_foo for packages that define it, and 
DEB_INSTALL_CHANGELOGS_ALL for the rest.  The patch also makes it not assign 
the default changelog files to DEB_INSTALL_CHANGELOGS_ALL if it was already 
defined in debian/rules.

To make your lives easier, I've also included a version of the patch that 
doesn't conflict with the patch from #451226.

--- System information. ---
Architecture: i386
Kernel:       Linux 2.6.22-2-k7

Debian Release: lenny/sid
  800 testing         security.debian.org 
  800 testing         ftp.us.debian.org 
  700 unstable        ftp.us.debian.org 

--- Package information. ---
Depends         (Version) | Installed
=========================-+-============
debhelper     (>= 5.0.30) | 5.0.60

-------------- next part --------------
A non-text attachment was scrubbed...
Name: dh_installchangelogs.patch
Type: text/x-diff
Size: 1819 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/build-common-hackers/attachments/20071116/025da34f/attachment.patch 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dh_installchangelogs+451226.patch
Type: text/x-diff
Size: 1890 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/build-common-hackers/attachments/20071116/025da34f/attachment-0001.patch 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://lists.alioth.debian.org/pipermail/build-common-hackers/attachments/20071116/025da34f/attachment.pgp