This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository pkg-perl-tools.
commit 3c683ad7a710b319285acf5538ae71573c7e927e Author: gregor herrmann <[email protected]> Date: Sat Jun 17 19:31:07 2017 +0200 Revert "remove patchedit" (e2fcacaeff23ce3b22cef5855ffb8bab6442ae2f). The .orig files are still needed for t/patchedit/01_patchedit.t which wasn't run since 2013, apparently. --- t/patchedit/dpatch-meta.orig | 33 +++++++++++++++++++++++++++++ t/patchedit/dpatch-no-meta.orig | 29 +++++++++++++++++++++++++ t/patchedit/no-meta.orig | 16 ++++++++++++++ t/patchedit/no-meta2.orig | 18 ++++++++++++++++ t/patchedit/subject.orig | 27 +++++++++++++++++++++++ t/patchedit/with-meta-and-extra-fields.orig | 23 ++++++++++++++++++++ t/patchedit/with-meta.orig | 22 +++++++++++++++++++ t/patchedit/with-utf8-meta.orig | 6 ++++++ 8 files changed, 174 insertions(+) diff --git a/t/patchedit/dpatch-meta.orig b/t/patchedit/dpatch-meta.orig new file mode 100644 index 0000000..dfe83f2 --- /dev/null +++ b/t/patchedit/dpatch-meta.orig @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 78_kfbsd_tab.dpatch by Petr Salinger <[email protected]> +# +# Description: fix build problem on kfreebsd +# one more line of desc +# Origin: testing +# Last-Update: 2004-02-02 +# +## DP: kfreebsd + +@DPATCH@ +diff -urNad coreutils-7.2~/src/stty.c coreutils-7.2/src/stty.c +--- coreutils-7.2~/src/stty.c 2009-03-29 13:43:41.000000000 -0400 ++++ coreutils-7.2/src/stty.c 2009-04-07 21:11:35.096288547 -0400 +@@ -279,10 +279,18 @@ + {"cr0", output, SANE_SET, CR0, CRDLY}, + #endif + #ifdef TABDLY ++#ifdef TAB3 + {"tab3", output, SANE_UNSET, TAB3, TABDLY}, ++#endif ++#ifdef TAB2 + {"tab2", output, SANE_UNSET, TAB2, TABDLY}, ++#endif ++#ifdef TAB1 + {"tab1", output, SANE_UNSET, TAB1, TABDLY}, ++#endif ++#ifdef TAB0 + {"tab0", output, SANE_SET, TAB0, TABDLY}, ++#endif + #else + # ifdef OXTABS + {"tab3", output, SANE_UNSET, OXTABS, 0}, diff --git a/t/patchedit/dpatch-no-meta.orig b/t/patchedit/dpatch-no-meta.orig new file mode 100644 index 0000000..d1fc9f0 --- /dev/null +++ b/t/patchedit/dpatch-no-meta.orig @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 78_kfbsd_tab.dpatch by Petr Salinger <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix build problem on kfreebsd + +@DPATCH@ +diff -urNad coreutils-7.2~/src/stty.c coreutils-7.2/src/stty.c +--- coreutils-7.2~/src/stty.c 2009-03-29 13:43:41.000000000 -0400 ++++ coreutils-7.2/src/stty.c 2009-04-07 21:11:35.096288547 -0400 +@@ -279,10 +279,18 @@ + {"cr0", output, SANE_SET, CR0, CRDLY}, + #endif + #ifdef TABDLY ++#ifdef TAB3 + {"tab3", output, SANE_UNSET, TAB3, TABDLY}, ++#endif ++#ifdef TAB2 + {"tab2", output, SANE_UNSET, TAB2, TABDLY}, ++#endif ++#ifdef TAB1 + {"tab1", output, SANE_UNSET, TAB1, TABDLY}, ++#endif ++#ifdef TAB0 + {"tab0", output, SANE_SET, TAB0, TABDLY}, ++#endif + #else + # ifdef OXTABS + {"tab3", output, SANE_UNSET, OXTABS, 0}, diff --git a/t/patchedit/no-meta.orig b/t/patchedit/no-meta.orig new file mode 100644 index 0000000..2399bb6 --- /dev/null +++ b/t/patchedit/no-meta.orig @@ -0,0 +1,16 @@ +diff --git a/XS.pm b/XS.pm +index c44c9a3..a6507f7 100644 +--- a/XS.pm ++++ b/XS.pm +@@ -681,8 +681,9 @@ The opposite of C<encode>: expects a JSON text and tries to parse it, + returning the resulting simple scalar or reference. Croaks on error. + + JSON numbers and strings become simple Perl scalars. JSON arrays become +-Perl arrayrefs and JSON objects become Perl hashrefs. C<true> becomes +-C<1>, C<false> becomes C<0> and C<null> becomes C<undef>. ++Perl arrayrefs and JSON objects become Perl hashrefs. ++C<true> becomes JSON::XS::true (equals 1 numerically and as a string), ++C<false> becomes JSON::XS::false (equals 0) and C<null> becomes C<undef>. + + =item ($perl_scalar, $characters) = $json->decode_prefix ($json_text) + diff --git a/t/patchedit/no-meta2.orig b/t/patchedit/no-meta2.orig new file mode 100644 index 0000000..2c2e818 --- /dev/null +++ b/t/patchedit/no-meta2.orig @@ -0,0 +1,18 @@ + + +diff --git a/XS.pm b/XS.pm +index c44c9a3..a6507f7 100644 +--- a/XS.pm ++++ b/XS.pm +@@ -681,8 +681,9 @@ The opposite of C<encode>: expects a JSON text and tries to parse it, + returning the resulting simple scalar or reference. Croaks on error. + + JSON numbers and strings become simple Perl scalars. JSON arrays become +-Perl arrayrefs and JSON objects become Perl hashrefs. C<true> becomes +-C<1>, C<false> becomes C<0> and C<null> becomes C<undef>. ++Perl arrayrefs and JSON objects become Perl hashrefs. ++C<true> becomes JSON::XS::true (equals 1 numerically and as a string), ++C<false> becomes JSON::XS::false (equals 0) and C<null> becomes C<undef>. + + =item ($perl_scalar, $characters) = $json->decode_prefix ($json_text) + diff --git a/t/patchedit/subject.orig b/t/patchedit/subject.orig new file mode 100644 index 0000000..d7a1c59 --- /dev/null +++ b/t/patchedit/subject.orig @@ -0,0 +1,27 @@ +From: Ulrich Drepper <[email protected]> +Subject: Fix regex problems with some multi-bytes characters + +* posix/bug-regex17.c: Add testcases. +* posix/regcomp.c (re_compile_fastmap_iter): Rewrite COMPLEX_BRACKET + handling. + +Origin: upstream, http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdb56bac +Bug: http://sourceware.org/bugzilla/show_bug.cgi?id=9697 +Bug-Debian: http://bugs.debian.org/510219 + +diff --git a/XS.pm b/XS.pm +index c44c9a3..a6507f7 100644 +--- a/XS.pm ++++ b/XS.pm +@@ -681,8 +681,9 @@ The opposite of C<encode>: expects a JSON text and tries to parse it, + returning the resulting simple scalar or reference. Croaks on error. + + JSON numbers and strings become simple Perl scalars. JSON arrays become +-Perl arrayrefs and JSON objects become Perl hashrefs. C<true> becomes +-C<1>, C<false> becomes C<0> and C<null> becomes C<undef>. ++Perl arrayrefs and JSON objects become Perl hashrefs. ++C<true> becomes JSON::XS::true (equals 1 numerically and as a string), ++C<false> becomes JSON::XS::false (equals 0) and C<null> becomes C<undef>. + + =item ($perl_scalar, $characters) = $json->decode_prefix ($json_text) + diff --git a/t/patchedit/with-meta-and-extra-fields.orig b/t/patchedit/with-meta-and-extra-fields.orig new file mode 100644 index 0000000..0a1b160 --- /dev/null +++ b/t/patchedit/with-meta-and-extra-fields.orig @@ -0,0 +1,23 @@ +Description: Clarified documentation ambiguity +Author: Gunnar Wolf <[email protected]> +Bug-Debian: http://bugs.debian.org/548127 +Origin: vendor +Forwarded: yes +Last-Update: 2010-02-18 +Extra: 123 + +Index: libhtml-tiny-perl/lib/HTML/Tiny.pm +=================================================================== +--- libhtml-tiny-perl.orig/lib/HTML/Tiny.pm 2010-02-18 09:12:47.000000000 -0600 ++++ libhtml-tiny-perl/lib/HTML/Tiny.pm 2010-02-18 09:14:05.000000000 -0600 +@@ -173,8 +173,8 @@ + + The [ and ] can be thought of as grouping a number of arguments. + +-Attributes may be supplied by including an anonymous hash in the +-argument list: ++Attributes may be supplied by including an anonymous hash as the first element ++in the argument list (after the tag name): + + print $h->tag('p', { class => 'normal' }, 'Foo'); + diff --git a/t/patchedit/with-meta.orig b/t/patchedit/with-meta.orig new file mode 100644 index 0000000..00b778f --- /dev/null +++ b/t/patchedit/with-meta.orig @@ -0,0 +1,22 @@ +Description: Clarified documentation ambiguity +Author: Gunnar Wolf <[email protected]> +Bug-Debian: http://bugs.debian.org/548127 +Origin: vendor +Forwarded: yes +Last-Update: 2010-02-18 + +Index: libhtml-tiny-perl/lib/HTML/Tiny.pm +=================================================================== +--- libhtml-tiny-perl.orig/lib/HTML/Tiny.pm 2010-02-18 09:12:47.000000000 -0600 ++++ libhtml-tiny-perl/lib/HTML/Tiny.pm 2010-02-18 09:14:05.000000000 -0600 +@@ -173,8 +173,8 @@ + + The [ and ] can be thought of as grouping a number of arguments. + +-Attributes may be supplied by including an anonymous hash in the +-argument list: ++Attributes may be supplied by including an anonymous hash as the first element ++in the argument list (after the tag name): + + print $h->tag('p', { class => 'normal' }, 'Foo'); + diff --git a/t/patchedit/with-utf8-meta.orig b/t/patchedit/with-utf8-meta.orig new file mode 100644 index 0000000..4bf0421 --- /dev/null +++ b/t/patchedit/with-utf8-meta.orig @@ -0,0 +1,6 @@ +Description: utf-8 test +Author: Lars Dɪᴇᴄᴋᴏᴡ 迪拉斯 + +doesn't matter +ščťžôáĺ + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pkg-perl-tools.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
