[Debtags-commits] [svn] r911 - in tagcoll/trunk: . debian src

[Enrico Zini]

Author: enrico
Date: Sat Jun 18 15:08:22 2005
New Revision: 911

Modified:
   tagcoll/trunk/configure.ac
   tagcoll/trunk/debian/changelog
   tagcoll/trunk/debian/control
   tagcoll/trunk/src/tagcoll.cc
   tagcoll/trunk/src/taggrep.cc
Log:
Ported to libtagcoll 1.0.3

Modified: tagcoll/trunk/configure.ac
==============================================================================
--- tagcoll/trunk/configure.ac	(original)
+++ tagcoll/trunk/configure.ac	Sat Jun 18 15:08:22 2005
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(tagcoll, 0.101, [enrico@debian.org])
+AC_INIT(tagcoll, 0.2, [enrico@debian.org])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE

Modified: tagcoll/trunk/debian/changelog
==============================================================================
--- tagcoll/trunk/debian/changelog	(original)
+++ tagcoll/trunk/debian/changelog	Sat Jun 18 15:08:22 2005
@@ -1,3 +1,9 @@
+tagcoll (0.2-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Enrico Zini <enrico@debian.org>  Sat, 18 Jun 2005 17:07:51 +0200
+
 tagcoll (0.101-1) experimental; urgency=low
 
   * Added 'findspecials' function

Modified: tagcoll/trunk/debian/control
==============================================================================
--- tagcoll/trunk/debian/control	(original)
+++ tagcoll/trunk/debian/control	Sat Jun 18 15:08:22 2005
@@ -2,7 +2,7 @@
 Section: misc
 Priority: optional
 Maintainer: Enrico Zini <enrico@debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, pkg-config, libtagcoll1-dev (>= 1.0.1), libtagcoll1-dev (<< 1.1)
+Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, pkg-config, libtagcoll1-dev (>= 1.0.3), libtagcoll1-dev (<< 1.1)
 Standards-Version: 3.6.1.0
 
 Package: tagcoll

Modified: tagcoll/trunk/src/tagcoll.cc
==============================================================================
--- tagcoll/trunk/src/tagcoll.cc	(original)
+++ tagcoll/trunk/src/tagcoll.cc	Sat Jun 18 15:08:22 2005
@@ -122,7 +122,7 @@
 void readCollection(const string& file, TagcollConsumer<string, string>& builder)
 	throw (FileException, ParserException)
 {
-	TrivialSerializer serializer;
+	Serializer<string, string> serializer;
 
 	if (file == "-")
 	{
@@ -139,7 +139,7 @@
 PatchList<string, string> readPatches(const string& file)
 	throw (FileException, ParserException)
 {
-	TrivialSerializer serializer;
+	Serializer<string, string> serializer;
 
 	if (file == "-")
 	{
@@ -401,7 +401,7 @@
 
 				newImpls.pack();
 				
-				TrivialSerializer serializer;
+				Serializer<string, string> serializer;
 				TextFormat<string, string> output(serializer, stdout);
 				if (opts.get("expanded").defined())
 					newImpls.outputFull(output);
@@ -452,7 +452,7 @@
 				PatchList<string, string> newpatches;
 				newpatches.addPatch(merger, merger2);
 
-				TrivialSerializer serializer;
+				Serializer<string, string> serializer;
 				TextFormat<string, string>::outputPatch(newpatches, serializer, stdout);
 				break;
 			}
@@ -526,7 +526,7 @@
 				if (opts.get("untagged-tag").defined())
 					reverser.setUntaggedItemName(opts.get("untagged-tag").stringVal());
 
-				TrivialSerializer serializer;
+				Serializer<string, string> serializer;
 				TextFormat<string, string> writer(serializer, stdout);
 				if (opts.get("groupitems").defined())
 				{
@@ -539,7 +539,7 @@
 			}
 			case COPY:
 			{
-				TrivialSerializer serializer;
+				Serializer<string, string> serializer;
 				TextFormat<string, string> writer(serializer, stdout);
 				if (opts.get("groupitems").defined())
 				{

Modified: tagcoll/trunk/src/taggrep.cc
==============================================================================
--- tagcoll/trunk/src/taggrep.cc	(original)
+++ tagcoll/trunk/src/taggrep.cc	Sat Jun 18 15:08:22 2005
@@ -52,7 +52,7 @@
 void readCollection(const string& file, TagcollConsumer<string, string>& builder)
 	throw (FileException, ParserException)
 {
-	TrivialSerializer serializer;
+	Serializer<string, string> serializer;
 
 	if (file == "-")
 	{
@@ -134,7 +134,7 @@
 		if (opts.get("invert-match").defined())
 			filter.setMatchType(ExpressionFilter<string>::INVERTED);
 
-		TrivialSerializer serializer;
+		Serializer<string, string> serializer;
 		if (opts.get("quiet").defined())
 			filters.setConsumer(new TagcollSink<string, string>());
 		else