tags 322859 + pending
thanks
Hi,
I've fixed this issue (patch attached) and also uploaded a NMU to
DELAYED/5-day, as Angus is VAC.
Marc
--
BOFH #411:
Traffic jam on the Information Superhighway.
#
diff -wru Embperl-2.0.0/debian/changelog libembperl-perl-2.0.0/debian/changelog
--- Embperl-2.0.0/debian/changelog 2005-08-24 09:59:48.000000000 +0200
+++ libembperl-perl-2.0.0/debian/changelog 2005-08-24 09:59:41.000000000 +0200
@@ -1,3 +1,12 @@
+libembperl-perl (2.0.0-0.1) unstable; urgency=low
+
+ * Non-maintainer upload (Angus is VAC)
+ * New upstream release:
+ + Compatible to the new mod-perl2 API (Closes: #322859)
+ + NEWS file was removed, so we don't install it.
+
+ -- Marc 'HE' Brockschmidt <[EMAIL PROTECTED]> Mon, 22 Aug 2005 18:35:40 +0200
+
libembperl-perl (2.0rc3-1) unstable; urgency=low
* New upstream release.
diff -wru Embperl-2.0.0/debian/control libembperl-perl-2.0.0/debian/control
--- Embperl-2.0.0/debian/control 2005-08-24 09:59:48.000000000 +0200
+++ libembperl-perl-2.0.0/debian/control 2005-08-24 09:59:41.000000000 +0200
@@ -1,14 +1,14 @@
Source: libembperl-perl
Section: web
Priority: optional
-Build-Depends: apache-dev, apache, libapache-mod-perl, apache2-prefork-dev (>= 2.0.50-10), apache2-mpm-prefork (>= 2.0.50-10), libapache2-mod-perl2 (>= 1.99.14-4), libwww-perl, libapache-sessionx-perl, libcgi-pm-perl | perl-modules (>= 5.8.0) | libcgi-perl, libxslt1-dev, debhelper (>= 3.0.5), perl (>= 5.6.0-17), netbase
+Build-Depends: apache-dev, apache, libapache-mod-perl, apache2-prefork-dev (>= 2.0.50-10), apache2-mpm-prefork (>= 2.0.50-10), libapache2-mod-perl2 (>= 1.999.22-1), libwww-perl, libapache-sessionx-perl, libcgi-pm-perl | perl-modules (>= 5.8.0) | libcgi-perl, libxslt1-dev, debhelper (>= 3.0.5), perl (>= 5.6.0-17), netbase
Maintainer: Angus Lees <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
Package: libembperl-perl
Architecture: any
Depends: ${perl:Depends}, ${shlibs:Depends}, libwww-perl, libcgi-pm-perl | perl-modules (>= 5.8.0) | libcgi-perl
-Recommends: libapache2-mod-perl2 (>= 1.99.14-4) | libapache-mod-perl | libfcgi-perl, libapache-sessionx-perl
+Recommends: libapache2-mod-perl2 (>= 1.999.22-1) | libapache-mod-perl | libfcgi-perl, libapache-sessionx-perl
Suggests: mmm-mode, libdbix-recordset-perl
Description: A system for building dynamic websites with Perl
Embperl gives you the power to embed Perl code in your HTML/XML
diff -wru Embperl-2.0.0/debian/docs libembperl-perl-2.0.0/debian/docs
--- Embperl-2.0.0/debian/docs 2005-08-24 09:59:48.000000000 +0200
+++ libembperl-perl-2.0.0/debian/docs 2005-08-24 09:59:41.000000000 +0200
@@ -5,7 +5,6 @@
FeaturesD
Intro
IntroEmbperlObject
-NEWS
README
README.v2
TODO
diff -wru Embperl-2.0.0/debian/rules libembperl-perl-2.0.0/debian/rules
--- Embperl-2.0.0/debian/rules 2005-08-24 09:59:48.000000000 +0200
+++ libembperl-perl-2.0.0/debian/rules 2005-08-24 09:59:41.000000000 +0200
@@ -36,7 +36,7 @@
#CVSEXTRAS = xs/Makefile.PL Config.pod
POD2TEXT = Changes Config CVS Faq Features FeaturesD \
- Intro IntroEmbperlObject NEWS TipsAndTricks
+ Intro IntroEmbperlObject TipsAndTricks
APACHE_HDR=$(shell $(APXS) -q INCLUDEDIR)
APAHCE_SRC=$(shell $(APXS) -q LIBEXECDIR)
diff -wru Embperl-2.0.0/Makefile.PL libembperl-perl-2.0.0/Makefile.PL
--- Embperl-2.0.0/Makefile.PL 2005-08-24 09:59:48.000000000 +0200
+++ libembperl-perl-2.0.0/Makefile.PL 2005-08-24 09:59:41.000000000 +0200
@@ -565,13 +565,13 @@
}
else
{
- eval 'use Apache2::BuildConfig' ;
+ eval 'use Apache2::BuildConfig' unless $ENV{FORCEMP1};
- if ($@ eq '')
+ if (!$ENV{FORCEMP1} and $@ eq '')
{
$mp2Apache2 = 1 ;
$mp2cfg = Apache2::BuildConfig -> new ;
- $apache_src = $mp2cfg -> {MP_AP_PREFIX} || $mp2cfg -> {ap_includedir} ;
+ $apache_src ||= $mp2cfg -> {MP_AP_PREFIX} || $mp2cfg -> {ap_includedir} ;
print "Found mod_perl 2.0\n" ;
}
else
@@ -580,11 +580,11 @@
if ($@ eq '')
{
- $apache_src = $Apache::MyConfig::Setup{Apache_Src} ;
+ $apache_src ||= $Apache::MyConfig::Setup{Apache_Src} ;
}
else
{
- $apache_src = '' ;
+ $apache_src ||= '' ;
}
}
}
