From ecabe240bce12616e72c92808cb2447f09463f53 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 1 May 2008 15:40:57 -0400 Subject: [PATCH] When generating a debian changelog file, work around bug #478925 by including the alien changelog text inside the debian changelog entry. --- Alien/Package/Deb.pm | 8 ++++++-- debian/changelog | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Alien/Package/Deb.pm b/Alien/Package/Deb.pm index d8a524a..1d71920 100644 --- a/Alien/Package/Deb.pm +++ b/Alien/Package/Deb.pm @@ -334,10 +334,14 @@ sub prep { print OUT $this->name." (".$this->version."-".$this->release.") experimental; urgency=low\n"; print OUT "\n"; print OUT " * Converted from .".$this->origformat." format to .deb by alien version $Alien::Version\n"; + print OUT " \n"; + if (defined $this->changelogtext) { + my $ct=$this->changelogtext; + $ct=~s/^/ /gm; + print OUT $ct."\n"; + } print OUT "\n"; print OUT " -- ".$this->username." <".$this->email."> ".$this->date."\n"; - print OUT "\n"; - print OUT $this->changelogtext."\n" if defined $this->changelogtext; close OUT; # Control file. diff --git a/debian/changelog b/debian/changelog index 7f3dcd7..902a152 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -alien (8.72) UNRELEASED; urgency=low +alien (8.72) unstable; urgency=low * Use debhelper 7, rules file minimisation. * Improve parsing of tgz filenames, to avoid confusion when the filename includes the package type (ie, "noarch"). Patch from Andrej Ricnik-Bay. + * When generating a debian changelog file, work around bug #478925 by + including the alien changelog text inside the debian changelog entry. - -- Joey Hess Thu, 24 Apr 2008 02:00:59 -0400 + -- Joey Hess Thu, 01 May 2008 15:40:34 -0400 alien (8.71) unstable; urgency=low