Control: tag -1 + patch

On Wed, 05 Jun 2013 00:23:58 +0200, gregor herrmann wrote:

> (Sorry, I'm too tired now for checking the changes in the
> dh_installchangelogs code, but since there is something with HTML
> changelogs and new variables, I suppose there's a glitch ...)

I think I found it:

When no argument is passed, $upstream gets set in the foreach loop
(l.143 ff.).

Later, when the time comes to installing (l.212 ff.), we have:
    if (defined $upstream) {
        if (defined $upstream_text) {
        if (defined $upstream_html) {

but $upstream_text is never set before.

Adding it in the first loop seems to fix the problem:

#v+
diff --git a/dh_installchangelogs b/dh_installchangelogs
index d1e7949..7474572 100755
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -148,6 +148,7 @@ if (! defined $upstream) {
                                } @files;
                                if (@matches) {
                                        $upstream=shift @matches;
+                                       $upstream_text=$upstream;
                                        last;
                                }
                        }
#v-


Cheers,
gregor

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: The Cranberries: Ode To My Family

Attachment: signature.asc
Description: Digital signature

Reply via email to