[Debtags-commits] [svn] r1076 - in branches/bigmerge/debtags: . debian libdebtags1 libdebtags1/debian

[Benjamin Mesing]

Author: bmesing-guest
Date: Thu Aug  4 13:13:00 2005
New Revision: 1076

Added:
   branches/bigmerge/debtags/COPYING.libdegbtags
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/COPYING
   branches/bigmerge/debtags/DONE.libdebtags
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/DONE
   branches/bigmerge/debtags/README.libdebtags
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/README
   branches/bigmerge/debtags/debian/libdebtags0.dirs
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/debian/libdebtags0.dirs
   branches/bigmerge/debtags/debian/libdebtags0.install
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/debian/libdebtags0.install
   branches/bigmerge/debtags/debian/libdebtags0.shlibs
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/debian/libdebtags0.shlibs
   branches/bigmerge/debtags/debian/libdebtags1-dev.dirs
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/debian/libdebtags1-dev.dirs
   branches/bigmerge/debtags/debian/libdebtags1-dev.docs
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/debian/libdebtags1-dev.docs
   branches/bigmerge/debtags/debian/libdebtags1-dev.install
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/debian/libdebtags1-dev.install
   branches/bigmerge/debtags/debian/libdebtags1-pic.install
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/debian/libdebtags1-pic.install
   branches/bigmerge/debtags/debian/libdebtags1.control
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/debian/compat
   branches/bigmerge/debtags/debian/libdebtags1.copyright
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/debian/copyright
   branches/bigmerge/debtags/debian/libdebtags1.dirs
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/debian/dirs
   branches/bigmerge/debtags/debian/libdebtags1.docs
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/debian/docs
   branches/bigmerge/debtags/debian/python-debtags.install
      - copied unchanged from r1054, branches/bigmerge/debtags/libdebtags1/debian/python-debtags.install
Removed:
   branches/bigmerge/debtags/libdebtags1/COPYING
   branches/bigmerge/debtags/libdebtags1/DONE
   branches/bigmerge/debtags/libdebtags1/README
   branches/bigmerge/debtags/libdebtags1/debian/compat
   branches/bigmerge/debtags/libdebtags1/debian/copyright
   branches/bigmerge/debtags/libdebtags1/debian/dirs
   branches/bigmerge/debtags/libdebtags1/debian/docs
   branches/bigmerge/debtags/libdebtags1/debian/libdebtags0.dirs
   branches/bigmerge/debtags/libdebtags1/debian/libdebtags0.install
   branches/bigmerge/debtags/libdebtags1/debian/libdebtags0.shlibs
   branches/bigmerge/debtags/libdebtags1/debian/libdebtags1-dev.dirs
   branches/bigmerge/debtags/libdebtags1/debian/libdebtags1-dev.docs
   branches/bigmerge/debtags/libdebtags1/debian/libdebtags1-dev.install
   branches/bigmerge/debtags/libdebtags1/debian/libdebtags1-pic.install
   branches/bigmerge/debtags/libdebtags1/debian/python-debtags.install
Modified:
   branches/bigmerge/debtags/Makefile.am
   branches/bigmerge/debtags/TODO-bigmerge
Log:
[Bigmerge]
Moved a number of files libdebtags1/debian/<packagename>* to /debian/<packagename>*
Renamed and moved a number of files from libdebtags/debian to /debian/libdebtags1*
Moved libdebtags/{DONE,COPYING,README} to /{DONE,COPYING,README}.libdebtags
Appended libdebtags/Makefile.am to /Makefile.am
Merged libdebtags/control and /control

Modified: branches/bigmerge/debtags/Makefile.am
==============================================================================
--- branches/bigmerge/debtags/Makefile.am	(original)
+++ branches/bigmerge/debtags/Makefile.am	Thu Aug  4 13:13:00 2005
@@ -15,3 +15,16 @@
 
 EXTRA_DIST = vocabulary tags-current.gz bash-completion
 #debtags-bashcompletion
+
+# Makefile.am from libdebtags
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = . debtags tests swig doc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA=libdebtags1.pc
+
+m4dir = $(datadir)/aclocal
+m4_DATA = libdebtags1.m4
+
+EXTRA_DIST = libdebtags1.m4 libdebtags1.pc.in

Modified: branches/bigmerge/debtags/TODO-bigmerge
==============================================================================
--- branches/bigmerge/debtags/TODO-bigmerge	(original)
+++ branches/bigmerge/debtags/TODO-bigmerge	Thu Aug  4 13:13:00 2005
@@ -1,3 +1,6 @@
 - weave the changlog chronologically
 - check doc/Makefile.am
-- evaluate AUTHORS
\ No newline at end of file
+- evaluate AUTHORS
+- merge /Makefile.am (libdebtags/Makefile.am was appended)
+- libdebtags/README move to /README.libdebtags (adapt the build rules)
+- check the merged control file especially build dependencies
\ No newline at end of file