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

Enrico Zini enrico at costa.debian.org
Sat Sep 24 17:25:56 UTC 2005 

Author: enrico
Date: Sat Sep 24 17:25:55 2005
New Revision: 1363

Added:
   tagcoll/trunk/debian/libtagcoll-dev.copyright
      - copied unchanged from r1362, tagcoll/trunk/debian/libtagcoll1-dev.copyright
   tagcoll/trunk/debian/libtagcoll-dev.dirs
      - copied unchanged from r1362, tagcoll/trunk/debian/libtagcoll1-dev.dirs
   tagcoll/trunk/debian/libtagcoll-dev.docs
      - copied, changed from r1362, tagcoll/trunk/debian/libtagcoll1-dev.docs
   tagcoll/trunk/debian/libtagcoll-dev.install
      - copied, changed from r1362, tagcoll/trunk/debian/libtagcoll1-dev.install
   tagcoll/trunk/libtagcoll.m4
      - copied, changed from r1362, tagcoll/trunk/libtagcoll1.m4
   tagcoll/trunk/libtagcoll.pc.in
      - copied, changed from r1362, tagcoll/trunk/libtagcoll1.pc.in
Removed:
   tagcoll/trunk/DONE
   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/debian/libtagcoll2-dev.copyright
   tagcoll/trunk/debian/libtagcoll2-dev.dirs
   tagcoll/trunk/debian/libtagcoll2-dev.docs
   tagcoll/trunk/debian/libtagcoll2-dev.install
   tagcoll/trunk/libtagcoll1.m4
   tagcoll/trunk/libtagcoll1.pc.in
   tagcoll/trunk/libtagcoll2.m4
   tagcoll/trunk/libtagcoll2.pc.in
Modified:
   tagcoll/trunk/Makefile.am
   tagcoll/trunk/README
   tagcoll/trunk/configure.ac
   tagcoll/trunk/debian/changelog
   tagcoll/trunk/debian/control
   tagcoll/trunk/debian/rules
   tagcoll/trunk/debian/tagcoll.docs
   tagcoll/trunk/doc/Makefile.am
   tagcoll/trunk/tagcoll/Makefile.am
   tagcoll/trunk/tagcoll/tagexpr/Makefile.am
   tagcoll/trunk/tests/Makefile.am
   tagcoll/trunk/tools/Makefile.am
Log:
Reverted version bump, sanitised build system

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

Modified: tagcoll/trunk/README
==============================================================================
--- tagcoll/trunk/README	(original)
+++ tagcoll/trunk/README	Sat Sep 24 17:25:55 2005
@@ -111,6 +111,13 @@
 
 These are the TODO-list items completed so far::
 
+--- Done in 1.5
+ + Reverted the 2.0 bump, which wasn't really useful
+ + Removed some attempts to preserve clashes, which really don't make sense in
+   the current state of things
+ + Removed the DONE file: one can fish the old TODO-lists up from the README in
+   old versions in tag/something in the repository
+
 --- Done in 2.0
  + Bumped major version to allow coexistance with old libtagcoll1-dev
 

Modified: tagcoll/trunk/configure.ac
==============================================================================
--- tagcoll/trunk/configure.ac	(original)
+++ tagcoll/trunk/configure.ac	Sat Sep 24 17:25:55 2005
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(tagcoll, 2.0, [enrico at debian.org])
+AC_INIT(tagcoll, 1.5, [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
-libtagcoll2.pc
+libtagcoll.pc
 ])
 AC_OUTPUT

Modified: tagcoll/trunk/debian/changelog
==============================================================================
--- tagcoll/trunk/debian/changelog	(original)
+++ tagcoll/trunk/debian/changelog	Sat Sep 24 17:25:55 2005
@@ -1,3 +1,11 @@
+tagcoll (1.5-1) unstable; urgency=low
+
+  * New upstream version
+     * API changed.  All reverse build-depends are aware of it.
+  * Build-dep on tut-dev and tdb-dev.  Closes: #328075
+
+ -- Enrico Zini <enrico at debian.org>  Sat, 24 Sep 2005 16:57:42 +0200
+
 tagcoll (2.0-1) unstable; urgency=low
 
   * Bumped major number to make a clean upload to unstable, since we change

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

Copied: tagcoll/trunk/debian/libtagcoll-dev.docs (from r1362, tagcoll/trunk/debian/libtagcoll1-dev.docs)
==============================================================================
--- tagcoll/trunk/debian/libtagcoll1-dev.docs	(original)
+++ tagcoll/trunk/debian/libtagcoll-dev.docs	Sat Sep 24 17:25:55 2005
@@ -1,4 +1,3 @@
 README
-DONE
 doc/html
 doc/libtagcoll.doxytags

Copied: tagcoll/trunk/debian/libtagcoll-dev.install (from r1362, tagcoll/trunk/debian/libtagcoll1-dev.install)
==============================================================================
--- tagcoll/trunk/debian/libtagcoll1-dev.install	(original)
+++ tagcoll/trunk/debian/libtagcoll-dev.install	Sat Sep 24 17:25:55 2005
@@ -1,5 +1,5 @@
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/libtagcoll1_pic.la
-debian/tmp/usr/lib/libtagcoll1_pic.a
+debian/tmp/usr/lib/*.la
+debian/tmp/usr/lib/*.a
 debian/tmp/usr/lib/pkgconfig/*
 debian/tmp/usr/share/aclocal/*.m4

Modified: tagcoll/trunk/debian/rules
==============================================================================
--- tagcoll/trunk/debian/rules	(original)
+++ tagcoll/trunk/debian/rules	Sat Sep 24 17:25:55 2005
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-shared
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-shared --with-pic
 
 # Store build information
 common-binary-post-install-arch common-binary-post-install-indep::

Modified: tagcoll/trunk/debian/tagcoll.docs
==============================================================================
--- tagcoll/trunk/debian/tagcoll.docs	(original)
+++ tagcoll/trunk/debian/tagcoll.docs	Sat Sep 24 17:25:55 2005
@@ -1,4 +1,3 @@
 README
-DONE
 doc/local.bib
 doc/tagbk-draft.tex

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

Copied: tagcoll/trunk/libtagcoll.m4 (from r1362, tagcoll/trunk/libtagcoll1.m4)
==============================================================================
--- tagcoll/trunk/libtagcoll1.m4	(original)
+++ tagcoll/trunk/libtagcoll.m4	Sat Sep 24 17:25:55 2005
@@ -1,9 +1,9 @@
-# LIBTAGCOLL_DEFS([LIBTAGCOLL1_REQS=libtagcoll1])
+# LIBTAGCOLL_DEFS([LIBTAGCOLL_REQS=libtagcoll])
 # ---------------------------------------
-AC_DEFUN([LIBTAGCOLL1_DEFS],
+AC_DEFUN([LIBTAGCOLL_DEFS],
 [
 	dnl Import libtagcoll data
-	PKG_CHECK_MODULES(LIBTAGCOLL1,m4_default([$1], libtagcoll1))
-	AC_SUBST(LIBTAGCOLL1_CFLAGS)
-	AC_SUBST(LIBTAGCOLL1_LIBS)
+	PKG_CHECK_MODULES(LIBTAGCOLL,m4_default([$1], libtagcoll))
+	AC_SUBST(LIBTAGCOLL_CFLAGS)
+	AC_SUBST(LIBTAGCOLL_LIBS)
 ])

Copied: tagcoll/trunk/libtagcoll.pc.in (from r1362, tagcoll/trunk/libtagcoll1.pc.in)
==============================================================================
--- tagcoll/trunk/libtagcoll1.pc.in	(original)
+++ tagcoll/trunk/libtagcoll.pc.in	Sat Sep 24 17:25:55 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- at VERSION@
+Libs: -L${libdir} -ltagcoll -ltdb -lz

Modified: tagcoll/trunk/tagcoll/Makefile.am
==============================================================================
--- tagcoll/trunk/tagcoll/Makefile.am	(original)
+++ tagcoll/trunk/tagcoll/Makefile.am	Sat Sep 24 17:25:55 2005
@@ -2,7 +2,7 @@
 
 SUBDIRS = tagexpr .
 
-tagcollincludedir = $(includedir)/tagcoll-2.0/tagcoll
+tagcollincludedir = $(includedir)/tagcoll-$(VERSION)/tagcoll
 
 # Include the .cc files that contain template definitions
 tagcollinclude_HEADERS = \
@@ -50,8 +50,8 @@
 		SmartHierarchy.h \
 		SmartHierarchy.cc
 
-lib_LTLIBRARIES = libtagcoll2.la
-libtagcoll2_la_SOURCES = \
+lib_LTLIBRARIES = libtagcoll.la
+libtagcoll_la_SOURCES = \
 		stringf.cc \
 		OpSet.cc \
 		Exception.cc \
@@ -84,8 +84,8 @@
 		SmartHierarchy.cc \
 		\
 		test-utils.cc
-libtagcoll2_la_LIBADD = tagexpr/libtagexpr.la
+libtagcoll_la_LIBADD = tagexpr/libtagexpr.la
 
-libtagcoll2_la_LDFLAGS = -ltdb -version-info @LIBTAGCOLL_VERSION_INFO@
+libtagcoll_la_LDFLAGS = -ltdb -version-info @LIBTAGCOLL_VERSION_INFO@
 
 INCLUDES = -I$(top_srcdir) -DCOMPILE_TESTSUITE

Modified: tagcoll/trunk/tagcoll/tagexpr/Makefile.am
==============================================================================
--- tagcoll/trunk/tagcoll/tagexpr/Makefile.am	(original)
+++ tagcoll/trunk/tagcoll/tagexpr/Makefile.am	Sat Sep 24 17:25:55 2005
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-tagexprincludedir = $(includedir)/tagcoll-2.0/tagcoll/tagexpr
+tagexprincludedir = $(includedir)/tagcoll-$(VERSION)/tagcoll/tagexpr
 
 tagexprinclude_HEADERS = \
 		TagexprParser.h

Modified: tagcoll/trunk/tests/Makefile.am
==============================================================================
--- tagcoll/trunk/tests/Makefile.am	(original)
+++ tagcoll/trunk/tests/Makefile.am	Sat Sep 24 17:25:55 2005
@@ -1,18 +1,18 @@
 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/libtagcoll2.la ../tagcoll/tagexpr/libtagexpr.la -ltdb
+libtagcoll_test_LDADD = -dlpreopen ../tagcoll/libtagcoll.la ../tagcoll/tagexpr/libtagexpr.la -ltdb
 
 noinst_PROGRAMS = dump-tdbdi
 # test-tagset
 
 dump_tdbdi_SOURCES = \
 	dump-tdbdi.cc
-dump_tdbdi_LDADD = ../tagcoll/libtagcoll2.la -ltdb
+dump_tdbdi_LDADD = ../tagcoll/libtagcoll.la -ltdb
 
 #test_tagset_SOURCES = \
 	#test-tagset.cc
-#test_tagset_LDADD = ../tagcoll/libtagcoll1.la
+#test_tagset_LDADD = ../tagcoll/libtagcoll.la
 
 INCLUDES = -I$(top_srcdir)
 

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

More information about the Debtags-commits mailing list