[SCM] branch, master, updated. debian/0.9.9+git2012426-3-18-ge14bb4e

Sat Jul 6 19:02:35 UTC 2013

The following commit has been merged in the master branch:
commit e14bb4e25b4f2f4bed9e57edf76816e2726cae05
Author: Danai SAE-HAN (韓達耐) <danai at debian.org>
Date:   Sun Jul 7 03:01:57 2013 +0800

    Refresh quilt patches debian/patches/02_spelling.patch and
    debian/patches/03_whatis.patch

diff --git a/debian/patches/02_spelling.patch b/debian/patches/02_spelling.patch
index 6e6cc43..a09df22 100644
--- a/debian/patches/02_spelling.patch
+++ b/debian/patches/02_spelling.patch
@@ -4,29 +4,18 @@ Forwarded: no
 Author: gregor herrmann <gregoa at debian.org>
 Last-Update: 2012-06-05
 
---- a/lib/Biber.pm
-+++ b/lib/Biber.pm
-@@ -2160,7 +2160,7 @@
- 
-           Biber::Config->add_uniquelistcount($namelist);
-         }
--        # We need to know the list uniqueness counts for the whole list seperately otherwise
-+        # We need to know the list uniqueness counts for the whole list separately otherwise
-         # we will falsely "disambiguate" identical name lists from each other by setting
-         # uniquelist to the full list because every part of each list will have more than
-         # one count. We therefore need to distinguish counts which are of the final, complete
 --- a/lib/Biber/Config.pm
 +++ b/lib/Biber/Config.pm
-@@ -969,7 +969,7 @@
+@@ -2907,7 +2907,7 @@ sub get_seen_nameyear {
  
-     Biber::Config->incr_seen_nameyear($ns, $ys);
+     Increment the count of an labelname/labelyear combination for extrayear
  
 -    We pass in the name and year strings seperately as we have to
 +    We pass in the name and year strings separately as we have to
      be careful and only increment this counter beyond 1 if there is
-     both a name and year component. Otherwise, extrayear gets defined for all
+     a name component. Otherwise, extrayear gets defined for all
      entries with no name but the same year etc.
-@@ -1404,7 +1404,7 @@
+@@ -3386,7 +3386,7 @@ sub incr_crossrefkey {
      setdisplaymode(['entrytype'], ['field'], ['citekey'], $value)
  
      This sets the desired displaymode to use for some data in the bib.
@@ -35,14 +24,25 @@ Last-Update: 2012-06-05
      displaymodes *defined* in the bib which just tell you what to return
      for a particular displaymode request for some data.
  
+--- a/lib/Biber.pm
++++ b/lib/Biber.pm
+@@ -2836,7 +2836,7 @@ sub create_uniquelist_info {
+ 
+         Biber::Config->add_uniquelistcount($namelist);
+       }
+-      # We need to know the list uniqueness counts for the whole list seperately otherwise
++      # We need to know the list uniqueness counts for the whole list separately otherwise
+       # we will falsely "disambiguate" identical name lists from each other by setting
+       # uniquelist to the full list because every part of each list will have more than
+       # one count. We therefore need to distinguish counts which are of the final, complete
 --- a/t/basic-misc.t
 +++ b/t/basic-misc.t
-@@ -342,7 +342,7 @@
+@@ -419,7 +419,7 @@ $out = $biber->get_output_obj;
  
- is( $out->get_output_entry($main,'murray'), $murray2, 'bbl with > maxcitenames, empty alphaothers' ) ;
+ is( $out->get_output_entry('murray', $main), $murray2, 'bbl with > maxcitenames, empty alphaothers' ) ;
  
 -# Make sure namehash and fullhash are seperately generated
 +# Make sure namehash and fullhash are separately generated
- is( $out->get_output_entry($main,'anon1'), $anon1, 'namehash/fullhash 1' ) ;
- is( $out->get_output_entry($main,'anon2'), $anon2, 'namehash/fullhash 2' ) ;
+ is( $out->get_output_entry('anon1', $main), $anon1, 'namehash/fullhash 1' ) ;
+ is( $out->get_output_entry('anon2', $main), $anon2, 'namehash/fullhash 2' ) ;
  
diff --git a/debian/patches/03_whatis.patch b/debian/patches/03_whatis.patch
index f8c5355..aa0b701 100644
--- a/debian/patches/03_whatis.patch
+++ b/debian/patches/03_whatis.patch
@@ -6,7 +6,7 @@ Last-Update: 2012-06-05
 
 --- a/lib/Biber/Entries.pm
 +++ b/lib/Biber/Entries.pm
-@@ -7,7 +7,7 @@
+@@ -7,7 +7,7 @@ use warnings;
  
  =head1 NAME
  
@@ -17,7 +17,7 @@ Last-Update: 2012-06-05
  
 --- a/lib/Biber/Entry.pm
 +++ b/lib/Biber/Entry.pm
-@@ -15,7 +15,7 @@
+@@ -19,7 +19,7 @@ my $logger = Log::Log4perl::get_logger('
  
  =head1 NAME
  
@@ -28,7 +28,7 @@ Last-Update: 2012-06-05
  
 --- a/lib/Biber/Entry/Name.pm
 +++ b/lib/Biber/Entry/Name.pm
-@@ -14,7 +14,7 @@
+@@ -15,7 +15,7 @@ my $logger = Log::Log4perl::get_logger('
  
  =head1 NAME
  
@@ -39,7 +39,7 @@ Last-Update: 2012-06-05
  
 --- a/lib/Biber/Entry/Names.pm
 +++ b/lib/Biber/Entry/Names.pm
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ my $logger = Log::Log4perl::get_logger('
  
  =head1 NAME
  
@@ -50,7 +50,7 @@ Last-Update: 2012-06-05
  
 --- a/lib/Biber/Section.pm
 +++ b/lib/Biber/Section.pm
-@@ -11,7 +11,7 @@
+@@ -11,7 +11,7 @@ use List::Util qw( first );
  
  =head1 NAME
  
@@ -61,7 +61,7 @@ Last-Update: 2012-06-05
  
 --- a/lib/Biber/Sections.pm
 +++ b/lib/Biber/Sections.pm
-@@ -7,7 +7,7 @@
+@@ -7,7 +7,7 @@ use warnings;
  
  =head1 NAME
  
@@ -72,7 +72,7 @@ Last-Update: 2012-06-05
  
 --- a/lib/Biber/SortList.pm
 +++ b/lib/Biber/SortList.pm
-@@ -11,7 +11,7 @@
+@@ -11,7 +11,7 @@ use List::Util qw( first );
  
  =head1 NAME
  
@@ -83,7 +83,7 @@ Last-Update: 2012-06-05
  
 --- a/lib/Biber/SortLists.pm
 +++ b/lib/Biber/SortLists.pm
-@@ -7,7 +7,7 @@
+@@ -7,7 +7,7 @@ use warnings;
  
  =head1 NAME
  
@@ -92,14 +92,3 @@ Last-Update: 2012-06-05
  
  =head2 new
  
---- a/lib/Biber/Structure.pm
-+++ b/lib/Biber/Structure.pm
-@@ -13,7 +13,7 @@
- 
- =head1 NAME
- 
--Biber::Structure
-+Biber::Structure - Biber::Structure objects
- 
- 
- =cut

-- 


