[Debtags-commits] [svn] r1971 - in tagcoll/2.0: . debian tagcoll/stream

[Enrico Zini]

Author: enrico
Date: Fri Sep 29 21:21:13 2006
New Revision: 1971

Modified:
   tagcoll/2.0/   (props changed)
   tagcoll/2.0/configure.ac
   tagcoll/2.0/debian/changelog
   tagcoll/2.0/debian/control
   tagcoll/2.0/tagcoll/stream/filters.h
Log:
 r3442 at viaza:  enrico | 2006-09-29 22:51:46 +0200
 Now wibble is fixed, but still cast to size_t to avoid problems with containers with nonstandard size_t


Modified: tagcoll/2.0/configure.ac
==============================================================================
--- tagcoll/2.0/configure.ac	(original)
+++ tagcoll/2.0/configure.ac	Fri Sep 29 21:21:13 2006
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(tagcoll2, 2.0, [enrico at debian.org])
+AC_INIT(tagcoll2, 2.0.1, [enrico at debian.org])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([foreign subdir-objects])

Modified: tagcoll/2.0/debian/changelog
==============================================================================
--- tagcoll/2.0/debian/changelog	(original)
+++ tagcoll/2.0/debian/changelog	Fri Sep 29 21:21:13 2006
@@ -1,3 +1,12 @@
+tagcoll2 (2.0.1-1) unstable; urgency=low
+
+  * New upstream version.
+     + STL's size() methods return size_t, which can be different than
+       unsigned int: fixed.  Closes: bug#389858, bug#39007.
+  * Build-depend on newer libwibble to get a decent manpage
+
+ -- Enrico Zini <enrico at debian.org>  Fri, 29 Sep 2006 21:57:33 +0200
+
 tagcoll2 (2.0-2) unstable; urgency=low
 
   * Build-depend on zlib1g-dev.  Closes: #389739.

Modified: tagcoll/2.0/debian/control
==============================================================================
--- tagcoll/2.0/debian/control	(original)
+++ tagcoll/2.0/debian/control	Fri Sep 29 21:21:13 2006
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Enrico Zini <enrico at debian.org>
 Uploaders: Jeroen van Wolffelaar <jeroen at wolffelaar.nl>
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, pkg-config, libwibble-dev (>= 0.1.5), libwibble-dev (<<0.2), cdbs, flex, bison, doxygen, graphviz, tetex-bin, gs, libtut-dev, zlib1g-dev
+Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, pkg-config, libwibble-dev (>= 0.1.6), libwibble-dev (<<0.2), cdbs, flex, bison, doxygen, graphviz, tetex-bin, gs, libtut-dev, zlib1g-dev
 Standards-Version: 3.7.2.0
 
 Package: tagcoll

Modified: tagcoll/2.0/tagcoll/stream/filters.h
==============================================================================
--- tagcoll/2.0/tagcoll/stream/filters.h	(original)
+++ tagcoll/2.0/tagcoll/stream/filters.h	Fri Sep 29 21:21:13 2006
@@ -229,7 +229,9 @@
 	template<typename ITEMS, typename TAGS>
 	TagCounter<OUT>& operator=(const std::pair<ITEMS, TAGS>& data)
 	{
-		*out = make_pair(data.first, wibble::singleton(data.second.size()));
+		// Cast to size_t in case we are passed a container with a nonstandard
+		// size type
+		*out = make_pair(data.first, wibble::singleton(static_cast<size_t>(data.second.size())));
 		++out;
 		return *this;
 	}