Control: tags 807478 + patch Control: tags 807478 + pending Dear maintainer,
I've prepared an NMU for razor (versioned as 1:2.85-4.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - https://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Vic Chesnutt: Betty Lonely
diff -u razor-2.85/debian/changelog razor-2.85/debian/changelog
--- razor-2.85/debian/changelog
+++ razor-2.85/debian/changelog
@@ -1,3 +1,16 @@
+razor (1:2.85-4.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix "FTBFS with perl 5.22 in experimental (MakeMaker changes)":
+ replace PREFIX with DESTDIR in debian/rules.
+ (Closes: #807478)
+ * Additional change for perl 5.22: fix handling of section 5 manpages:
+ - drop unneeded handling from debian/rules
+ - add patch to adjust regexp for inserting man5 targets in Makefile.PL:
+ ExtUtils::MakeMaker now adds quotation marks.
+
+ -- gregor herrmann <gre...@debian.org> Thu, 10 Dec 2015 21:13:53 +0100
+
razor (1:2.85-4.1) unstable; urgency=medium
* Non-maintainer upload.
diff -u razor-2.85/debian/patches/series razor-2.85/debian/patches/series
--- razor-2.85/debian/patches/series
+++ razor-2.85/debian/patches/series
@@ -4,0 +5 @@
+INSTALLMAN5DIR.patch
diff -u razor-2.85/debian/rules razor-2.85/debian/rules
--- razor-2.85/debian/rules
+++ razor-2.85/debian/rules
@@ -35,14 +35,12 @@
dh_testroot
dh_prep
dh_installdirs
- $(MAKE) install PREFIX=$(CURDIR)/debian/razor/usr \
- INSTALLMAN5DIR=$(CURDIR)/debian/razor/usr/share/man/man5
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/razor
echo "# See razor-agent.conf (5)" > $(CURDIR)/debian/razor/etc/razor/razor-agent.conf
echo "# Change this to 5 for safer classification of MIME attachments. This will let more spam through" >> $(CURDIR)/debian/razor/etc/razor/razor-agent.conf
echo "logic_method = 4" >> $(CURDIR)/debian/razor/etc/razor/razor-agent.conf
echo "# Change the next line to a file to stop using syslog" >> $(CURDIR)/debian/razor/etc/razor/razor-agent.conf
echo "logfile = /var/log/razor-agent.log" >> $(CURDIR)/debian/razor/etc/razor/razor-agent.conf
- cp $(CURDIR)/blib/man5/* $(CURDIR)/debian/razor/usr/share/man/man5
cp $(CURDIR)/debian/razor-client.1p $(CURDIR)/debian/razor/usr/share/man/man1
mv $(CURDIR)/debian/razor/$(ARCHLIB)/Razor2/* $(CURDIR)/debian/razor/usr/share/perl5/Razor2/
rmdir $(CURDIR)/debian/razor/$(ARCHLIB)/Razor2
only in patch2:
unchanged:
--- razor-2.85.orig/debian/patches/INSTALLMAN5DIR.patch
+++ razor-2.85/debian/patches/INSTALLMAN5DIR.patch
@@ -0,0 +1,17 @@
+Description: EUMM in perl 5.22 adds a ". Adjust regexp.
+Origin: vendor
+Forwarded: no
+Author: gregor herrmann <gre...@debian.org>
+Last-Update: 2015-12-10
+
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -142,7 +142,7 @@
+ my $man5 = q{ \\
+ $(INST_MAN5DIR) $(INSTALLMAN5DIR)};
+
+- $inherited =~ s/(\$\((?:DEST)?INSTALL\w*MAN1DIR\))/$1$man5/gm;
++ $inherited =~ s/(\$\((?:DEST)?INSTALL\w*MAN1DIR\)"?)/$1$man5/gm;
+
+ return $inherited;
+ }
signature.asc
Description: Digital Signature
