[SCM] Debian packaging of libembperl-perl branch, master, updated. 2baa7e615f09fcbd06b84978a8ea35db745636df
Florian Schlichting
fschlich at zedat.fu-berlin.de
Tue Sep 25 21:35:47 UTC 2012
The following commit has been merged in the master branch:
commit b9b2df5f5783ba72d15fc2f38fc55c88b705848b
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date: Mon Sep 10 22:08:52 2012 +0200
patches deleted because they have been fully applied upstream: german.patch, new_process_group.patch, utf8.patch, fix-pod-errors.patch, fix-whatis.patch, fix-string-typo.patch, fix-pod-unescaped-unicode.patch.
diff --git a/debian/patches/cgi_pm.patch b/debian/patches/cgi_pm.patch
deleted file mode 100644
index cab3927..0000000
--- a/debian/patches/cgi_pm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Niko Tyni <ntyni at debian.org>
-Description: FTBFS: Test failure with CGI.pm >= 3.38
-Bug: #521971
-
---- a/Embperl.pm
-+++ b/Embperl.pm
-@@ -319,7 +319,7 @@
- {
- # the param_fetch needs CGI.pm 2.43
- #$params = $cgi->param_fetch( $_ ) ;
-- $params = $cgi->{$_} ;
-+ $params = $CGI::VERSION >= 2.43 ? $cgi->param_fetch( $_ ) : $cgi->{$_} ;
- if ($#$params > 0)
- {
- $fdat->{ $_ } = join ("\t", @$params) ;
diff --git a/debian/patches/fix-pod-errors.patch b/debian/patches/fix-pod-errors.patch
deleted file mode 100644
index 5870f2d..0000000
--- a/debian/patches/fix-pod-errors.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Description: fix POD errors
-Author: Jonathan Yu <jawnsy at cpan.org>
-Origin: vendor
-Forwarded: no
---- a/Embperl/Syntax.pm
-+++ b/Embperl/Syntax.pm
-@@ -806,24 +806,24 @@
-
- Remove next node if it consists of only white spaces and optKeepSpaces isn't set.
-
--=item 4
-+=item 3
-
- Replace next node with one space if next node consists only of white spaces and
- optKeepSpaces isn't set.
-
--=item 8
-+=item 4
-
- Set this node to ignore for output.
-
--=item 16
-+=item 5
-
- Remove all child nodes
-
--=item 32
-+=item 6
-
- Set all child nodes to ignore for output.
-
--=item 64
-+=item 7
-
- Calculate Attributes values of this node also for nodes that are set to ignore for output
- (makes only sense if 8 is also set).
-@@ -845,23 +845,23 @@
-
- Remove all white spaces after tag
-
--=item 4
-+=item 3
-
- Remove spaces and tabs before tag
-
--=item 8
-+=item 4
-
- Remove spaces and tabs after tag
-
--=item 16
-+=item 5
-
- Remove all spaces and tabs but one before tag
-
--=item 32
-+=item 6
-
- Remove all whihe space after text inside of tag
-
--=item 64
-+=item 7
-
- Remove spaces and tabs after text inside of tag
-
---- a/Embperl/Syntax/RTF.pm
-+++ b/Embperl/Syntax/RTF.pm
-@@ -429,6 +429,9 @@
-
-
- =pod
-+
-+=begin comment
-+
- 'RTF first paragraph' => {
- 'text' => '\pard',
- 'end' => '}',
-@@ -444,6 +447,8 @@
- },
- },
-
-+=end comment
-+
- =cut
-
- # Finds the first paragraph
-@@ -630,6 +635,9 @@
-
- 1;
- =pod
-+
-+=begin comment
-+
- #$Embperl::req -> component -> code ($_ep_rtf_code) ;
-
- my $x = $Embperl::req -> component -> code ;
-@@ -650,6 +658,9 @@
- print "result=$_ep_rtf_code\n" ;
-
- warn "RTF IF syntax error. Missing operator" if (!$op) ;
-+
-+=end comment
-+
- =cut
-
-
---- a/embpexec.pl.templ
-+++ b/embpexec.pl.templ
-@@ -82,5 +82,3 @@
-
- G. Richter (richter at dev.ecos.de)
-
--=end
--
---- a/embpmsgid.pl.templ
-+++ b/embpmsgid.pl.templ
-@@ -184,13 +184,3 @@
-
- G. Richter (richter at dev.ecos.de)
-
--=end
--
--
--
--
--
--
--
--
--
diff --git a/debian/patches/fix-pod-unescaped-unicode.patch b/debian/patches/fix-pod-unescaped-unicode.patch
deleted file mode 100644
index 0399ba9..0000000
--- a/debian/patches/fix-pod-unescaped-unicode.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: remove strange Unicode files from Validate.pm
- this corrects a Lintian warning because there is unescaped
- Unicode content in the POD.
-Author: Jonathan Yu <jawnsy at cpan.org>
-Origin: vendor
-Forwarded: no
---- a/Embperl/Form/Validate.pm
-+++ b/Embperl/Form/Validate.pm
-@@ -804,9 +804,6 @@
-
- -msg => 'The E-Mail address must contain at least one period.',
- must_contain_one_of => '.',
--
-- -msg => 'The E-Mail-Address is invalid. It must only not contain any special charaters.',
-- must_not_contain => '¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ',
- ],
-
-
diff --git a/debian/patches/fix-string-typo.patch b/debian/patches/fix-string-typo.patch
deleted file mode 100644
index 179e3bc..0000000
--- a/debian/patches/fix-string-typo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: fix string typos
- There is a typo in epmain.c in a constant string, which
- results in lintian errors. This patch simply corrects
- the typo in the source file.
-Author: Jonathan Yu <jawnsy at cpan.org>
-Origin: vendor
-Forwarded: no
---- a/epmain.c
-+++ b/epmain.c
-@@ -176,7 +176,7 @@
- case rcRefcntNotOne: msg ="[%d]ERR: %d: %s There is still %s reference(s) to the %s object, while there shouldn't be any." ; break ;
- case rcApacheErr: msg ="[%d]ERR: %d: %s Apache returns Error: %s %s" ; break ;
- case rcTooDeepNested: msg ="[%d]ERR: %d: %s Source data is too deep nested %s %s" ; break ;
-- case rcUnknownOption: msg ="[%d]ERR: %d: %s Unkown option '%s' in configuration directive '%s'" ; break ;
-+ case rcUnknownOption: msg ="[%d]ERR: %d: %s Unknown option '%s' in configuration directive '%s'" ; break ;
- case rcTimeFormatErr: msg ="[%d]ERR: %d: %s Format error in %s = %s" ; break ;
- case rcSubCallNotRequest: msg ="[%d]ERR: %d: %s A Embperl sub is called and no Embperl request is running %s %s" ; break ;
- case rcNotScalarRef: msg ="[%d]ERR: %d: %s %s need scalar in '%s'" ; break ;
diff --git a/debian/patches/fix-whatis.patch b/debian/patches/fix-whatis.patch
deleted file mode 100644
index e97651f..0000000
--- a/debian/patches/fix-whatis.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-Description: fix manpage whatis entries
-Author: Jonathan Yu <jawnsy at cpan.org>
-Origin: vendor
-Forwarded: no
---- a/Config.pod
-+++ b/Config.pod
-@@ -2,7 +2,7 @@
-
- =head1 NAME
-
--Configuration and calling
-+Embperl::Config - Configuration and calling
-
- =head1 Operating-Modes
-
---- a/Embperl/App.pm
-+++ b/Embperl/App.pm
-@@ -295,7 +295,7 @@
-
- =head1 NAME
-
--Embperl base class for application objects
-+Embperl::App - Embperl base class for application objects
-
- =head1 SYNOPSIS
-
---- a/Faq.pod
-+++ b/Faq.pod
-@@ -4,7 +4,7 @@
-
- =head1 NAME
-
--Embperl FAQ - embed Perl code in your HTML docs
-+Embperl::Faq - How to embed Perl code in your HTML docs
-
- =head1 CONTENTS
-
---- a/Embperl/Recipe.pm
-+++ b/Embperl/Recipe.pm
-@@ -65,7 +65,7 @@
-
- =head1 NAME
-
--Embperl base class for defining custom recipes
-+Embperl::Recipe - base class for defining custom recipes
-
- =head1 SYNOPSIS
-
---- a/Embperl/Recipe/Embperl.pm
-+++ b/Embperl/Recipe/Embperl.pm
-@@ -62,7 +62,7 @@
-
- =head1 NAME
-
--Embperl::Recipe::Embperl
-+Embperl::Recipe::Embperl - the default Embperl recipe
-
- =head1 SYNOPSIS
-
---- a/Embperl/Recipe/EmbperlXSLT.pm
-+++ b/Embperl/Recipe/EmbperlXSLT.pm
-@@ -68,7 +68,7 @@
-
- =head1 NAME
-
--Embperl::Recipe::EmbperlXSLT
-+Embperl::Recipe::EmbperlXSLT - recipe to perform an XSLT transformation last
-
- =head1 SYNOPSIS
-
---- a/Embperl/Recipe/XSLT.pm
-+++ b/Embperl/Recipe/XSLT.pm
-@@ -72,7 +72,7 @@
-
- =head1 NAME
-
--Embperl::Recipe::XSLT
-+Embperl::Recipe::XSLT - recipe for performing an XSLT transformation
-
- =head1 SYNOPSIS
-
---- a/Embperl/Session.pm
-+++ b/Embperl/Session.pm
-@@ -10,7 +10,7 @@
-
- =head1 NAME
-
--HTML::Embperl::Session
-+HTML::Embperl::Session - adaptation of Apache::Session to work with HTML::Embperl
-
- =head1 DESCRIPTION
-
---- a/Embperl/Syntax.pm
-+++ b/Embperl/Syntax.pm
-@@ -395,7 +395,7 @@
-
- =head1 NAME
-
--Embperl base class for defining custom syntaxes
-+Embperl::Syntax - base class for defining custom syntaxes
-
- =head1 SYNOPSIS
-
---- a/Embperl/Syntax/ASP.pm
-+++ b/Embperl/Syntax/ASP.pm
-@@ -250,7 +250,7 @@
-
- =head1 NAME
-
--ASP syntax module for Embperl
-+Embperl::Syntax::ASP - ASP syntax module for Embperl
-
- =head1 SYNOPSIS
-
---- a/Embperl/Syntax/Embperl.pm
-+++ b/Embperl/Syntax/Embperl.pm
-@@ -56,7 +56,7 @@
-
- =head1 NAME
-
--Embperl syntax module for Embperl.
-+Embperl::Syntax::Embperl - Embperl syntax module for Embperl.
-
- =head1 SYNOPSIS
-
---- a/Embperl/Syntax/EmbperlBlocks.pm
-+++ b/Embperl/Syntax/EmbperlBlocks.pm
-@@ -602,7 +602,7 @@
-
- =head1 NAME
-
--Embperl::Syntax::EmbperlBlocks
-+Embperl::Syntax::EmbperlBlocks - syntax for Embperl Blocks and metacommands
-
- =head1 SYNOPSIS
-
---- a/Embperl/Syntax/EmbperlHTML.pm
-+++ b/Embperl/Syntax/EmbperlHTML.pm
-@@ -180,7 +180,7 @@
-
- =head1 NAME
-
--Embperl::Syntax::EmbperlHTML
-+Embperl::Syntax::EmbperlHTML - syntax for HTML tags that Embperl processes
-
- =head1 SYNOPSIS
-
---- a/Embperl/Syntax/HTML.pm
-+++ b/Embperl/Syntax/HTML.pm
-@@ -413,7 +413,7 @@
-
- =head1 NAME
-
--Embperl::Syntax::HTML
-+Embperl::Syntax::HTML - define the syntax for HTML
-
- =head1 SYNOPSIS
-
---- a/Embperl/Syntax/Mail.pm
-+++ b/Embperl/Syntax/Mail.pm
-@@ -126,7 +126,7 @@
-
- =head1 NAME
-
--Embperl Taglib for sending mail
-+Embperl::Syntax::Mail - tag library for sending mail
-
- =head1 SYNOPSIS
-
---- a/Embperl/Syntax/MsgIdExtract.pm
-+++ b/Embperl/Syntax/MsgIdExtract.pm
-@@ -151,7 +151,7 @@
-
- =head1 NAME
-
--Embperl::Syntax::MsgIdExtract
-+Embperl::Syntax::MsgIdExtract - define syntax for i18n using Embperl blocks
-
- =head1 SYNOPSIS
-
---- a/Embperl/Syntax/POD.pm
-+++ b/Embperl/Syntax/POD.pm
-@@ -732,7 +732,7 @@
-
- =head1 NAME
-
--Embperl::Syntax::POD
-+Embperl::Syntax::POD - convert POD to XML on-the-fly
-
- =head1 SYNOPSIS
-
---- a/Embperl/Syntax/Perl.pm
-+++ b/Embperl/Syntax/Perl.pm
-@@ -72,7 +72,7 @@
-
- =head1 NAME
-
--Perl syntax module for Embperl
-+Embperl::Syntax::Perl - define Perl syntax for Embperl
-
- =head1 SYNOPSIS
-
---- a/Embperl/Syntax/RTF.pm
-+++ b/Embperl/Syntax/RTF.pm
-@@ -671,7 +671,7 @@
-
- =head1 NAME
-
--Embperl::Syntax::RTF
-+Embperl::Syntax::RTF - define syntax for RTF files
-
- =head1 SYNOPSIS
-
---- a/Embperl/Syntax/SSI.pm
-+++ b/Embperl/Syntax/SSI.pm
-@@ -432,7 +432,7 @@
-
- =head1 NAME
-
--SSI syntax module for Embperl
-+Embperl::Syntax::SSI - define SSI syntax for Embperl
-
- =head1 SYNOPSIS
-
---- a/Embperl/Syntax/Text.pm
-+++ b/Embperl/Syntax/Text.pm
-@@ -59,7 +59,7 @@
-
- =head1 NAME
-
--Text syntax module for Embperl
-+Embperl::Syntax::Text - define text syntax for Embperl
-
- =head1 SYNOPSIS
-
diff --git a/debian/patches/german.patch b/debian/patches/german.patch
deleted file mode 100644
index da16fc8..0000000
--- a/debian/patches/german.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: Fixed some manpages including invalid troff characters (usually
- german letters or such)
-Author: Gunnar Wolf <gwolf at debian.org>
-
---- a/Config.pod
-+++ b/Config.pod
-@@ -3660,10 +3660,10 @@
- (
- 'de' =>
- {
-- 'addsel1' => 'Klicken Sie auf die Kategorie zu der Sie etwas hinzufügen möchten:',
-- 'addsel2' => 'oder fügen Sie eine neue Kategorie hinzu. Bitte geben Sie die Beschreibung in so vielen Sprachen wie Ihnen möglich ein.',
-- 'addsel3' => 'Falls Sie die Übersetzung nicht wissen, lassen Sie das entsprechende Eingabefeld leer.',
-- 'addsel4' => 'Kategorie hinzufügen',
-+ 'addsel1' => 'Klicken Sie auf die Kategorie zu der Sie etwas hinzuf\[:u]gen m\[:o]chten:',
-+ 'addsel2' => 'oder f\[:u]gen Sie eine neue Kategorie hinzu. Bitte geben Sie die Beschreibung in so vielen Sprachen wie Ihnen m\[:o]glich ein.',
-+ 'addsel3' => 'Falls Sie die \[:U]bersetzung nicht wissen, lassen Sie das entsprechende Eingabefeld leer.',
-+ 'addsel4' => 'Kategorie hinzuf\[:u]gen',
- },
- 'en' =>
- {
---- a/Embperl.pod
-+++ b/Embperl.pod
-@@ -569,7 +569,7 @@
-
- This is the same as using the Apache function
-
-- [- $req_rec -> header_out("Language" => "DE"); -]
-+ [- $req_rec -> header_out("Language" => "DE"); -]
-
-
- =item B<A>, B<EMBED>, B<IMG>, B<IFRAME>, B<FRAME>, B<LAYER>
-@@ -1410,7 +1410,7 @@
- (
- 'de' =>
- {
-- 'heading' => 'Überschrift',
-+ 'heading' => '\[:U]berschrift',
- 'bar' => 'Absenden',
- },
- 'en' =>
---- a/TipsAndTricks.pod
-+++ b/TipsAndTricks.pod
-@@ -25,6 +25,9 @@
-
- =back
-
-+=head1 NAME
-+
-+Embperl::TipsAndTricks - Embperl Tips and Tricks
-
- =head1 Tips and Tricks
-
---- a/FeaturesD.pod
-+++ b/FeaturesD.pod
-@@ -1,5 +1,9 @@
- =pod
-
-+=head1 NAME
-+
-+Embperl::Features - Features von Embperl 2.0
-+
- =head1 Features von Embperl 2.0
-
- =over 4
diff --git a/debian/patches/new_process_group.patch b/debian/patches/new_process_group.patch
deleted file mode 100644
index b526d7f..0000000
--- a/debian/patches/new_process_group.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Work around a new bug (#418067) in apache2.2 by explicitly creating a
- new process group in startup.pl. Should stop 'apache -X' exit from
- SIGTERM'ing whatever the process group happens to be.
- Really closes: #416016.
-Author: Angus Lees <gus at debian.org>
-
---- a/test/conf/startup.pl
-+++ b/test/conf/startup.pl
-@@ -60,6 +60,13 @@
-
- }
-
-+# Bug#418067: apache2.2-mpm (at least) doesn't create a new process
-+# group with apache -X. When exiting though, it SIGTERM's whatever
-+# the process group happens to be, wreaking havoc. More importantly
-+# it causes 'make test' to exit with failure. Hack around that here:
-+use POSIX ();
-+POSIX::setpgid(0,0);
-+
- use Embperl ;
- use Embperl::Object ;
-
diff --git a/debian/patches/series b/debian/patches/series
index e9f3812..c1869e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,3 @@
-german.patch
-new_process_group.patch
delay.patch
modperl.patch
-utf8.patch
Makefile.PL.patch
-fix-pod-errors.patch
-fix-whatis.patch
-fix-string-typo.patch
-fix-pod-unescaped-unicode.patch
diff --git a/debian/patches/utf8.patch b/debian/patches/utf8.patch
deleted file mode 100644
index 070e08e..0000000
--- a/debian/patches/utf8.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Author: Angus Lees <gus at debian.org>
-Description: UTF-8 input/output escaping (Closes: #154672)
-
---- a/epinit.c
-+++ b/epinit.c
-@@ -1124,7 +1124,7 @@
- { /* New Field -> store it */
- pSVV = newSVpv (pVal, nVal) ;
- #ifdef UTF8_IS_START
-- if (mayutf8 && is_utf8_string(pVal, nVal))
-+ if (mayutf8 && is_utf8_string((U8*)pVal, nVal))
- SvUTF8_on (pSVV) ;
- #endif
- if (hv_store (pFormHash, pKey, nKey, pSVV, 0) == NULL)
---- a/epdom.c
-+++ b/epdom.c
-@@ -242,8 +242,8 @@
- else
- {
- char buf[256] ;
-- /*
-- sprintf (buf, "%u bytes", n) ;
-+ /*
-+ sprintf (buf, "%zu bytes", n) ;
- LogErrorParam (a, rcOutOfMemory, "str_malloc failed", buf) ;
- */
- sprintf (buf, "str_malloc: Out of memory (%u bytes)", n + sizeof (size_t)) ;
-@@ -274,7 +274,7 @@
- {
- char buf[256] ;
- /*
-- sprintf (buf, "%u bytes", n) ;
-+ sprintf (buf, "%zu bytes", n) ;
- LogErrorParam (a, rcOutOfMemory, "str_malloc_dbg failed", buf) ;
- */
- sprintf (buf, "str_malloc: Out of memory (%u bytes)", n + sizeof (size_t)) ;
---- a/epmain.c
-+++ b/epmain.c
-@@ -816,10 +816,12 @@
- SPAGAIN ;
- #ifdef APACHE
- if (r -> pApacheReq)
-+ {
- if (rc >= 400)
- r -> pApacheReq -> status = rc ;
- else
- r -> pApacheReq -> status = 500 ;
-+ }
- #endif
-
- SetHashValueInt (r, r -> pThread -> pHeaderHash, "Content-Length", GetContentLength (r) ) ;
--
Debian packaging of libembperl-perl
More information about the Pkg-perl-cvs-commits
mailing list