r1487 - in packages/libset-object-perl/trunk: . debian lib/Set

[Gunnar Wolf]

Author: gwolf
Date: 2005-11-11 22:54:51 +0000 (Fri, 11 Nov 2005)
New Revision: 1487

Modified:
   packages/libset-object-perl/trunk/Changes.pod
   packages/libset-object-perl/trunk/META.yml
   packages/libset-object-perl/trunk/Makefile.PL
   packages/libset-object-perl/trunk/Object.xs
   packages/libset-object-perl/trunk/debian/changelog
   packages/libset-object-perl/trunk/debian/rules
   packages/libset-object-perl/trunk/lib/Set/Object.pm
Log:
New upstream version.
Minor change in debian/rules, not to ignore errors upon cleaning


Modified: packages/libset-object-perl/trunk/Changes.pod
===================================================================
--- packages/libset-object-perl/trunk/Changes.pod	2005-11-11 22:44:24 UTC (rev 1486)
+++ packages/libset-object-perl/trunk/Changes.pod	2005-11-11 22:54:51 UTC (rev 1487)
@@ -1,6 +1,36 @@
 
 =head1 REVISION HISTORY FOR Set::Object
 
+=head1 1.14
+
+=over
+
+=item *
+
+Fix build problem on Win32 (thanks Steffen Goeldner)
+
+=back
+
+=head1 1.13
+
+=over
+
+=item *
+
+Fix F<Makefile.PL> so this F<Changes.pod> is not delivered as
+C<Set::Changes> :-}
+
+=item *
+
+Restore compatibility with 5.6.0
+
+=item *
+
+Remove some compile-time warnings, please let me know if this version
+does not build on any platform!
+
+=back
+
 =head1 1.12, 30 Aug 2005
 
 =over

Modified: packages/libset-object-perl/trunk/META.yml
===================================================================
--- packages/libset-object-perl/trunk/META.yml	2005-11-11 22:44:24 UTC (rev 1486)
+++ packages/libset-object-perl/trunk/META.yml	2005-11-11 22:54:51 UTC (rev 1487)
@@ -1,7 +1,7 @@
 # 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.12
+version:      1.14
 version_from: lib/Set/Object.pm
 installdirs:  site
 requires:

Modified: packages/libset-object-perl/trunk/Makefile.PL
===================================================================
--- packages/libset-object-perl/trunk/Makefile.PL	2005-11-11 22:44:24 UTC (rev 1486)
+++ packages/libset-object-perl/trunk/Makefile.PL	2005-11-11 22:54:51 UTC (rev 1487)
@@ -8,6 +8,6 @@
     'LIBS'	=> [''],   # e.g., '-lm' 
     'DEFINE'	=> '',     # e.g., '-DHAVE_SOMETHING' 
     'INC'	=> '',     # e.g., '-I/usr/include/other' 
-    'MAN3PODS'  => {'lib/Set/Object.pm' => 'blib/man3/Set::Object.3pm'},
-    test => { TESTS => "t/object/*.t t/scalar/*.t" },
+    PM => {'lib/Set/Object.pm' => '$(INST_LIBDIR)/Object.pm'},
+    test => { TESTS => join(' ', glob('t/object/*.t'), glob('t/scalar/*.t')) },
 );

Modified: packages/libset-object-perl/trunk/Object.xs
===================================================================
--- packages/libset-object-perl/trunk/Object.xs	2005-11-11 22:44:24 UTC (rev 1486)
+++ packages/libset-object-perl/trunk/Object.xs	2005-11-11 22:54:51 UTC (rev 1487)
@@ -81,7 +81,6 @@
 {
   STRLEN len;
   char* key = 0;
-  SV** oldsvref;
 
   if (!s->flat) {
     IF_INSERT_DEBUG(warn("iset_insert_scalar(%x): creating scalar hash", s));
@@ -155,7 +154,6 @@
 
 int iset_insert_one(ISET* s, SV* rv)
 {
-	BUCKET** ppb;
 	I32 hash, index;
 	SV* el;
 	int ins = 0;
@@ -298,7 +296,7 @@
 
 PROTOTYPES: DISABLE
 
-SV*
+void
 new(pkg, ...)
    SV* pkg;
 
@@ -428,8 +426,8 @@
      XSRETURN_UNDEF;
 
    if (s->flat) {
-     if (HvUSEDKEYS(s->flat)) {
-       //warn("got some keys: %d\n", HvUSEDKEYS(s->flat));
+     if (HvKEYS(s->flat)) {
+       //warn("got some keys: %d\n", HvKEYS(s->flat));
        XSRETURN_UNDEF;
      }
    }
@@ -537,7 +535,7 @@
       BUCKET* bucket_iter = s->bucket;
       BUCKET* bucket_last = bucket_iter + s->buckets;
 
-      EXTEND(sp, s->elems + (s->flat ? HvUSEDKEYS(s->flat) : 0) );
+      EXTEND(sp, s->elems + (s->flat ? HvKEYS(s->flat) : 0) );
 
       for (; bucket_iter != bucket_last; ++bucket_iter)
       {
@@ -686,6 +684,8 @@
 
       // XSRETURN_UNDEF;
 	RETVAL = PTR2UV(SvRV(sv));
+    } else {
+      RETVAL = 0;
     }
 }
 OUTPUT:
@@ -798,8 +798,6 @@
 void
 _STORABLE_thaw(obj, cloning, serialized, ...)
    SV* obj;
-   SV* cloning;
-   SV* serialized;
 
    PPCODE:
 

Modified: packages/libset-object-perl/trunk/debian/changelog
===================================================================
--- packages/libset-object-perl/trunk/debian/changelog	2005-11-11 22:44:24 UTC (rev 1486)
+++ packages/libset-object-perl/trunk/debian/changelog	2005-11-11 22:54:51 UTC (rev 1487)
@@ -1,3 +1,9 @@
+libset-object-perl (1.14-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 11 Nov 2005 16:40:54 -0600
+
 libset-object-perl (1.12-2) unstable; urgency=low
 
   * Added build-dependency on perl-doc - Thanks, Andreas Jochens!

Modified: packages/libset-object-perl/trunk/debian/rules
===================================================================
--- packages/libset-object-perl/trunk/debian/rules	2005-11-11 22:44:24 UTC (rev 1486)
+++ packages/libset-object-perl/trunk/debian/rules	2005-11-11 22:54:51 UTC (rev 1487)
@@ -31,7 +31,7 @@
 	rm -f *-stamp
 	rm -f debian/changelog_generated.txt
 	dh_clean
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 binary-indep:	checkroot build
 

Modified: packages/libset-object-perl/trunk/lib/Set/Object.pm
===================================================================
--- packages/libset-object-perl/trunk/lib/Set/Object.pm	2005-11-11 22:44:24 UTC (rev 1486)
+++ packages/libset-object-perl/trunk/lib/Set/Object.pm	2005-11-11 22:54:51 UTC (rev 1487)
@@ -366,7 +366,7 @@
 
 @EXPORT_OK = qw( ish_int is_int is_string is_double blessed reftype
 		 refaddr is_overloaded is_object is_key set );
-$VERSION = '1.12';
+$VERSION = '1.14';
 
 bootstrap Set::Object $VERSION;