[Debtags-commits] [svn] r1093 - in branches/bigmerge/debtags: . debian debtags doc src tools

Fri Aug 5 16:02:33 UTC 2005

Author: enrico
Date: Fri Aug  5 16:02:32 2005
New Revision: 1093

Added:
   branches/bigmerge/debtags/tools/
      - copied from r1089, branches/bigmerge/debtags/src/
Removed:
   branches/bigmerge/debtags/ChangeLog
   branches/bigmerge/debtags/NEWS
   branches/bigmerge/debtags/doc/Makefile
   branches/bigmerge/debtags/src/
Modified:
   branches/bigmerge/debtags/AUTHORS
   branches/bigmerge/debtags/Makefile.am
   branches/bigmerge/debtags/TODO-bigmerge
   branches/bigmerge/debtags/autogen.sh
   branches/bigmerge/debtags/configure.ac
   branches/bigmerge/debtags/debian/control
   branches/bigmerge/debtags/debian/copyright
   branches/bigmerge/debtags/debian/libdebtags1.docs
   branches/bigmerge/debtags/debtags/Makefile.am
   branches/bigmerge/debtags/doc/Makefile.am
   branches/bigmerge/debtags/tools/Makefile.am
Log:
Renamed 'src' in 'tools'
Merge completed, library builds, tests pass, debtags seems to work, now let's wait for the packaging bugs to be reported :)


Modified: branches/bigmerge/debtags/AUTHORS
==============================================================================

--- branches/bigmerge/debtags/AUTHORS	(original)
+++ branches/bigmerge/debtags/AUTHORS	Fri Aug  5 16:02:32 2005
@@ -1,25 +1,13 @@
 Authors:
 	Enrico Zini <enrico at debian.org>
 
-Many thanks to Erich Schubert, Hervé Eychenne, Benjamin Mesing, Gunnar Wolf and
-all people in the deb-usability-list at lists.alioth.debian.org mailing list  for
-the great deal of feedback and ideas right from the first design phase.
-
-
-Many thanks to Erich Schubert, Hervé Eychenne
-and many other Debian developers for the great
-deal of feedback and ideas.
-
-Thanks also go to many other people that provided feedback
-and ideas, including, but not limited to:
-	James "Ender" Brown
-	Colin Walters
-	David Roundy
-	Kevin B. McCarty
-
+Many thanks to all the people around the debtags-devel, debian-devel and the
+previous deb-usability list for the ideas and feedback.
 
 Contribution history:
 
+ 5 Aug 2005 Benjamin Mesing helped merging libdebtags1 and debtags source
+            packages
 24 May 2005 A. Costa provided a patch to fix three typos in the manpage
 16 Jul 2003 Carl Henrik Holth Lunde <chlunde at wirth.ping.uio.no> provided a
 	    patch that fixed a typo and made debtags work correctly with

Modified: branches/bigmerge/debtags/Makefile.am
==============================================================================
--- branches/bigmerge/debtags/Makefile.am	(original)
+++ branches/bigmerge/debtags/Makefile.am	Fri Aug  5 16:02:32 2005
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = . debtags tests src examples swig doc
+SUBDIRS = . debtags tests tools examples swig doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA=libdebtags1.pc

Modified: branches/bigmerge/debtags/TODO-bigmerge
==============================================================================
--- branches/bigmerge/debtags/TODO-bigmerge	(original)
+++ branches/bigmerge/debtags/TODO-bigmerge	Fri Aug  5 16:02:32 2005
@@ -1,12 +1,13 @@
-- merge libdebtags1/configure.ac into /configure.ac
-- check doc/Makefile.am
-- evaluate AUTHORS
-- merge /Makefile.am (currently appended)
-- libdebtags/README move to /README.libdebtags (adapt the build rules)
-- check the merged control file especially build dependencies
-- merge autogen.sh (currently appended)
-- adapt new_release which came from libdebtags and should pobably support
++ merge libdebtags1/configure.ac into /configure.ac
++ check doc/Makefile.am
++ evaluate AUTHORS
++ merge /Makefile.am (currently appended)
++ libdebtags/README move to /README.libdebtags (adapt the build rules)
++ check the merged control file especially build dependencies
++ merge autogen.sh (currently appended)
++ adapt new_release which came from libdebtags and should pobably support
   the new release structure (if at all..)
-- linked <package>.copyright for all library packages to libdebtags.copyright
+= linked <package>.copyright for all library packages to libdebtags.copyright
   which points to the LGPL (no TODO here, but probably interesting :-)
-- what about libdebtags/NEWS? It was mentioned in the libdebtags1.docs file, but there was no such file in the libdebtags1 directory - now the single NEWS file will be used.
\ No newline at end of file
++ what about libdebtags/NEWS? It was mentioned in the libdebtags1.docs file, but there was no such file in the libdebtags1 directory - now the single NEWS file will be used.
+  (deleted it instead: the README has everything)
\ No newline at end of file

Modified: branches/bigmerge/debtags/autogen.sh
==============================================================================
--- branches/bigmerge/debtags/autogen.sh	(original)
+++ branches/bigmerge/debtags/autogen.sh	Fri Aug  5 16:02:32 2005
@@ -17,36 +17,9 @@
 
 $ACLOCAL
 autoheader
-#libtoolize --force -c
+libtoolize --force -c
 $AUTOMAKE --foreign -a -f -c
 autoconf
 
 ./get_tags
 ./get_vocabulary
-
-####
-## libdebtags part, integrate
-####
-
-#!/bin/sh
-
-# Rebuild the build system
-
-ACLOCAL=aclocal
-AUTOMAKE=automake
-
-for i in 1.9 1.8 1.7
-do
-	if which $ACLOCAL-$i > /dev/null
-	then
-		ACLOCAL=aclocal-$i
-		AUTOMAKE=automake-$i
-		break
-	fi
-done
-
-$ACLOCAL
-autoheader
-libtoolize --force -c
-$AUTOMAKE --foreign -a -f -c
-autoconf

Modified: branches/bigmerge/debtags/configure.ac
==============================================================================
--- branches/bigmerge/debtags/configure.ac	(original)
+++ branches/bigmerge/debtags/configure.ac	Fri Aug  5 16:02:32 2005
@@ -90,7 +90,7 @@
 AC_CONFIG_FILES([
 Makefile
 debtags/Makefile
-src/Makefile
+tools/Makefile
 tests/Makefile
 swig/Makefile
 swig/python/Makefile

Modified: branches/bigmerge/debtags/debian/control
==============================================================================
--- branches/bigmerge/debtags/debian/control	(original)
+++ branches/bigmerge/debtags/debian/control	Fri Aug  5 16:02:32 2005
@@ -1,7 +1,7 @@
 Source: debtags
 Priority: optional
 Maintainer: Enrico Zini <enrico at debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, pkg-config, apt, c++abi2-dev, cdbs, zlib1g-dev, libtagcoll1-dev (>= 1.0.6), libtagcoll1-dev (<< 1.1), libtagcoll1-pic (>= 1.0.5), libtagcoll1-pic (<< 1.1), libapt-pkg-dev (>= 0.6.39), doxygen, graphviz, swig, python-dev
+Build-Depends: c++abi2-dev, cdbs, debhelper (>> 4.1), dh-buildinfo, pkg-config, apt, zlib1g-dev, libtagcoll1-dev (>= 1.0.6), libtagcoll1-dev (<< 1.1), libtagcoll1-pic (>= 1.0.6), libtagcoll1-pic (<< 1.1), libapt-pkg-dev (>= 0.6.39), doxygen, graphviz, swig, python-dev
 Standards-Version: 3.6.2.0
 
 Package: debtags
@@ -23,7 +23,6 @@
  For more information, see the Debtags homepage at:
  http://debtags.alioth.debian.org
 
-
 Package: libdebtags1-dev
 Section: libdevel
 Architecture: any

Modified: branches/bigmerge/debtags/debian/copyright
==============================================================================
--- branches/bigmerge/debtags/debian/copyright	(original)
+++ branches/bigmerge/debtags/debian/copyright	Fri Aug  5 16:02:32 2005
@@ -1,12 +1,9 @@
 This package was debianized by Enrico Zini <enrico at debian.org> on
 Fri, 25 Apr 2003 00:16:36 +0200.
 
-Upstream Authors: Enrico Zini <enrico at debian.org> and
-		  Erich Schubert <erich at debian.org>,
-                  with lots of feedback and ideas from
-		  Hervé Eychenne <rv at wallfire.org>
+Upstream Authors: Enrico Zini <enrico at debian.org>
 
-Copyright (C) 2003 Enrico Zini <enrico at debian.org> et al.
+Copyright (C) 2003,2004,2005 Enrico Zini <enrico at debian.org> et al.
 
 License:
 

Modified: branches/bigmerge/debtags/debian/libdebtags1.docs
==============================================================================
--- branches/bigmerge/debtags/debian/libdebtags1.docs	(original)
+++ branches/bigmerge/debtags/debian/libdebtags1.docs	Fri Aug  5 16:02:32 2005
@@ -1,3 +1,2 @@
-NEWS
-README.libdebtags1
-DONE.libdebtags1
+README
+DONE

Modified: branches/bigmerge/debtags/debtags/Makefile.am
==============================================================================
--- branches/bigmerge/debtags/debtags/Makefile.am	(original)
+++ branches/bigmerge/debtags/debtags/Makefile.am	Fri Aug  5 16:02:32 2005
@@ -99,4 +99,4 @@
 	$(CXXCOMPILE) -fPIC -c $< -o $@
 
 
-INCLUDES = $(LIBTAGCOLL1_CFLAGS)
+INCLUDES = $(LIBTAGCOLL1_CFLAGS) -DSTATEDIR='"$(databasedir)"'

Modified: branches/bigmerge/debtags/doc/Makefile.am
==============================================================================
--- branches/bigmerge/debtags/doc/Makefile.am	(original)
+++ branches/bigmerge/debtags/doc/Makefile.am	Fri Aug  5 16:02:32 2005
@@ -1,6 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_DATA = html/index.html libdebtags.doxytags
+noinst_DATA = html/index.html libdebtags.doxytags paper-debtags.html paper-debtags.pdf
+
+IMAGES=debtags-edit.png packagesearch.png ranganathan.png
 
 if DO_DOCS
 libtagcoll.doxytags: /usr/share/doc/libtagcoll1-dev/libtagcoll.doxytags.gz
@@ -11,6 +13,24 @@
 
 html/index.html: libdebtags.dox ../debtags/libdebtags1.a libtagcoll.doxytags
 	doxygen $<
+
+paper-debtags.html: paper-debtags.rst
+	rst2html --no-doc-title --stylesheet=main.css $< > $@
+
+paper-debtags.tex: paper-debtags.rst
+	rst2latex $< | sed 's/\.png/\.eps/' > $@
+
+paper-debtags.dvi: paper-debtags.tex $(IMAGES:.png=.eps)
+	latex $<
+
+paper-debtags.pdf: paper-debtags.dvi
+	dvipdf $< $@
+
+%.eps: %.png
+	convert $< $@
+
+web: paper-debtags.rst paper-debtags.html paper-debtags.pdf $(IMAGES)
+	scp $^ "alioth.debian.org:/org/alioth.debian.org/chroot/home/groups/debtags/htdocs/"
 else
 libtagcoll.doxytags: libdebtags.dox
 	touch $@
@@ -21,11 +41,17 @@
 html/index.html: libdebtags.dox ../debtags/libdebtags1.a libtagcoll.doxytags
 	mkdir html || true
 	touch $@
+
+paper-debtags.html: paper-debtags.rst
+	touch $@
+
+paper-debtags.pdf: paper-debtags.dvi
+	touch $@
 endif
 
 EXTRA_DIST = libdebtags.dox
 
-CLEANFILES = libdebtags.doxytags libtagcoll.doxytags
+CLEANFILES = libdebtags.doxytags libtagcoll.doxytags paper-debtags.tex paper-debtags.dvi paper-debtags.pdf paper-debtags.html
 
 clean-local:
 	rm -rf html

Modified: branches/bigmerge/debtags/tools/Makefile.am
==============================================================================
--- branches/bigmerge/debtags/src/Makefile.am	(original)
+++ branches/bigmerge/debtags/tools/Makefile.am	Fri Aug  5 16:02:32 2005
@@ -10,6 +10,6 @@
 	acqprogress.cc \
 	instantiations.cc \
 	debtags.cc
-debtags_LDADD = $(LIBDEBTAGS1_LIBS) $(LIBTAGCOLL1_LIBS)
+debtags_LDADD = ../debtags/libdebtags1.a $(LIBTAGCOLL1_LIBS) -lapt-pkg
 
-INCLUDES = $(LIBDEBTAGS1_CFLAGS) $(LIBTAGCOLL1_CFLAGS)
+INCLUDES = -I.. $(LIBTAGCOLL1_CFLAGS)

