[Debtags-commits] [svn] r718 - in libdebtags/trunk: . debian debtags swig swig/python

[Enrico Zini]

Author: enrico
Date: Thu May 12 13:39:57 2005
New Revision: 718

Added:
   libdebtags/trunk/debian/libdebtags1-pic.install
      - copied, changed from r717, libdebtags/trunk/debian/libdebtags1-dev.install
Modified:
   libdebtags/trunk/TODO
   libdebtags/trunk/debian/control
   libdebtags/trunk/debian/libdebtags1-dev.install
   libdebtags/trunk/debtags/Makefile.am
   libdebtags/trunk/libdebtags.pc.in
   libdebtags/trunk/swig/libdebtags.i
   libdebtags/trunk/swig/python/Makefile.am
Log:
Added generation of -pic library and package

Modified: libdebtags/trunk/TODO
==============================================================================
--- libdebtags/trunk/TODO	(original)
+++ libdebtags/trunk/TODO	Thu May 12 13:39:57 2005
@@ -1,5 +1,7 @@
 *** TODO for libdebtags
 
+ - Try wrapping with http://www.boost.org/libs/python/doc/index.html
+
  - Try to get rid of the Singleton Environment
 
  - Remove throw declarations altogether except when the function obviously

Modified: libdebtags/trunk/debian/control
==============================================================================
--- libdebtags/trunk/debian/control	(original)
+++ libdebtags/trunk/debian/control	Thu May 12 13:39:57 2005
@@ -26,6 +26,30 @@
  future versions.  This is why the library is distributed in a -dev package
  only.
 
+Package: libdebtags1-pic
+Section: libdevel
+Architecture: any
+Depends: libdebtags1-dev
+Description: Unified access to Debtags and APT databases (PIC library version)
+ libdebtags provides functionality to search and categorize debian packages
+ using the Debtags and APT databases.  Functions provided:
+ .
+  * search packages by normal debian/control fields and package tags
+  * find packages related to a given one
+  * edit debtags package categorization, with undo support
+  * save and submit tag patches to the central tag archive
+ .
+ libdebtags is written with the intent to make it easy and efficient for
+ applications to include debtags support.
+ .
+ Warning: the API has not yet been stabilized and is subject to change in
+ future versions.  This is why the library is distributed in a -dev package
+ only.
+ .
+ This package contains a library with position independent code that can be
+ used to link tagcoll functions into shared objects such as perl or python
+ bindings.
+
 Package: python-debtags
 Section: python
 Architecture: any

Modified: libdebtags/trunk/debian/libdebtags1-dev.install
==============================================================================
--- libdebtags/trunk/debian/libdebtags1-dev.install	(original)
+++ libdebtags/trunk/debian/libdebtags1-dev.install	Thu May 12 13:39:57 2005
@@ -1,5 +1,5 @@
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.a
+debian/tmp/usr/lib/libdebtags1.a
+debian/tmp/usr/lib/libdebtags1.la
 debian/tmp/usr/lib/pkgconfig/*
-debian/tmp/usr/lib/*.la
 debian/tmp/usr/share/aclocal/*.m4

Copied: libdebtags/trunk/debian/libdebtags1-pic.install (from r717, libdebtags/trunk/debian/libdebtags1-dev.install)
==============================================================================
--- libdebtags/trunk/debian/libdebtags1-dev.install	(original)
+++ libdebtags/trunk/debian/libdebtags1-pic.install	Thu May 12 13:39:57 2005
@@ -1,5 +1,2 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.a
-debian/tmp/usr/lib/pkgconfig/*
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/share/aclocal/*.m4
+debian/tmp/usr/lib/libdebtags1_pic.a
+debian/tmp/usr/lib/libdebtags1_pic.la

Modified: libdebtags/trunk/debtags/Makefile.am
==============================================================================
--- libdebtags/trunk/debtags/Makefile.am	(original)
+++ libdebtags/trunk/debtags/Makefile.am	Thu May 12 13:39:57 2005
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-debtagsincludedir = $(includedir)/debtags
+debtagsincludedir = $(includedir)/debtags-1.0/debtags
 
 debtagsinclude_HEADERS = \
 	Paths.h \
@@ -27,7 +27,7 @@
 
 # Not include Regexp.h
 
-lib_LTLIBRARIES = libdebtags1.la
+lib_LTLIBRARIES = libdebtags1.la libdebtags1_pic.la
 libdebtags1_la_SOURCES = \
 	Paths.cc \
 	Regexp.cc \
@@ -55,4 +55,18 @@
 libdebtags1_la_LDFLAGS = -version-info @LIBDEBTAGS_VERSION_INFO@ -static
 libdebtags1_la_LIBADD = $(LIBTAGCOLL_LIBS)
 
+# Build a _pic library so that one can statically link tagcoll code into a
+# # shared object (such as perl or python bindings)
+# #
+# # Libtool complains that linking non-libtool objects this way can be not
+# # portable, but then I don't know how to convince libtool in doing things
+# # differently
+libdebtags1_pic_la_DEPENDENCIES = libdebtags1.la
+libdebtags1_pic_la_SOURCES =
+libdebtags1_pic_la_LIBADD = \
+	$(addprefix .libs/,$(libdebtags1_la_SOURCES:.cc=.o)) \
+	-ltagcoll1_pic
+libdebtags1_pic_la_LDFLAGS = -static
+
+
 INCLUDES = $(LIBTAGCOLL_CFLAGS)

Modified: libdebtags/trunk/libdebtags.pc.in
==============================================================================
--- libdebtags/trunk/libdebtags.pc.in	(original)
+++ libdebtags/trunk/libdebtags.pc.in	Thu May 12 13:39:57 2005
@@ -6,4 +6,5 @@
 Name: libdebtags
 Description: Perform debian package search and categorization using Debtags and APT databases
 Version: @VERSION@
+Cflags: -I${includedir}/debtags-1.0
 Libs: -L${libdir} -ldebtags1 -lapt-pkg @LIBTAGCOLL_LIBS@

Modified: libdebtags/trunk/swig/libdebtags.i
==============================================================================
--- libdebtags/trunk/swig/libdebtags.i	(original)
+++ libdebtags/trunk/swig/libdebtags.i	Thu May 12 13:39:57 2005
@@ -30,8 +30,10 @@
 // Instantiate the base class needed but dont wrap it
 %include "../debtags/Tag.h"
 %include "../debtags/Package.h"
-%import "/usr/include/tagcoll/OpSet.h"
-%import "/usr/include/tagcoll/TDBReadonlyDiskIndex.h"
+%import "tagcoll/OpSet.h"
+%import "tagcoll/TDBReadonlyDiskIndex.h"
+//%import "/usr/include/tagcoll-1.0/tagcoll/OpSet.h"
+//%import "/usr/include/tagcoll-1.0/tagcoll/TDBReadonlyDiskIndex.h"
 
 %template(vecString) std::vector<std::string>;
 %template(vecTag) std::vector<Debtags::Tag>;

Modified: libdebtags/trunk/swig/python/Makefile.am
==============================================================================
--- libdebtags/trunk/swig/python/Makefile.am	(original)
+++ libdebtags/trunk/swig/python/Makefile.am	Thu May 12 13:39:57 2005
@@ -8,7 +8,7 @@
 _Debtags_la_LIBADD = $(LIBTAGCOLL_LIBS) -lapt-pkg ../../debtags/libdebtags1.la
 
 libdebtags_wrap_python.cc: ../libdebtags.i
-	swig -python -c++ -o $@ $<
+	swig -python -c++ -o $@ -I/usr/include/tagcoll-1.0 $<
 
 INCLUDES = $(LIBTAGCOLL_CFLAGS) -DSTATEDIR=\"$(statedir)\" -I/usr/include/python2.3