r8140 - in /trunk/libset-object-perl: ./ debian/ lib/Set/ lib/Set/Object/ t/object/

rmayorga-guest at users.alioth.debian.org rmayorga-guest at users.alioth.debian.org
Tue Oct 9 18:01:31 UTC 2007


Author: rmayorga-guest
Date: Tue Oct  9 18:01:31 2007
New Revision: 8140

URL: http://svn.debian.org/wsvn/?sc=1&rev=8140
Log:
* New upstream release
* debian/rules - remove "tag" target, move test suite from binary to build target
* debian/control - Homepage field added, test-pod and test-pod-coverage added to B-D
* README.debian removed
* debian/copyright updated

Added:
    trunk/libset-object-perl/debian/compat
    trunk/libset-object-perl/t/object/SetSubClass.pm
      - copied unchanged from r8138, branches/upstream/libset-object-perl/current/t/object/SetSubClass.pm
    trunk/libset-object-perl/t/object/set_subclass.t
      - copied unchanged from r8138, branches/upstream/libset-object-perl/current/t/object/set_subclass.t
Removed:
    trunk/libset-object-perl/debian/README.Debian
Modified:
    trunk/libset-object-perl/Changes.pod
    trunk/libset-object-perl/MANIFEST
    trunk/libset-object-perl/META.yml
    trunk/libset-object-perl/debian/changelog
    trunk/libset-object-perl/debian/control
    trunk/libset-object-perl/debian/copyright
    trunk/libset-object-perl/debian/rules
    trunk/libset-object-perl/debian/watch
    trunk/libset-object-perl/lib/Set/Object.pm
    trunk/libset-object-perl/lib/Set/Object/Weak.pm

Modified: trunk/libset-object-perl/Changes.pod
URL: http://svn.debian.org/wsvn/trunk/libset-object-perl/Changes.pod?rev=8140&op=diff
==============================================================================
--- trunk/libset-object-perl/Changes.pod (original)
+++ trunk/libset-object-perl/Changes.pod Tue Oct  9 18:01:31 2007
@@ -1,5 +1,19 @@
+
+=encoding utf8
 
 =head1 REVISION HISTORY FOR Set::Object
+
+=head1 1.22, 8 Oct 2007
+
+=over
+
+=item *
+
+Sub-classing interface added; it is now much easier to make
+L<Set::Object> subclasses that return objects other than more
+L<Set::Object>s when subclassing.  From Brían Mach Aon Innéirghthe.
+
+=back
 
 =head1 1.21, 17 Feb 2007
 

Modified: trunk/libset-object-perl/MANIFEST
URL: http://svn.debian.org/wsvn/trunk/libset-object-perl/MANIFEST?rev=8140&op=diff
==============================================================================
--- trunk/libset-object-perl/MANIFEST (original)
+++ trunk/libset-object-perl/MANIFEST Tue Oct  9 18:01:31 2007
@@ -25,6 +25,8 @@
 t/object/properties.t
 t/object/storable.t
 t/object/weakref.t
+t/object/SetSubClass.pm
+t/object/set_subclass.t
 
 t/scalar/basic_overload.t
 t/scalar/basic.t

Modified: trunk/libset-object-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libset-object-perl/META.yml?rev=8140&op=diff
==============================================================================
--- trunk/libset-object-perl/META.yml (original)
+++ trunk/libset-object-perl/META.yml Tue Oct  9 18:01:31 2007
@@ -1,10 +1,10 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         Set-Object
-version:      1.21
+version:      1.22
 version_from: lib/Set/Object.pm
 installdirs:  site
 requires:
 
 distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+generated_by: ExtUtils::MakeMaker version 6.30_01

Modified: trunk/libset-object-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libset-object-perl/debian/changelog?rev=8140&op=diff
==============================================================================
--- trunk/libset-object-perl/debian/changelog (original)
+++ trunk/libset-object-perl/debian/changelog Tue Oct  9 18:01:31 2007
@@ -1,3 +1,26 @@
+libset-object-perl (1.22-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/rules
+    + Remove "tag" target
+    + Remove DH_COMPAT var
+    + Move "make test" from binary-arch to build target
+    + Remove unused/unneded dh_* calls 
+  * debian/watch
+    + set version to 3
+  * debian/control
+    + Add Homepage field
+    + set policy to 3.7.2 instead to 3.7.2.1
+    + Add myself to uploaders
+    + Add libtest-pod-coverage and libtest-pod to Build-Depends
+  * debian/copyright
+    + Add upstream URL
+    + Update general info and Add others copyright holders
+  * README.debian removed, not needed 
+  * debian/compat added
+
+ -- Rene Mayorga <rmayorga at debian.org.sv>  Tue, 09 Oct 2007 11:20:44 -0600
+
 libset-object-perl (1.21-1) unstable; urgency=low
 
   * New upstream release

Added: trunk/libset-object-perl/debian/compat
URL: http://svn.debian.org/wsvn/trunk/libset-object-perl/debian/compat?rev=8140&op=file
==============================================================================
--- trunk/libset-object-perl/debian/compat (added)
+++ trunk/libset-object-perl/debian/compat Tue Oct  9 18:01:31 2007
@@ -1,0 +1,1 @@
+5

Modified: trunk/libset-object-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libset-object-perl/debian/control?rev=8140&op=diff
==============================================================================
--- trunk/libset-object-perl/debian/control (original)
+++ trunk/libset-object-perl/debian/control Tue Oct  9 18:01:31 2007
@@ -2,11 +2,16 @@
 Section: perl
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Gunnar Wolf <gwolf at debian.org>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>, Niko Tyni <ntyni at iki.fi>
-Standards-Version: 3.7.2.1
+Uploaders: Gunnar Wolf <gwolf at debian.org>, 
+ Krzysztof Krzyzaniak (eloy) <eloy at debian.org>, 
+ gregor herrmann <gregor+debian at comodo.priv.at>, Niko Tyni <ntyni at iki.fi>,
+ Rene Mayorga <rmayorga at debian.org.sv>
+Standards-Version: 3.7.2
+Homepage: http://search.cpan.org/dist/Set-Object/
 XS-Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libset-object-perl/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libset-object-perl/
-Build-Depends: debhelper (>= 5.0.0), perl (>> 5.8.1), perl-doc
+Build-Depends: debhelper (>= 5.0.0), perl (>> 5.8.1), libtest-pod-perl, 
+ libtest-pod-coverage-perl, perl-doc
 
 Package: libset-object-perl
 Architecture: any

Modified: trunk/libset-object-perl/debian/copyright
URL: http://svn.debian.org/wsvn/trunk/libset-object-perl/debian/copyright?rev=8140&op=diff
==============================================================================
--- trunk/libset-object-perl/debian/copyright (original)
+++ trunk/libset-object-perl/debian/copyright Tue Oct  9 18:01:31 2007
@@ -1,18 +1,39 @@
 This is the Debian GNU/Linux version of the Set::Object Perl module.
+This module is available via CPAN network: 
+http://search.cpan.org/dist/Set-Object/
 
-From the README:
+Upstreams Authors:
 
-LICENSE
+   Copyright (c) 2003 - 2005, Sam Vilain
+   Portions Copyright (c) 2006, 2007, Catalyst IT (NZ) Limited
+   Portions  Copyright (c) 1998, Jean-Louis
 
-   Copyright (c) 1998, Jean-Louis Leroy. All Rights Reserved.
    This module is free software. It may be used, redistributed
    and/or modified under the terms of the Perl Artistic License
 
-The full text of the Artistic Licence is available on Debian systems in
-/usr/share/common-licenses/Artistic.
+   The full text of the Artistic Licence is available on Debian systems in
+   /usr/share/common-licenses/Artistic.
+
+
+Info for others copyright holders:
+   
+   ppport.h:
+   
+   Version 3.x, Copyright (c) 2004, Marcus Holland-Moritz.
+   Version 2.x, Copyright (C) 2001, Paul Marquess.
+   Version 1.x, Copyright (C) 1999, Kenneth Albanowski.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the same terms as Perl itself.
+
+   Perl is distributed under your choice of the GNU General Public License or
+   the Artistic License.  On Debian GNU/Linux systems, the complete text of the
+   GNU General Public License can be found in `/usr/share/common-licenses/GPL'
+   and the Artistic Licence in `/usr/share/common-licenses/Artistic'.
+
 
 This package has been through multiple maintainers (for a list see
 /usr/share/doc/libset-object-perl/changelog.Debian.gz).
 
-Current Debian specific changes are copyright (c) 2001-2002,
-Stephen Zander <gibreel at debian.org>
+Current Debian specific changes are 
+copyright (c) 2001-2002, Stephen Zander <gibreel at debian.org>.

Modified: trunk/libset-object-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libset-object-perl/debian/rules?rev=8140&op=diff
==============================================================================
--- trunk/libset-object-perl/debian/rules (original)
+++ trunk/libset-object-perl/debian/rules Tue Oct  9 18:01:31 2007
@@ -1,9 +1,6 @@
 #! /usr/bin/make -f
 # -*-makefile-*-
 # debian/rules file for libset-object-perl
-
-export DH_COMPAT=5
-
 PERL	?= /usr/bin/perl
 
 package	:=$(firstword $(shell dh_listpackages))
@@ -11,12 +8,6 @@
 
 version	:= $(shell dpkg-parsechangelog | \
 			sed -ne 's/^Version: *\([0-9]\+:\)*//p')
-
-tag:
-	cvs tag -c -F $(subst .,_,debian_version_$(version))
-ifeq ($(findstring -,$(version)),)
-	cvs tag -c -F $(subst .,_,upstream_version_$(version))
-endif
 
 config:	config-stamp
 config-stamp:
@@ -27,6 +18,7 @@
 build:	config build-stamp
 build-stamp:
 	$(MAKE) LD_RUN_PATH=
+	$(MAKE) test
 	touch $@
 
 clean:	checkroot
@@ -39,22 +31,14 @@
 
 binary-arch:	checkroot build
 	dh_clean
-	dh_installdirs
-
-	$(MAKE) test
 	$(MAKE) pure_install PREFIX=$(prefix)
 	perldoc -t Changes.pod > debian/changelog_generated.txt
-
 	# As this is a architecture dependent package, we are not
 	# supposed to install stuff to /usr/share. MakeMaker creates
 	# the dirs, we delete them from the deb:
 	rmdir --ignore-fail-on-non-empty --parents $(prefix)/share/perl5
-
-
 	dh_installdocs README
-	dh_installexamples 
 	dh_installchangelogs debian/changelog_generated.txt
-
 	dh_strip
 	dh_compress
 	dh_fixperms

Modified: trunk/libset-object-perl/debian/watch
URL: http://svn.debian.org/wsvn/trunk/libset-object-perl/debian/watch?rev=8140&op=diff
==============================================================================
--- trunk/libset-object-perl/debian/watch (original)
+++ trunk/libset-object-perl/debian/watch Tue Oct  9 18:01:31 2007
@@ -1,2 +1,2 @@
-version=2
+version=3
 http://www.cpan.org/modules/by-module/Set/Set-Object-(\d.*)\.tar\.gz

Modified: trunk/libset-object-perl/lib/Set/Object.pm
URL: http://svn.debian.org/wsvn/trunk/libset-object-perl/lib/Set/Object.pm?rev=8140&op=diff
==============================================================================
--- trunk/libset-object-perl/lib/Set/Object.pm (original)
+++ trunk/libset-object-perl/lib/Set/Object.pm Tue Oct  9 18:01:31 2007
@@ -77,6 +77,13 @@
 
 Return a new C<Set::Object> filled with C<@members>.  You have to
 explicitly import this method.
+
+B<New in Set::Object 1.22>: this function is now called as a method
+to return new sets the various methods that return a new set, such as
+C<-E<gt>intersection>, C<-E<gt>union>, etc and their overloaded
+counterparts.  The default method always returns C<Set::Object>
+objects, preserving previous behaviour and not second guessing the
+nature of your derived L<Set::Object> class.
 
 =head2 C<weak_set()>
 
@@ -490,7 +497,7 @@
 
 @EXPORT_OK = qw( ish_int is_int is_string is_double blessed reftype
 		 refaddr is_overloaded is_object is_key set weak_set );
-$VERSION = '1.21';
+$VERSION = '1.22';
 
 bootstrap Set::Object $VERSION;
 
@@ -505,7 +512,7 @@
     croak "Tried to use as_string on something other than a Set::Object"
 	unless (UNIVERSAL::isa($self, __PACKAGE__));
 
-   'Set::Object(' . (join ' ', sort { $a cmp $b }
+    ref($self).'(' . (join ' ', sort { $a cmp $b }
 		     $self->members) . ')'
 }
 
@@ -524,7 +531,7 @@
 
 sub union
 {
-    Set::Object->new
+    $_[0]->set
 	    ( map { $_->members() }
 	      grep { UNIVERSAL::isa($_, __PACKAGE__) }
 	      @_ );
@@ -537,7 +544,7 @@
     if (ref $_[0]) {
 	$other = shift;
     } else {
-	$other = __PACKAGE__->new(shift);
+	$other = $self->set(shift);
     }
 
     croak("Tried to form union between Set::Object & "
@@ -551,14 +558,12 @@
 sub intersection
 {
    my $s = shift;
-   return Set::Object->new() unless $s;
-
-   my $rem = __PACKAGE__->new($s->members);
+   my $rem = $s->set($s->members);
 
    while ($s = shift)
    {
        if (!ref $s) {
-	   $s = __PACKAGE__->new($s);
+	   $s = $rem->new($s);
        }
 
        croak("Tried to form intersection between Set::Object & "
@@ -577,7 +582,7 @@
     if (ref $_[0]) {
 	$s2 = shift;
     } else {
-	$s2 = __PACKAGE__->new(shift);
+	$s2 = $s1->set(shift);
     }
     my $r = shift;
     if ( $r ) {
@@ -604,9 +609,9 @@
 
    my $s;
    if ( $r ) {
-       $s = Set::Object->new( grep { !$s1->includes($_) } $s2->members );
+       $s = $s2->set( grep { !$s1->includes($_) } $s2->members );
    } else {
-       $s = Set::Object->new( grep { !$s2->includes($_) } $s1->members );
+       $s = $s1->set( grep { !$s2->includes($_) } $s1->members );
    }
    $s;
 }
@@ -625,7 +630,7 @@
 	  ."`$other'")
 	if ref $other and not UNIVERSAL::isa($other, __PACKAGE__);
 
-    my $result = Set::Object->new( $self->members() );
+    my $result = $self->set( $self->members() );
     $result->invert( $other->members() );
     return $result;
 
@@ -1057,6 +1062,9 @@
 }
 
 sub set {
+    if (eval { $_[0]->isa(__PACKAGE__) }) {
+    	shift;
+    }
     __PACKAGE__->new(@_);
 }
 sub weak_set {

Modified: trunk/libset-object-perl/lib/Set/Object/Weak.pm
URL: http://svn.debian.org/wsvn/trunk/libset-object-perl/lib/Set/Object/Weak.pm?rev=8140&op=diff
==============================================================================
--- trunk/libset-object-perl/lib/Set/Object/Weak.pm (original)
+++ trunk/libset-object-perl/lib/Set/Object/Weak.pm Tue Oct  9 18:01:31 2007
@@ -29,6 +29,7 @@
 
 use base qw(Exporter);     # my users would hate me otherwise
 use vars qw(@ISA @EXPORT_OK);
+use Set::Object qw(blessed);
 
 our @EXPORT_OK = qw(weak_set set);
 
@@ -79,7 +80,11 @@
 =cut
 
 sub set {
-    __PACKAGE__->new(@_);
+    my $class = __PACKAGE__;
+    if (blessed $_[0] and $_[0]->isa("Set::Object")) {
+    	$class = "Set::Object";
+    }
+    $class->new(@_);
 }
 
 1;




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