[Debtags-commits] [svn] r715 - in libtagcoll/trunk: . debian tagcoll

[Enrico Zini]

Author: enrico
Date: Tue May 10 21:44:11 2005
New Revision: 715

Modified:
   libtagcoll/trunk/TODO
   libtagcoll/trunk/debian/control
   libtagcoll/trunk/libtagcoll.pc.in
   libtagcoll/trunk/tagcoll/Makefile.am
Log:
Allow two different versions of libtagcoll to cohexist
Added to the TODO notes about packaging the -pic version


Modified: libtagcoll/trunk/TODO
==============================================================================
--- libtagcoll/trunk/TODO	(original)
+++ libtagcoll/trunk/TODO	Tue May 10 21:44:11 2005
@@ -1,5 +1,13 @@
 *** TODO for libtagcoll
 
+ - Generate -pic library together with the normal -dev
+   http://lists.debian.org/debian-devel/2005/05/msg00425.html
+   discover1-1.7.7 is an example of program generating -pic libraries with automake
+	from discover1's debian/rules:
+	  # This builds the pic library
+	  ar cqv lib/libdiscover_pic.a lib/.libs/*.o
+
+
  - Replace Consumers with functors:
    class Collection
 	{

Modified: libtagcoll/trunk/debian/control
==============================================================================
--- libtagcoll/trunk/debian/control	(original)
+++ libtagcoll/trunk/debian/control	Tue May 10 21:44:11 2005
@@ -8,7 +8,6 @@
 Section: libdevel
 Architecture: any
 Recommends: pkg-config
-Conflicts: libtagcoll-dev
 Description: Functions used to manipulate tagged collections (development version)
  Tagged collections are collections of items tagged with multiple categories.
  libtagcoll provides general infrastructure to handle tagged collection data,

Modified: libtagcoll/trunk/libtagcoll.pc.in
==============================================================================
--- libtagcoll/trunk/libtagcoll.pc.in	(original)
+++ libtagcoll/trunk/libtagcoll.pc.in	Tue May 10 21:44:11 2005
@@ -6,4 +6,5 @@
 Name: libtagcoll
 Description: Manipulate tags and tagged collections
 Version: @VERSION@
+Cflags: -I${includedir}/tagcoll-1.0
 Libs: -L${libdir} -ltagcoll -ltdb -lz

Modified: libtagcoll/trunk/tagcoll/Makefile.am
==============================================================================
--- libtagcoll/trunk/tagcoll/Makefile.am	(original)
+++ libtagcoll/trunk/tagcoll/Makefile.am	Tue May 10 21:44:11 2005
@@ -2,7 +2,7 @@
 
 SUBDIRS = tagexpr .
 
-tagcollincludedir = $(includedir)/tagcoll
+tagcollincludedir = $(includedir)/tagcoll-1.0/tagcoll
 
 # Include the .cc files that contain template definitions
 tagcollinclude_HEADERS = \