r65544 - in /trunk/libextutils-cchecker-perl: Changes MANIFEST META.yml README debian/changelog debian/compat debian/control debian/copyright debian/rules lib/ExtUtils/CChecker.pm t/03accessors.t t/04module_build.t

ansgar at users.alioth.debian.org ansgar at users.alioth.debian.org
Sun Dec 5 11:34:00 UTC 2010 

Author: ansgar
Date: Sun Dec  5 11:33:28 2010
New Revision: 65544

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=65544
Log:
* New upstream release.
* Use debhelper compat level 8, drop manual selection of build system in
  debian/rules as Build.PL is now the default.
* Drop build-dep on perl (>= 5.10) | libmodule-build-perl. Stable already
  has a recent enough version of perl.
* debian/copyright: Refer to /usr/share/common-licenses/GPL-1; refer to
  "Debian systems" instead of "Debian GNU/Linux systems".
* Bump Standards-Version to 3.9.1.

Added:
    trunk/libextutils-cchecker-perl/t/03accessors.t
      - copied unchanged from r65543, branches/upstream/libextutils-cchecker-perl/current/t/03accessors.t
    trunk/libextutils-cchecker-perl/t/04module_build.t
      - copied unchanged from r65543, branches/upstream/libextutils-cchecker-perl/current/t/04module_build.t
Modified:
    trunk/libextutils-cchecker-perl/Changes
    trunk/libextutils-cchecker-perl/MANIFEST
    trunk/libextutils-cchecker-perl/META.yml
    trunk/libextutils-cchecker-perl/README
    trunk/libextutils-cchecker-perl/debian/changelog
    trunk/libextutils-cchecker-perl/debian/compat
    trunk/libextutils-cchecker-perl/debian/control
    trunk/libextutils-cchecker-perl/debian/copyright
    trunk/libextutils-cchecker-perl/debian/rules
    trunk/libextutils-cchecker-perl/lib/ExtUtils/CChecker.pm

Modified: trunk/libextutils-cchecker-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-cchecker-perl/Changes?rev=65544&op=diff
==============================================================================
--- trunk/libextutils-cchecker-perl/Changes (original)
+++ trunk/libextutils-cchecker-perl/Changes Sun Dec  5 11:33:28 2010
@@ -1,4 +1,12 @@
 Revision history for ExtUtils-CChecker
+
+0.05    CHANGES:
+         * Added accessors for callers to push more library dirs or compiler
+           or linker flags
+
+        BUGFIXES:
+         * Ensure that ->new_module_build merges its args and internal
+           configuration correctly
 
 0.04    CHANGES:
          * Provide optional variants of ->find_include_dirs_for and

Modified: trunk/libextutils-cchecker-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-cchecker-perl/MANIFEST?rev=65544&op=diff
==============================================================================
--- trunk/libextutils-cchecker-perl/MANIFEST (original)
+++ trunk/libextutils-cchecker-perl/MANIFEST Sun Dec  5 11:33:28 2010
@@ -9,4 +9,6 @@
 t/00use.t
 t/01run.t
 t/02assert.t
+t/03accessors.t
+t/04module_build.t
 t/99pod.t

Modified: trunk/libextutils-cchecker-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-cchecker-perl/META.yml?rev=65544&op=diff
==============================================================================
--- trunk/libextutils-cchecker-perl/META.yml (original)
+++ trunk/libextutils-cchecker-perl/META.yml Sun Dec  5 11:33:28 2010
@@ -17,9 +17,9 @@
 provides:
   ExtUtils::CChecker:
     file: lib/ExtUtils/CChecker.pm
-    version: 0.04
+    version: 0.05
 requires:
   ExtUtils::CBuilder: 0
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.04
+version: 0.05

Modified: trunk/libextutils-cchecker-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-cchecker-perl/README?rev=65544&op=diff
==============================================================================
--- trunk/libextutils-cchecker-perl/README (original)
+++ trunk/libextutils-cchecker-perl/README Sun Dec  5 11:33:28 2010
@@ -54,6 +54,15 @@
   $flags = $cc->extra_linker_flags
     Returns the currently-configured extra linker flags in an ARRAY
     reference.
+
+  $cc->push_include_dirs( @dirs )
+    Adds more include directories
+
+  $cc->push_extra_compiler_flags( @flags )
+    Adds more compiler flags
+
+  $cc->push_extra_linker_flags
+    Adds more linker flags
 
   $success = $cc->try_compile_run( %args )
   $success = $cc->try_compile_run( $source )

Modified: trunk/libextutils-cchecker-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-cchecker-perl/debian/changelog?rev=65544&op=diff
==============================================================================
--- trunk/libextutils-cchecker-perl/debian/changelog (original)
+++ trunk/libextutils-cchecker-perl/debian/changelog Sun Dec  5 11:33:28 2010
@@ -1,8 +1,16 @@
-libextutils-cchecker-perl (0.04-2) UNRELEASED; urgency=low
+libextutils-cchecker-perl (0.05-1) unstable; urgency=low
 
+  * New upstream release.
+  * Use debhelper compat level 8, drop manual selection of build system in
+    debian/rules as Build.PL is now the default.
+  * Drop build-dep on perl (>= 5.10) | libmodule-build-perl. Stable already
+    has a recent enough version of perl.
+  * debian/copyright: Refer to /usr/share/common-licenses/GPL-1; refer to
+    "Debian systems" instead of "Debian GNU/Linux systems".
+  * Bump Standards-Version to 3.9.1.
   * Update my email address.
 
- -- Ansgar Burchardt <ansgar at debian.org>  Mon, 01 Nov 2010 11:16:45 +0100
+ -- Ansgar Burchardt <ansgar at debian.org>  Sun, 05 Dec 2010 12:33:19 +0100
 
 libextutils-cchecker-perl (0.04-1) unstable; urgency=low
 

Modified: trunk/libextutils-cchecker-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-cchecker-perl/debian/compat?rev=65544&op=diff
==============================================================================
--- trunk/libextutils-cchecker-perl/debian/compat (original)
+++ trunk/libextutils-cchecker-perl/debian/compat Sun Dec  5 11:33:28 2010
@@ -1,1 +1,1 @@
-7
+8

Modified: trunk/libextutils-cchecker-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-cchecker-perl/debian/control?rev=65544&op=diff
==============================================================================
--- trunk/libextutils-cchecker-perl/debian/control (original)
+++ trunk/libextutils-cchecker-perl/debian/control Sun Dec  5 11:33:28 2010
@@ -1,11 +1,11 @@
 Source: libextutils-cchecker-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7.3.7~), perl (>= 5.10) | libmodule-build-perl
+Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: perl, libtest-exception-perl, libtest-pod-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jonathan Yu <jawnsy at cpan.org>, Ansgar Burchardt <ansgar at debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://search.cpan.org/dist/ExtUtils-CChecker/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libextutils-cchecker-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libextutils-cchecker-perl/

Modified: trunk/libextutils-cchecker-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-cchecker-perl/debian/copyright?rev=65544&op=diff
==============================================================================
--- trunk/libextutils-cchecker-perl/debian/copyright (original)
+++ trunk/libextutils-cchecker-perl/debian/copyright Sun Dec  5 11:33:28 2010
@@ -15,8 +15,8 @@
  This program is free software; you can redistribute it and/or modify
  it under the terms of the Artistic License, which comes with Perl.
  .
- On Debian GNU/Linux systems, the complete text of the Artistic License
- can be found in `/usr/share/common-licenses/Artistic'
+ On Debian systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
 
 License: GPL-1+
  This program is free software; you can redistribute it and/or modify
@@ -24,5 +24,5 @@
  the Free Software Foundation; either version 1, or (at your option)
  any later version.
  .
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.

Modified: trunk/libextutils-cchecker-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-cchecker-perl/debian/rules?rev=65544&op=diff
==============================================================================
--- trunk/libextutils-cchecker-perl/debian/rules (original)
+++ trunk/libextutils-cchecker-perl/debian/rules Sun Dec  5 11:33:28 2010
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh --buildsystem=perl_build $@
+	dh $@

Modified: trunk/libextutils-cchecker-perl/lib/ExtUtils/CChecker.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-cchecker-perl/lib/ExtUtils/CChecker.pm?rev=65544&op=diff
==============================================================================
--- trunk/libextutils-cchecker-perl/lib/ExtUtils/CChecker.pm (original)
+++ trunk/libextutils-cchecker-perl/lib/ExtUtils/CChecker.pm Sun Dec  5 11:33:28 2010
@@ -8,7 +8,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.04';
+our $VERSION = '0.05';
 
 use Carp;
 
@@ -128,6 +128,42 @@
    return [ @{ $self->{extra_linker_flags} } ];
 }
 
+=head2 $cc->push_include_dirs( @dirs )
+
+Adds more include directories
+
+=cut
+
+sub push_include_dirs
+{
+   my $self = shift;
+   push @{ $self->{include_dirs} }, @_;
+}
+
+=head2 $cc->push_extra_compiler_flags( @flags )
+
+Adds more compiler flags
+
+=cut
+
+sub push_extra_compiler_flags
+{
+   my $self = shift;
+   push @{ $self->{extra_compiler_flags} }, @_;
+}
+
+=head2 $cc->push_extra_linker_flags
+
+Adds more linker flags
+
+=cut
+
+sub push_extra_linker_flags
+{
+   my $self = shift;
+   push @{ $self->{extra_linker_flags} }, @_;
+}
+
 sub cbuilder
 {
    my $self = shift;
@@ -169,7 +205,7 @@
    my $self = shift;
    my ( $symbol ) = @_;
 
-   push @{ $self->{extra_compiler_flags} }, "-D$symbol";
+   $self->push_extra_compiler_flags( "-D$symbol" );
 }
 
 =head2 $success = $cc->try_compile_run( %args )
@@ -339,7 +375,7 @@
 
       $self->try_compile_run( %args, include_dirs => $d ) or next;
 
-      push @{ $self->{include_dirs} }, @$d;
+      $self->push_include_dirs( @$d );
 
       return 1;
    }
@@ -393,7 +429,7 @@
 
       $self->try_compile_run( %args, extra_linker_flags => \@extra_linker_flags ) or next;
 
-      push @{ $self->{extra_linker_flags} }, @extra_linker_flags;
+      $self->push_extra_linker_flags( @extra_linker_flags );
 
       return 1;
    }
@@ -452,14 +488,20 @@
 sub new_module_build
 {
    my $self = shift;
+   my %args = @_;
+
    require Module::Build;
 
-   return Module::Build->new(
-      include_dirs         => $self->include_dirs,
-      extra_compiler_flags => $self->extra_compiler_flags,
-      extra_linker_flags   => $self->extra_linker_flags,
-      @_,
-   );
+   foreach my $key (qw( include_dirs extra_compiler_flags extra_linker_flags )) {
+      if( exists $args{$key} ) {
+         $args{$key} = [ @{ $self->$key }, @{ $args{$key} } ];
+      }
+      else {
+         $args{$key} = $self->$key;
+      }
+   }
+
+   return Module::Build->new( %args );
 }
 
 # Keep perl happy; keep Britain tidy

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