[Debtags-commits] [svn] r1352 - in tagcoll/trunk: . debian doc tagcoll tests tools

Sat Sep 10 16:05:55 UTC 2005

Author: enrico
Date: Sat Sep 10 16:05:54 2005
New Revision: 1352

Added:
   tagcoll/trunk/debian/libtagcoll2-dev.copyright
      - copied unchanged from r1351, tagcoll/trunk/debian/libtagcoll1-dev.copyright
   tagcoll/trunk/debian/libtagcoll2-dev.dirs
      - copied unchanged from r1351, tagcoll/trunk/debian/libtagcoll1-dev.dirs
   tagcoll/trunk/debian/libtagcoll2-dev.docs
      - copied unchanged from r1351, tagcoll/trunk/debian/libtagcoll1-dev.docs
   tagcoll/trunk/debian/libtagcoll2-dev.install
      - copied, changed from r1351, tagcoll/trunk/debian/libtagcoll1-dev.install
   tagcoll/trunk/libtagcoll2.m4
      - copied, changed from r1351, tagcoll/trunk/libtagcoll1.m4
   tagcoll/trunk/libtagcoll2.pc.in
      - copied, changed from r1351, tagcoll/trunk/libtagcoll1.pc.in
Removed:
   tagcoll/trunk/debian/libtagcoll1-dev.copyright
   tagcoll/trunk/debian/libtagcoll1-dev.dirs
   tagcoll/trunk/debian/libtagcoll1-dev.docs
   tagcoll/trunk/debian/libtagcoll1-dev.install
   tagcoll/trunk/libtagcoll1.m4
   tagcoll/trunk/libtagcoll1.pc.in
Modified:
   tagcoll/trunk/Makefile.am
   tagcoll/trunk/README
   tagcoll/trunk/configure.ac
   tagcoll/trunk/debian/changelog
   tagcoll/trunk/debian/control
   tagcoll/trunk/doc/Makefile.am
   tagcoll/trunk/tagcoll.1
   tagcoll/trunk/tagcoll/Makefile.am
   tagcoll/trunk/taggrep.1
   tagcoll/trunk/tests/Makefile.am
   tagcoll/trunk/tools/Makefile.am
Log:
Bumped major version

Modified: tagcoll/trunk/Makefile.am
==============================================================================

--- tagcoll/trunk/Makefile.am	(original)
+++ tagcoll/trunk/Makefile.am	Sat Sep 10 16:05:54 2005
@@ -3,11 +3,11 @@
 SUBDIRS = . tagcoll tests tools doc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA=libtagcoll1.pc
+pkgconfig_DATA=libtagcoll2.pc
 
 m4dir = $(datadir)/aclocal
-m4_DATA = libtagcoll1.m4
+m4_DATA = libtagcoll2.m4
 
 man_MANS = tagcoll.1 taggrep.1
 
-EXTRA_DIST = libtagcoll1.m4 libtagcoll1.pc.in COPYING.libtagcoll DONE tagcoll.1 taggrep.1
+EXTRA_DIST = libtagcoll2.m4 libtagcoll2.pc.in COPYING.libtagcoll DONE tagcoll.1 taggrep.1

Modified: tagcoll/trunk/README
==============================================================================
--- tagcoll/trunk/README	(original)
+++ tagcoll/trunk/README	Sat Sep 10 16:05:54 2005
@@ -1,5 +1,5 @@
-README for tagcoll 1.4.1
-========================
+README for tagcoll 2.0
+======================
 
 Functionality
 -------------
@@ -40,7 +40,7 @@
 What is in this release
 -----------------------
 
-Merged with libtagcoll1 source package to ease maintenance.
+Bumped major release since we aggressively changed the API.
 
 TDBFile now copy operations disabled, because it contains a TDB handle which is
 unsafe to copy (it leads to double closes and deallocs).  I might consider, in
@@ -101,7 +101,7 @@
 Development will now proceed by:
 
  * Trying to find better data structure and algorithms to improve the
-   efficiency of the various features provided by libdebtags1
+   efficiency of the various features provided by debtags
  * Possible restructurings to provide a cleaner API
 
 
@@ -111,6 +111,9 @@
 
 These are the TODO-list items completed so far::
 
+--- Done in 2.0
+ + Bumped major version to allow coexistance with old libtagcoll1-dev
+
 --- Done in 1.4.1
  + Remove invalid items when loading a patch from disk
  + A bit more resilience against invalid items in PatchCollection and

Modified: tagcoll/trunk/configure.ac
==============================================================================
--- tagcoll/trunk/configure.ac	(original)
+++ tagcoll/trunk/configure.ac	Sat Sep 10 16:05:54 2005
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(tagcoll, 1.4.1, [enrico at debian.org])
+AC_INIT(tagcoll, 2.0, [enrico at debian.org])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([foreign])
@@ -61,6 +61,6 @@
 tests/Makefile
 doc/Makefile
 tools/Makefile
-libtagcoll1.pc
+libtagcoll2.pc
 ])
 AC_OUTPUT

Modified: tagcoll/trunk/debian/changelog
==============================================================================
--- tagcoll/trunk/debian/changelog	(original)
+++ tagcoll/trunk/debian/changelog	Sat Sep 10 16:05:54 2005
@@ -1,3 +1,10 @@
+tagcoll (2.0-1) unstable; urgency=low
+
+  * Bumped major number to make a clean upload to unstable, since we change
+    the API of libtagcoll
+
+ -- Enrico Zini <enrico at debian.org>  Sat, 10 Sep 2005 17:53:02 +0200
+
 tagcoll (1.4-1) experimental; urgency=low
 
   * New upstream version, strongly refactored

Modified: tagcoll/trunk/debian/control
==============================================================================
--- tagcoll/trunk/debian/control	(original)
+++ tagcoll/trunk/debian/control	Sat Sep 10 16:05:54 2005
@@ -28,7 +28,7 @@
  For more information, see the Debtags homepage at:
  http://debtags.alioth.debian.org
  
-Package: libtagcoll1-dev
+Package: libtagcoll2-dev
 Section: libdevel
 Depends: tdb-dev, zlib1g-dev
 Architecture: any

Copied: tagcoll/trunk/debian/libtagcoll2-dev.install (from r1351, tagcoll/trunk/debian/libtagcoll1-dev.install)
==============================================================================
--- tagcoll/trunk/debian/libtagcoll1-dev.install	(original)
+++ tagcoll/trunk/debian/libtagcoll2-dev.install	Sat Sep 10 16:05:54 2005
@@ -1,5 +1,5 @@
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/libtagcoll1.la
-debian/tmp/usr/lib/libtagcoll1.a
+debian/tmp/usr/lib/libtagcoll2.la
+debian/tmp/usr/lib/libtagcoll2.a
 debian/tmp/usr/lib/pkgconfig/*
 debian/tmp/usr/share/aclocal/*.m4

Modified: tagcoll/trunk/doc/Makefile.am
==============================================================================
--- tagcoll/trunk/doc/Makefile.am	(original)
+++ tagcoll/trunk/doc/Makefile.am	Sat Sep 10 16:05:54 2005
@@ -5,10 +5,10 @@
 PAPER=tagbk-draft
 
 if DO_DOCS
-libtagcoll.doxytags: libtagcoll.dox ../tagcoll/libtagcoll1.la
+libtagcoll.doxytags: libtagcoll.dox ../tagcoll/libtagcoll2.la
 	doxygen $<
 
-html/index.html: libtagcoll.dox ../tagcoll/libtagcoll1.la
+html/index.html: libtagcoll.dox ../tagcoll/libtagcoll2.la
 	doxygen $<
 
 $(PAPER).pdf: $(PAPER).aux
@@ -28,10 +28,10 @@
 	bibtex $(PAPER)
 
 else
-libtagcoll.doxytags: libtagcoll.dox ../tagcoll/libtagcoll1.la
+libtagcoll.doxytags: libtagcoll.dox ../tagcoll/libtagcoll2.la
 	touch $@
 
-html/index.html: libtagcoll.dox ../tagcoll/libtagcoll1.la
+html/index.html: libtagcoll.dox ../tagcoll/libtagcoll2.la
 	mkdir html || true
 	touch $@
 endif

Copied: tagcoll/trunk/libtagcoll2.m4 (from r1351, tagcoll/trunk/libtagcoll1.m4)
==============================================================================
--- tagcoll/trunk/libtagcoll1.m4	(original)
+++ tagcoll/trunk/libtagcoll2.m4	Sat Sep 10 16:05:54 2005
@@ -1,9 +1,9 @@
-# LIBTAGCOLL_DEFS([LIBTAGCOLL1_REQS=libtagcoll1])
+# LIBTAGCOLL_DEFS([LIBTAGCOLL2_REQS=libtagcoll2])
 # ---------------------------------------
-AC_DEFUN([LIBTAGCOLL1_DEFS],
+AC_DEFUN([LIBTAGCOLL2_DEFS],
 [
 	dnl Import libtagcoll data
-	PKG_CHECK_MODULES(LIBTAGCOLL1,m4_default([$1], libtagcoll1))
-	AC_SUBST(LIBTAGCOLL1_CFLAGS)
-	AC_SUBST(LIBTAGCOLL1_LIBS)
+	PKG_CHECK_MODULES(LIBTAGCOLL2,m4_default([$1], libtagcoll2))
+	AC_SUBST(LIBTAGCOLL2_CFLAGS)
+	AC_SUBST(LIBTAGCOLL2_LIBS)
 ])

Copied: tagcoll/trunk/libtagcoll2.pc.in (from r1351, tagcoll/trunk/libtagcoll1.pc.in)
==============================================================================
--- tagcoll/trunk/libtagcoll1.pc.in	(original)
+++ tagcoll/trunk/libtagcoll2.pc.in	Sat Sep 10 16:05:54 2005
@@ -6,5 +6,5 @@
 Name: libtagcoll
 Description: Manipulate tags and tagged collections
 Version: @VERSION@
-Cflags: -I${includedir}/tagcoll-1.0
-Libs: -L${libdir} -ltagcoll1 -ltdb -lz
+Cflags: -I${includedir}/tagcoll-2.0
+Libs: -L${libdir} -ltagcoll2 -ltdb -lz

Modified: tagcoll/trunk/tagcoll.1
==============================================================================
--- tagcoll/trunk/tagcoll.1	(original)
+++ tagcoll/trunk/tagcoll.1	Sat Sep 10 16:05:54 2005
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH TAGCOLL 1 "April 23, 2003" "0.13"
+.TH TAGCOLL 1 "September 10, 2005" "2.0"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:

Modified: tagcoll/trunk/tagcoll/Makefile.am
==============================================================================
--- tagcoll/trunk/tagcoll/Makefile.am	(original)
+++ tagcoll/trunk/tagcoll/Makefile.am	Sat Sep 10 16:05:54 2005
@@ -50,8 +50,8 @@
 		SmartHierarchy.h \
 		SmartHierarchy.cc
 
-lib_LTLIBRARIES = libtagcoll1.la
-libtagcoll1_la_SOURCES = \
+lib_LTLIBRARIES = libtagcoll2.la
+libtagcoll2_la_SOURCES = \
 		stringf.cc \
 		OpSet.cc \
 		Exception.cc \
@@ -84,8 +84,8 @@
 		SmartHierarchy.cc \
 		\
 		test-utils.cc
-libtagcoll1_la_LIBADD = tagexpr/libtagexpr.la
+libtagcoll2_la_LIBADD = tagexpr/libtagexpr.la
 
-libtagcoll1_la_LDFLAGS = -ltdb -version-info @LIBTAGCOLL_VERSION_INFO@
+libtagcoll2_la_LDFLAGS = -ltdb -version-info @LIBTAGCOLL_VERSION_INFO@
 
 INCLUDES = -I$(top_srcdir) -DCOMPILE_TESTSUITE

Modified: tagcoll/trunk/taggrep.1
==============================================================================
--- tagcoll/trunk/taggrep.1	(original)
+++ tagcoll/trunk/taggrep.1	Sat Sep 10 16:05:54 2005
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH TAGGREP 1 "May 01, 2003" "0.13"
+.TH TAGGREP 1 "Semptember 10, 2005" "2.0"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:

Modified: tagcoll/trunk/tests/Makefile.am
==============================================================================
--- tagcoll/trunk/tests/Makefile.am	(original)
+++ tagcoll/trunk/tests/Makefile.am	Sat Sep 10 16:05:54 2005
@@ -1,14 +1,14 @@
 TESTS = libtagcoll-test
 check_PROGRAMS = libtagcoll-test
 libtagcoll_test_SOURCES = tut-main.cpp test-textformat.cc test-tdbdiskindex.cc test-tdbreadonlydiskindex.cc
-libtagcoll_test_LDADD = -dlpreopen ../tagcoll/libtagcoll1.la ../tagcoll/tagexpr/libtagexpr.la -ltdb
+libtagcoll_test_LDADD = -dlpreopen ../tagcoll/libtagcoll2.la ../tagcoll/tagexpr/libtagexpr.la -ltdb
 
 noinst_PROGRAMS = dump-tdbdi
 # test-tagset
 
 dump_tdbdi_SOURCES = \
 	dump-tdbdi.cc
-dump_tdbdi_LDADD = ../tagcoll/libtagcoll1.la -ltdb
+dump_tdbdi_LDADD = ../tagcoll/libtagcoll2.la -ltdb
 
 #test_tagset_SOURCES = \
 	#test-tagset.cc

Modified: tagcoll/trunk/tools/Makefile.am
==============================================================================
--- tagcoll/trunk/tools/Makefile.am	(original)
+++ tagcoll/trunk/tools/Makefile.am	Sat Sep 10 16:05:54 2005
@@ -3,11 +3,11 @@
 bin_PROGRAMS = tagcoll taggrep
 
 tagcoll_SOURCES = tagcoll.cc CommandlineParser.cc
-tagcoll_LDADD = ../tagcoll/libtagcoll1.la ../tagcoll/tagexpr/libtagexpr.la
+tagcoll_LDADD = ../tagcoll/libtagcoll2.la ../tagcoll/tagexpr/libtagexpr.la
 #$(LIBTAGCOLL1_LIBS)
 
 taggrep_SOURCES = taggrep.cc CommandlineParser.cc
-taggrep_LDADD = ../tagcoll/libtagcoll1.la ../tagcoll/tagexpr/libtagexpr.la
+taggrep_LDADD = ../tagcoll/libtagcoll2.la ../tagcoll/tagexpr/libtagexpr.la
 #$(LIBTAGCOLL1_LIBS)
 
 INCLUDES = -I$(top_srcdir)

