r21976 - in /trunk/libunicode-map-perl: debian/changelog debian/control debian/patches/ debian/patches/series debian/patches/test-big5.patch debian/rules t/map.t

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Fri Jun 20 16:42:30 UTC 2008


Author: gregoa
Date: Fri Jun 20 16:42:30 2008
New Revision: 21976

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=21976
Log:
Split out Niko's patch for the big5 test into test-big5.patch; add quilt
framework.

Added:
    trunk/libunicode-map-perl/debian/patches/
    trunk/libunicode-map-perl/debian/patches/series
    trunk/libunicode-map-perl/debian/patches/test-big5.patch
Modified:
    trunk/libunicode-map-perl/debian/changelog
    trunk/libunicode-map-perl/debian/control
    trunk/libunicode-map-perl/debian/rules
    trunk/libunicode-map-perl/t/map.t

Modified: trunk/libunicode-map-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libunicode-map-perl/debian/changelog?rev=21976&op=diff
==============================================================================
--- trunk/libunicode-map-perl/debian/changelog (original)
+++ trunk/libunicode-map-perl/debian/changelog Fri Jun 20 16:42:30 2008
@@ -6,6 +6,8 @@
   * debian/watch: use dist-based URL.
   * Revert changes to upstream Makefile.PL; remove unneeded manpages in
     debian/rules.
+  * Split out Niko's patch for the big5 test into test-big5.patch; add quilt
+    framework.
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:33:03 +0200
 

Modified: trunk/libunicode-map-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libunicode-map-perl/debian/control?rev=21976&op=diff
==============================================================================
--- trunk/libunicode-map-perl/debian/control (original)
+++ trunk/libunicode-map-perl/debian/control Fri Jun 20 16:42:30 2008
@@ -7,7 +7,7 @@
 Homepage: http://search.cpan.org/dist/Unicode-Map/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libunicode-map-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libunicode-map-perl/
-Build-Depends: debhelper (>= 5), perl (>= 5.8.0-3)
+Build-Depends: debhelper (>= 5), perl (>= 5.8.0-3), quilt (>= 0.40)
 
 Package: libunicode-map-perl
 Section: perl

Added: trunk/libunicode-map-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libunicode-map-perl/debian/patches/series?rev=21976&op=file
==============================================================================
--- trunk/libunicode-map-perl/debian/patches/series (added)
+++ trunk/libunicode-map-perl/debian/patches/series Fri Jun 20 16:42:30 2008
@@ -1,0 +1,1 @@
+test-big5.patch

Added: trunk/libunicode-map-perl/debian/patches/test-big5.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libunicode-map-perl/debian/patches/test-big5.patch?rev=21976&op=file
==============================================================================
--- trunk/libunicode-map-perl/debian/patches/test-big5.patch (added)
+++ trunk/libunicode-map-perl/debian/patches/test-big5.patch Fri Jun 20 16:42:30 2008
@@ -1,0 +1,45 @@
+Author: Niko Tyni <ntyni at iki.fi>
+Description: Test the fixed BIG5 map in t/map.t.
+Bug: #320406
+
+--- libunicode-map-perl-0.112.orig/t/map.t
++++ libunicode-map-perl-0.112/t/map.t
+@@ -6,7 +6,7 @@
+ # Change 1..1 below to 1..last_test_to_print .
+ # (It may become useful if the test is moved to ./t subdirectory.)
+ 
+-BEGIN { $| = 1; print "1..5\n"; }
++BEGIN { $| = 1; print "1..6\n"; }
+ END {print "not ok 1\n" unless $loaded;}
+ use Unicode::Map;
+ $loaded = 1;
+@@ -27,6 +27,7 @@
+    ["GB2312",         "n->m: GB2312 (GB2312-80^8080 + ISO8859-1)"],
+    ["DEVANAGA",       "n->m: DEVANAGA"],
+    ["EUC_JP",         "n->m: EUC-JP"],
++   ["BIG5",           "n->m: BIG5"],
+ );
+ 
+ {
+@@ -133,6 +134,21 @@
+    return testMapping ( "APPLE-DEVANAGA", $_locale, $_unicode );
+ }
+ 
++sub BIG5 {
++   my $_locale  =
++      "\xA5\x40"
++      ."\xA5\x41"
++      ."\x30"
++      ."  "
++   ;
++   my $_unicode =
++      "\x4E\x16"
++      ."\x4E\x15"
++      ."\x00\x30\x00\x20\x00\x20"
++   ;
++   return testMapping ( "BIG5", $_locale, $_unicode );
++}
++
+ sub testMapping {
+     my ( $charsetId, $txtLocale, $txtUnicode ) = @_;
+     return 0 if ! ( my $Map = new Unicode::Map($charsetId) );

Modified: trunk/libunicode-map-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libunicode-map-perl/debian/rules?rev=21976&op=diff
==============================================================================
--- trunk/libunicode-map-perl/debian/rules (original)
+++ trunk/libunicode-map-perl/debian/rules Fri Jun 20 16:42:30 2008
@@ -10,10 +10,12 @@
 ## ----------------------------------------------------------------------
 TMP_DIR		= debian/tmp
 
+include /usr/share/quilt/quilt.make
+
 ## ----------------------------------------------------------------------
 ## targets
 
-clean:
+clean: unpatch
 		dh_testdir
 		dh_testroot
 		[ ! -f Makefile ] || $(MAKE) realclean
@@ -22,7 +24,7 @@
 		rm -f build-stamp install-stamp fix-big5-stamp
 
 build:		fix-big5 build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 		dh_testdir
 		perl Makefile.PL INSTALLDIRS=vendor
 		$(MAKE) OPTIMIZE="-O2 -g -Wall"

Modified: trunk/libunicode-map-perl/t/map.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libunicode-map-perl/t/map.t?rev=21976&op=diff
==============================================================================
--- trunk/libunicode-map-perl/t/map.t (original)
+++ trunk/libunicode-map-perl/t/map.t Fri Jun 20 16:42:30 2008
@@ -6,7 +6,7 @@
 # Change 1..1 below to 1..last_test_to_print .
 # (It may become useful if the test is moved to ./t subdirectory.)
 
-BEGIN { $| = 1; print "1..6\n"; }
+BEGIN { $| = 1; print "1..5\n"; }
 END {print "not ok 1\n" unless $loaded;}
 use Unicode::Map;
 $loaded = 1;
@@ -27,7 +27,6 @@
    ["GB2312",         "n->m: GB2312 (GB2312-80^8080 + ISO8859-1)"],
    ["DEVANAGA",       "n->m: DEVANAGA"],
    ["EUC_JP",         "n->m: EUC-JP"],
-   ["BIG5",           "n->m: BIG5"],
 );
 
 {
@@ -134,21 +133,6 @@
    return testMapping ( "APPLE-DEVANAGA", $_locale, $_unicode );
 }
 
-sub BIG5 {
-   my $_locale  =
-      "\xA5\x40"
-      ."\xA5\x41"
-      ."\x30"
-      ."  "
-   ;
-   my $_unicode =
-      "\x4E\x16"
-      ."\x4E\x15"
-      ."\x00\x30\x00\x20\x00\x20"
-   ;
-   return testMapping ( "BIG5", $_locale, $_unicode );
-}
-
 sub testMapping {
     my ( $charsetId, $txtLocale, $txtUnicode ) = @_;
     return 0 if ! ( my $Map = new Unicode::Map($charsetId) );




More information about the Pkg-perl-cvs-commits mailing list