This is an automated email from the git hooks/post-receive script.
fsfs pushed a commit to branch master
in repository libembperl-perl.
commit fdabfbe035aa946b28e485f1334747e8c34aea3c
Author: Florian Schlichting <f...@debian.org>
Date: Mon Apr 21 22:09:35 2014 +0200
Drop patches applied upstream
- pod-errors.patch must have been overlooked, refresh
- delay.patch was looked at and the 1s delay was integrated upstream;
not sure if the rest is necessary, so see if we can build without
---
..._for_perl_version_specific_error_messages.patch | 48 -----------------
debian/patches/load_apache24_mpm.patch | 44 ----------------
debian/patches/pod-errors.patch | 8 +--
debian/patches/series | 5 --
debian/patches/spelling.patch | 35 -------------
debian/patches/test_suite_issues.patch | 61 ----------------------
6 files changed, 4 insertions(+), 197 deletions(-)
diff --git
a/debian/patches/disable_tests_checking_for_perl_version_specific_error_messages.patch
b/debian/patches/disable_tests_checking_for_perl_version_specific_error_messages.patch
deleted file mode 100644
index e346643..0000000
---
a/debian/patches/disable_tests_checking_for_perl_version_specific_error_messages.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Disable tests which rather test Perl's error messages than Embperl
-Author: Axel Beckert <a...@debian.org>
-Forwarded: not-needed
-
-Index: libembperl-perl/test.pl
-===================================================================
---- libembperl-perl.orig/test.pl 2014-01-26 01:26:35.000000000 +0100
-+++ libembperl-perl/test.pl 2014-01-26 01:36:20.000000000 +0100
-@@ -407,39 +407,6 @@
- 'errors' => '1',
- 'repeat' => 2,
- },
-- 'includeerr2.htm' => {
-- 'errors' => 4,
-- 'version' => 1,
-- 'condition' => '$] >= 5.006001',
-- },
-- 'includeerr2.htm' => {
-- 'errors' => 5,
-- 'version' => 2,
-- 'repeat' => 2,
-- 'condition' => '$] >= 5.006001 && $] < 5.014000',
-- },
-- 'includeerr2.htm' => {
-- 'errors' => 3,
-- 'version' => 2,
-- 'repeat' => 2,
-- 'condition' => '$] >= 5.014000',
-- 'cmpext' => '514',
-- },
-- 'includeerr3.htm' => {
-- 'errors' => 2,
-- 'condition' => '$] < 5.014000',
-- 'cgi' => 0,
-- },
-- 'includeerr3.htm' => {
-- 'errors' => 2,
-- 'condition' => '$] >= 5.014000',
-- 'cmpext' => '514',
-- 'cgi' => 0,
-- },
-- 'includeerr3.htm' => {
-- 'errors' => 2,
-- 'cgi' => 1,
-- },
- 'includeerrbt.htm' => {
- 'errors' => 3,
- 'version' => 2,
diff --git a/debian/patches/load_apache24_mpm.patch
b/debian/patches/load_apache24_mpm.patch
deleted file mode 100644
index 10517f9..0000000
--- a/debian/patches/load_apache24_mpm.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: update shipped httpd.conf to work with apache2.4
-Author: Florian Schlichting <f...@debian.org>
-Forwarded: http://www.gossamer-threads.com/lists/modperl/embperl/105520
-
---- a/test/conf/httpd.min.conf.src
-+++ b/test/conf/httpd.min.conf.src
-@@ -41,6 +41,8 @@
-
- print OFH "LoadModule embperl_module
\"$EPPATH/blib/arch/auto/Embperl/Embperl.so\"\n" if ($MP2) ;
-
-+print OFH "LoadModule mpm_prefork_module
/usr/lib/apache2/modules/mod_mpm_prefork.so\n"; # if apache2.4
-+
-
- print OFH <<EOD ;
- ErrorLog tmp/httpd.err.log
-@@ -64,7 +66,6 @@
-
- print OFH <<EOD ;
- TypesConfig conf/null
--LockFile tmp/httpd.lock
-
-
- PerlSetEnv EMBPERL_SRC \"$EPPATH\"
---- a/test/conf/httpd.conf.src
-+++ b/test/conf/httpd.conf.src
-@@ -56,6 +56,10 @@
-
- print OFH "LoadModule embperl_module
\"$EPPATH/blib/arch/auto/Embperl/Embperl.so\"\n" if ($MP2) ;
-
-+print OFH "LoadModule mpm_prefork_module
/usr/lib/apache2/modules/mod_mpm_prefork.so\n"; # if apache24
-+print OFH "LoadModule authn_core_module
/usr/lib/apache2/modules/mod_authn_core.so\n"; # if apache24
-+print OFH "LoadModule authz_core_module
/usr/lib/apache2/modules/mod_authz_core.so\n"; # if apache24
-+
- ##print OFH "PassEnv ACTION_PREFIX\n" ;
- print OFH "PerlPassEnv TEST_PRELOAD\n" ;
-
-@@ -118,7 +122,6 @@
- print OFH <<EOD ;
-
- TypesConfig conf/null
--LockFile tmp/httpd.lock
-
-
- # needs mod_log_config
diff --git a/debian/patches/pod-errors.patch b/debian/patches/pod-errors.patch
index 23a4f35..816a71f 100644
--- a/debian/patches/pod-errors.patch
+++ b/debian/patches/pod-errors.patch
@@ -12,14 +12,14 @@ Forwarded: yes (mailing list)
@@ -1,6 +1,8 @@
=pod
--=head 2.5.0
+-=head 2.5.0 16. March 2014
+=encoding iso8859-1
+
-+=head1 2.5.0
++=head1 2.5.0 16. March 2014
- Do not clear old code before compiling a Embperl page
in Perl >= 5.14.x because it causes seg faults. This
-@@ -48,7 +50,7 @@
+@@ -59,7 +61,7 @@
Adaptions to Perl 5.14/16 were sponsored by NUREG GmbH
@@ -75,7 +75,7 @@ Forwarded: yes (mailing list)
Embperl::Features - Features von Embperl 2.0
--- a/Embperl/Form/Control/duration.pm
+++ b/Embperl/Form/Control/duration.pm
-@@ -99,6 +99,8 @@
+@@ -113,6 +113,8 @@
=pod
diff --git a/debian/patches/series b/debian/patches/series
index 70a1e61..fac1829 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-delay.patch
-load_apache24_mpm.patch
-test_suite_issues.patch
-disable_tests_checking_for_perl_version_specific_error_messages.patch
-spelling.patch
pod-errors.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index 209982e..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Fix typos in POD
-Author: Florian Schlichting <f...@debian.org>
-Forwarded: yes (mainling list)
-
---- a/Config.pod
-+++ b/Config.pod
-@@ -31,7 +31,7 @@
-
- If you have your own application and want to use Embperl's capbilities you can
- do so by calling Embperl::Execute. This allows you to build your own
application
--logic and use Embperl possibilites for rendering content.
-+logic and use Embperl possibilities for rendering content.
-
- =back
-
-@@ -748,7 +748,7 @@
-
-
- Set the secure flag of cookie that Embperl uses for the session id. If set the
--cookie will only be transfered over a secured connection.
-+cookie will only be transferred over a secured connection.
-
- =head2 Embperl_Log
-
---- a/Embperl.pod
-+++ b/Embperl.pod
-@@ -1267,7 +1267,7 @@
-
- Another nice thing about recipes is that they are not static. A recipe
- is defined by a recipe object. When a request comes in, Embperl calls
--the get_recipe method of teh application object, which by default
-+the get_recipe method of the application object, which by default
- calls the get_recipe of the named recipe object, which should return a array
- that describes what Embperl has to do. The get_recipe methods can of course
- build the array dynamically, looking, for example, at the request parameters
diff --git a/debian/patches/test_suite_issues.patch
b/debian/patches/test_suite_issues.patch
deleted file mode 100644
index 3099425..0000000
--- a/debian/patches/test_suite_issues.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Fix hash randomisation issues in test suite
-Author: Axel Beckert <a...@debian.org>
-Forwarded: not-yet
-
-Index: libembperl-perl/test/cmp/escape.htm
-===================================================================
---- libembperl-perl.orig/test/cmp/escape.htm 2014-01-26 01:42:30.000000000
+0100
-+++ libembperl-perl/test/cmp/escape.htm 2014-01-26 01:42:30.000000000
+0100
-@@ -41,17 +41,17 @@
- IMG: <img
src="http://localhost/tests?id=abcdefghijklmnopqrstuvwxyz&text=This%20is%20a%20text%20%3F%20%26%20%2B%20-%20%2521";
name="%20foo">
- FORM: <form
action="http://localhost/tests?id=abcdefghijklmnopqrstuvwxyz&text=This%20is%20a%20text%20%3F%20%26%20%2B%20-%20%2521";
name="%20foo">
-
--Hash in A <a href="http://localhost/tests?A=1&B=2";>
-+^Hash in A <a href=\"http:\/\/localhost\/tests\?(A=1\&B=2|B=2\&A=1)">
- Array in A <a href="http://localhost/tests?X=9&Y=8&Z=7";>
-
--Hash in H <a href="http://localhost/tests?A=1&B=2";>
-+^Hash in H <a href=\"http:\/\/localhost\/tests\?(A=1\&B=2|B=2\&A=1)">
- ^Array in H <a
href=\"http\:\/\/localhost\/tests\?(X=9|Y=8|Z=7)\&(X=9|Y=8|Z=7)\&(X=9|Y=8|Z=7)\">
-
-
- ^<a href=\"tst.html\?(par1=1|par2=2)&(par1=1|par2=2)\">1<\/a>
--^<a href=\"tst.html\?(par1=1&par2=2|par2=2&par1=1)&par3=3\">2<\/a>
--<a href="tst.html?par1=1&par2=2">3</a>
--<a href="tst.html?par1=1&par2=2&par3=3">4</a>
-+^<a
href=\"tst.html\?par([123])=\1\&par([123])=\2\&par([123])=\3\">2<\/a>
-+^<a href=\"tst.html\?(par1=1\&par2=2|par2=2\&par1=1)\">3</a>
-+^<a
href=\"tst.html\?par([123])=\1\&par([123])=\2\&par([123])=\3\">4</a>
-
-
-
-Index: libembperl-perl/test/cmp/include.htm
-===================================================================
---- libembperl-perl.orig/test/cmp/include.htm 2014-01-26 01:42:30.000000000
+0100
-+++ libembperl-perl/test/cmp/include.htm 2014-01-26 01:42:30.000000000
+0100
-@@ -43,7 +43,7 @@
-
<P><table><tr><td>fdat1</td><td>text1</td></tr><tr><td>test1</td><td>value1</td></tr></table></P>
- <H1> 7b.) Presetup \%fdat</H1>
-
--<P><table><tr><td>fdat2</td><td>text2</td></tr><tr><td>test2</td><td>value2</td></tr></table></P>
-+^<P><table>(<tr><td>fdat2</td><td>text2</td></tr><tr><td>test2</td><td>value2</td></tr>|<tr><td>test2</td><td>value2</td></tr><tr><td>fdat2</td><td>text2</td></tr>)</table></P>
- <H1> 7c.) Presetup \@ffld</H1>
-
- <P><table></table></P> @ffld = fdat3 test3
-Index: libembperl-perl/test/cmp/hidden.htm
-===================================================================
---- libembperl-perl.orig/test/cmp/hidden.htm 2013-08-29 16:17:33.000000000
+0200
-+++ libembperl-perl/test/cmp/hidden.htm 2014-01-26 01:46:45.000000000
+0100
-@@ -9,10 +9,10 @@
- <p> </p>
-
- a1<input type="hidden" name="feld1" value="Wert1"><input type="hidden"
name="feld2" value="Wert2"><input type="hidden" name="feld3"
value="Wert3"><input type="hidden" name="feld4" value="Wert4">
-- a2<input type="hidden" name="feld1" value="Pfalz"><input type="hidden"
name="feld2" value="Rhein"hessen"&Pfalz">
-+^ a2(<input type=\"hidden\" name=\"feld1\" value=\"Pfalz\"><input
type=\"hidden\" name=\"feld2\"
value=\"Rhein\"hessen\"\&Pfalz\">|<input type=\"hidden\"
name=\"feld2\" value=\"Rhein\"hessen\"\&Pfalz\"><input
type=\"hidden\" name=\"feld1\" value=\"Pfalz\">)
- a3<input type="hidden" name="feld2"
value="Rhein"hessen"&Pfalz">
- a4<input type="hidden" name="feld2"
value="Rhein"hessen"&Pfalz">
-- a5<input type="hidden" name="feld1" value="Pfalz"><input type="hidden"
name="feld2" value="Rhein"hessen"&Pfalz">
-+^ a5(<input type=\"hidden\" name=\"feld1\" value=\"Pfalz\"><input
type=\"hidden\" name=\"feld2\"
value=\"Rhein\"hessen\"\&Pfalz\">|<input type=\"hidden\"
name=\"feld2\" value=\"Rhein\"hessen\"\&Pfalz\"><input
type=\"hidden\" name=\"feld1\" value=\"Pfalz\">)
- a6<input type="hidden" name="feld2"
value="Rhein"hessen"&Pfalz">
- a7<input type="hidden" name="feld2"
value="Rhein"hessen"&Pfalz">
- a8<input type="hidden" name="feld4" value="Wert4"><input type="hidden"
name="feld3" value="Wert3"><input type="hidden" name="feld2"
value="Wert2"><input type="hidden" name="feld1" value="Wert1">
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libembperl-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
