[libencode-arabic-perl] 02/04: New upstream release: Remove/refresh patches, (b-)d updates
Axel Beckert
abe at deuxchevaux.org
Sat Oct 11 01:14:13 UTC 2014
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository libencode-arabic-perl.
commit a2a459e126edeb70166d9779558493043eb46572
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Sat Oct 11 03:10:59 2014 +0200
New upstream release: Remove/refresh patches, (b-)d updates
---
debian/changelog | 11 +-
debian/control | 4 +-
...-compatibility-with-newer-Encode-versions.patch | 187 ---------------------
debian/patches/series | 1 -
debian/patches/typos.diff | 32 ++--
5 files changed, 30 insertions(+), 205 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9269da9..8e2d79a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-libencode-arabic-perl (1.9-3) UNRELEASED; urgency=medium
+libencode-arabic-perl (14.1-1) UNRELEASED; urgency=medium
+ [ Salvatore Bonaccorso ]
* Update Vcs-Browser URL to cgit web frontend
- -- Salvatore Bonaccorso <carnil at debian.org> Sat, 16 Aug 2014 09:31:31 +0200
+ [ Axel Beckert ]
+ * Import new upstream release
+ + Remove patch for compatibility with newer Encode releases (obsolete)
+ → Drop (build-)dependency on libimport-into-perl
+ + Refresh remaining patch
+
+ -- Axel Beckert <abe at debian.org> Sat, 11 Oct 2014 03:06:53 +0200
libencode-arabic-perl (1.9-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 9969537..ca84f50 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Section: perl
Priority: optional
Build-Depends: debhelper (>= 8)
Build-Depends-Indep: perl,
- libimport-into-perl,
libtest-pod-coverage-perl,
libtest-pod-perl
Standards-Version: 3.9.5
@@ -16,8 +15,7 @@ Homepage: https://metacpan.org/release/Encode-Arabic
Package: libencode-arabic-perl
Architecture: all
Depends: ${perl:Depends},
- ${misc:Depends},
- libimport-into-perl
+ ${misc:Depends}
Description: perl implementation for Arabic encodings
Encode::Arabic is a wrapper for various implementations of the encoding
systems used for the Arabic language and covering even some non-Arabic
diff --git a/debian/patches/0001-Fix-compatibility-with-newer-Encode-versions.patch b/debian/patches/0001-Fix-compatibility-with-newer-Encode-versions.patch
deleted file mode 100644
index e4fd94d..0000000
--- a/debian/patches/0001-Fix-compatibility-with-newer-Encode-versions.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-Description: Fix compatibility with newer Encode versions
- As of Encode 2.55 (commit
- https://github.com/dankogai/p5-encode/commit/93b3d593d85004c570e44f3f79db0ca3c08d89ea
- ) Encode doesn't inherit from Exporter anymore, so
- Encode->export_to_level() fails.
- .
- Replace the export_to_level() calls with Import::Into.
-Origin: vendor
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=95975
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=95975
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752928
-Author: Niko Tyni <ntyni at debian.org>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2014-07-30
-
---- a/lib/Encode/Arabic.pm
-+++ b/lib/Encode/Arabic.pm
-@@ -8,6 +8,7 @@
-
- our $VERSION = '1.9' || do { q $Revision: 808 $ =~ /(\d+)/; sprintf "%4.2f", $1 / 100 };
-
-+use Import::Into;
-
- sub import { # perform import as if Encode were used one level before this module
-
-@@ -25,7 +26,8 @@
-
- require Encode;
-
-- Encode->export_to_level(1, @_);
-+ shift @_; # no need for the package name
-+ Encode->import::into(1, @_);
- }
-
-
---- a/lib/Encode/Arabic/ArabTeX.pm
-+++ b/lib/Encode/Arabic/ArabTeX.pm
-@@ -14,6 +14,8 @@
- use Scalar::Util 'blessed';
- use Carp;
-
-+use Import::Into;
-+
- our $VERSION = do { q $Revision: 717 $ =~ /(\d+)/; sprintf "%4.2f", $1 / 100 };
-
-
-@@ -107,7 +109,8 @@
-
- require Encode;
-
-- Encode->export_to_level(1, @_); # here comes the only trick ^^
-+ shift @_; # no need for the package name
-+ Encode->import::into(1, @_); # here comes the only trick ^^
- }
-
-
---- a/lib/Encode/Arabic/ArabTeX/RE.pm
-+++ b/lib/Encode/Arabic/ArabTeX/RE.pm
-@@ -12,6 +12,7 @@
- use warnings;
-
- use Scalar::Util 'blessed';
-+use Import::Into;
-
- our $VERSION = do { q $Revision: 162 $ =~ /(\d+)/; sprintf "%4.2f", $1 / 100 };
-
-@@ -49,7 +50,8 @@
-
- sub import { # perform import as if Encode were used one level before this module
- require Encode;
-- Encode->export_to_level(1, @_);
-+ shift @_; # no need for the package name
-+ Encode->import::into(1, @_);
- }
-
-
---- a/lib/Encode/Arabic/ArabTeX/Verbatim.pm
-+++ b/lib/Encode/Arabic/ArabTeX/Verbatim.pm
-@@ -18,6 +18,7 @@
-
- use Encode::Arabic::ArabTeX ();
- use base 'Encode::Arabic::ArabTeX';
-+use Import::Into;
-
-
- use Encode::Encoding;
-@@ -110,7 +111,8 @@
-
- require Encode;
-
-- Encode->export_to_level(1, @_); # here comes the only trick ^^
-+ shift @_; # no need for the package name
-+ Encode->import::into(1, @_); # here comes the only trick ^^
- }
-
-
---- a/lib/Encode/Arabic/ArabTeX/ZDMG.pm
-+++ b/lib/Encode/Arabic/ArabTeX/ZDMG.pm
-@@ -79,7 +79,8 @@
-
- require Encode;
-
-- Encode->export_to_level(1, @_); # here comes the only trick ^^
-+ shift @_; # no need for the package name
-+ Encode->import::into(1, @_); # here comes the only trick ^^
- }
-
-
---- a/lib/Encode/Arabic/ArabTeX/ZDMG/RE.pm
-+++ b/lib/Encode/Arabic/ArabTeX/ZDMG/RE.pm
-@@ -10,13 +10,15 @@
-
- use strict;
- use warnings;
-+use Import::Into;
-
- our $VERSION = do { q $Revision: 143 $ =~ /(\d+)/; sprintf "%4.2f", $1 / 100 };
-
-
- sub import { # perform import as if Encode were used one level before this module
- require Encode;
-- Encode->export_to_level(1, @_);
-+ shift @_; # no need for the package name
-+ Encode->import::into(1, @_);
- }
-
-
---- a/lib/Encode/Arabic/Buckwalter.pm
-+++ b/lib/Encode/Arabic/Buckwalter.pm
-@@ -12,6 +12,7 @@
- use warnings;
-
- use Scalar::Util 'blessed';
-+use Import::Into;
-
- our $VERSION = do { q $Revision: 179 $ =~ /(\d+)/; sprintf "%4.2f", $1 / 100 };
-
-@@ -66,7 +67,8 @@
-
- require Encode;
-
-- Encode->export_to_level(1, @_);
-+ shift @_; # no need for the package name
-+ Encode->import::into(1, @_);
- }
-
-
---- a/lib/Encode/Arabic/Parkinson.pm
-+++ b/lib/Encode/Arabic/Parkinson.pm
-@@ -12,6 +12,7 @@
- use warnings;
-
- use Scalar::Util 'blessed';
-+use Import::Into;
-
- our $VERSION = do { q $Revision: 179 $ =~ /(\d+)/; sprintf "%4.2f", $1 / 100 };
-
-@@ -66,7 +67,8 @@
-
- require Encode;
-
-- Encode->export_to_level(1, @_);
-+ shift @_; # no need for the package name
-+ Encode->import::into(1, @_);
- }
-
-
---- a/Build.PL
-+++ b/Build.PL
-@@ -10,6 +10,7 @@
- dist_version_from => 'lib/Encode/Arabic.pm',
- requires => {
- 'perl' => 5.008,
-+ 'Import::Into' => 0,
- },
- build_requires => {
- 'Test::More' => 0,
---- a/META.yml
-+++ b/META.yml
-@@ -9,6 +9,7 @@
- license: http://dev.perl.org/licenses/
- requires:
- perl: 5.008
-+ Import::Into: 0
- build_requires:
- Test::More: 0
- provides:
diff --git a/debian/patches/series b/debian/patches/series
index 39320e2..8d4da6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
typos.diff
-0001-Fix-compatibility-with-newer-Encode-versions.patch
diff --git a/debian/patches/typos.diff b/debian/patches/typos.diff
index 6fece43..3dfd185 100644
--- a/debian/patches/typos.diff
+++ b/debian/patches/typos.diff
@@ -7,9 +7,11 @@ Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourcef
Reviewed-by: gregor herrmann <gregoa at debian.org>
Last-Update: 2014-07-30
---- a/lib/Encode/Arabic.pm
-+++ b/lib/Encode/Arabic.pm
-@@ -186,7 +186,7 @@
+Index: libencode-arabic-perl/lib/Encode/Arabic.pm
+===================================================================
+--- libencode-arabic-perl.orig/lib/Encode/Arabic.pm 2014-10-11 03:05:25.763275371 +0200
++++ libencode-arabic-perl/lib/Encode/Arabic.pm 2014-10-11 03:05:25.763275371 +0200
+@@ -188,7 +188,7 @@
=back
There are generic aliases to these provided by L<Encode|Encode>. Case does not matter and all
@@ -18,9 +20,11 @@ Last-Update: 2014-07-30
Note that the standard L<Encode|Encode> module already deals with several other single-byte encoding
schemes for Arabic popular with whichever operating system, be it *n*x, Windows, DOS or Macintosh.
---- a/bin/decode.pl
-+++ b/bin/decode.pl
-@@ -61,7 +61,7 @@
+Index: libencode-arabic-perl/bin/decode.pl
+===================================================================
+--- libencode-arabic-perl.orig/bin/decode.pl 2014-10-11 03:05:25.763275371 +0200
++++ libencode-arabic-perl/bin/decode.pl 2014-10-11 03:05:25.763275371 +0200
+@@ -56,7 +56,7 @@
The L<Encode|Encode> library provides a unified interface for converting strings
from different encodings into a common representation, and vice versa.
@@ -29,9 +33,11 @@ Last-Update: 2014-07-30
the C<encode> and C<decode> methods, respectively.
For the list of supported encoding schemes, please refer to L<Encode|Encode> and
---- a/bin/encode.pl
-+++ b/bin/encode.pl
-@@ -61,7 +61,7 @@
+Index: libencode-arabic-perl/bin/encode.pl
+===================================================================
+--- libencode-arabic-perl.orig/bin/encode.pl 2014-10-11 03:05:25.763275371 +0200
++++ libencode-arabic-perl/bin/encode.pl 2014-10-11 03:05:25.763275371 +0200
+@@ -56,7 +56,7 @@
The L<Encode|Encode> library provides a unified interface for converting strings
from different encodings into a common representation, and vice versa.
@@ -40,9 +46,11 @@ Last-Update: 2014-07-30
the C<encode> and C<decode> methods, respectively.
For the list of supported encoding schemes, please refer to L<Encode|Encode> and
---- a/lib/Encode/Mapper.pm
-+++ b/lib/Encode/Mapper.pm
-@@ -656,7 +656,7 @@
+Index: libencode-arabic-perl/lib/Encode/Mapper.pm
+===================================================================
+--- libencode-arabic-perl.orig/lib/Encode/Mapper.pm 2014-10-11 03:05:25.763275371 +0200
++++ libencode-arabic-perl/lib/Encode/Mapper.pm 2014-10-11 03:05:25.763275371 +0200
+@@ -648,7 +648,7 @@
=head2 INTRO AND RULE TYPES
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libencode-arabic-perl.git
More information about the Pkg-perl-cvs-commits
mailing list