diff options
-rw-r--r-- | .gitignore (renamed from .cvsignore) | 7 | ||||
-rw-r--r-- | ChangeLog-CVS-old (renamed from ChangeLog) | 1 | ||||
-rw-r--r-- | Makefile.am | 28 | ||||
-rw-r--r-- | README-alpha | 15 | ||||
-rw-r--r-- | README-hacking | 7 | ||||
-rw-r--r-- | am/.gitignore (renamed from m4/.cvsignore) | 0 | ||||
-rw-r--r-- | am/anubis.m4 (renamed from m4/anubis.m4) | 0 | ||||
-rw-r--r-- | am/gpgme.m4 (renamed from m4/gpgme.m4) | 0 | ||||
-rw-r--r-- | am/gsasl.m4 (renamed from m4/gsasl.m4) | 0 | ||||
-rw-r--r-- | am/guile.m4 (renamed from m4/guile.m4) | 0 | ||||
-rw-r--r-- | am/libgnutls.m4 (renamed from m4/libgnutls.m4) | 0 | ||||
-rw-r--r-- | bootstrap.conf | 1 | ||||
-rw-r--r-- | build/.gitignore (renamed from build/.cvsignore) | 1 | ||||
-rwxr-xr-x | build/bootstrap | 50 | ||||
-rw-r--r-- | build/guile-1.6/.gitignore (renamed from build/guile-1.6/.cvsignore) | 0 | ||||
-rw-r--r-- | contrib/.gitignore (renamed from contrib/.cvsignore) | 0 | ||||
-rw-r--r-- | doc/.gitignore (renamed from doc/.cvsignore) | 0 | ||||
-rw-r--r-- | elisp/.gitignore (renamed from elisp/.cvsignore) | 0 | ||||
-rw-r--r-- | examples/.gitignore (renamed from examples/.cvsignore) | 0 | ||||
-rw-r--r-- | examples/pam/.gitignore (renamed from examples/pam/.cvsignore) | 0 | ||||
-rw-r--r-- | guile/.gitignore (renamed from guile/.cvsignore) | 0 | ||||
-rw-r--r-- | lib/.gitignore (renamed from lib/.cvsignore) | 0 | ||||
-rw-r--r-- | po/.gitignore (renamed from po/.cvsignore) | 2 | ||||
-rw-r--r-- | scripts/.gitignore (renamed from scripts/.cvsignore) | 0 | ||||
-rw-r--r-- | src/.gitignore (renamed from src/.cvsignore) | 0 | ||||
-rw-r--r-- | testsuite/.gitignore (renamed from testsuite/.cvsignore) | 0 | ||||
-rw-r--r-- | testsuite/data/.gitignore (renamed from testsuite/data/.cvsignore) | 0 | ||||
-rw-r--r-- | testsuite/etc/.gitignore (renamed from testsuite/etc/.cvsignore) | 0 |
28 files changed, 60 insertions, 52 deletions
@@ -1,5 +1,11 @@ +*.a +*.o +*~ +.deps +.emacs* ABOUT-NLS COPYING +ChangeLog INSTALL Makefile Makefile.in @@ -11,4 +17,5 @@ config.log config.status configure intl +m4 stamp-h1 diff --git a/ChangeLog b/ChangeLog-CVS-old index b502b9a..c8a965a 100644 --- a/ChangeLog +++ b/ChangeLog-CVS-old @@ -2866,4 +2866,5 @@ Local Variables: mode: change-log version-control: never +buffer-read-only: t End: diff --git a/Makefile.am b/Makefile.am index 9997749..2a73941 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ ## Makefile.am ## ## This file is part of GNU Anubis. -## Copyright (C) 2001, 2002, 2003, 2004, 2007 The Anubis Team. +## Copyright (C) 2001, 2002, 2003, 2004, 2007, 2008 The Anubis Team. ## ## GNU Anubis is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the @@ -18,10 +18,32 @@ ## with GNU Anubis. If not, see <http://www.gnu.org/licenses/>. ## -AUTOMAKE_OPTIONS = 1.8.3 gnits -ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS = 1.8.5 gnits +ACLOCAL_AMFLAGS = -I m4 -I am SUBDIRS = build lib src po doc scripts examples guile contrib \ elisp testsuite +.PHONY: make-ChangeLog +make-ChangeLog: + if test -d .git; then \ + perl $(top_srcdir)/build/gitlog-to-changelog --since=2008-12-16 | \ + sed '/<unknown>$$/d' | fmt -s >> $(distdir)/cl-t; \ + echo >> $(distdir)/cl-t; \ + cat ChangeLog-CVS-old > $(distdir)/cl-t; \ + rm -f $(distdir)/ChangeLog; \ + mv $(distdir)/cl-t $(distdir)/ChangeLog; \ + fi + +dist-hook: make-ChangeLog + +.PHONY: ChangeLog +ChangeLog: + if test -d .git && test -f ChangeLog-CVS-old; then \ + perl $(top_srcdir)/build/gitlog-to-changelog --since=2008-12-16 | \ + sed '/<unknown>$$/d' | fmt -s > ChangeLog; \ + echo >> ChangeLog; \ + cat ChangeLog-CVS-old >> ChangeLog; \ + fi + ## EOF diff --git a/README-alpha b/README-alpha index dd528c7..4167c24 100644 --- a/README-alpha +++ b/README-alpha @@ -4,8 +4,8 @@ or alpha version of the package. See end of file for copying conditions. * Introduction -This is a *pre-release* version, and not ready for production -use yet. Please send comments and problem reports to <bug-anubis@gnu.org>. +This is a *pre-release* version, and not ready for production use +yet. Please send comments and problem reports to <bug-anubis@gnu.org>. * Building @@ -24,22 +24,22 @@ This usually must be done with root privileges. * Checking Out the Sources The following instructions apply if you wish to obtain sources from -the CVS repository. +the Git repository. -To checkout the source tree from CVS issue the following command: +To checkout the source tree from Git issue the following command: - cvs -d :pserver:anoncvs@cvs.savannah.gnu.org:/cvsroot/anubis co anubis + git clone git://git.savannah.gnu.org/anubis.git This will give you read-only access. If you think you need write access, contact the mailing list. Read the file README-hacking for the instructions on bootstrapping the -CVS version. +Git version. * Copyright information - Copyright (C) 2001, 2002, 2003, 2004, 2007 The Anubis Team. + Copyright (C) 2001, 2002, 2003, 2004, 2007, 2008 The Anubis Team. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the @@ -58,4 +58,3 @@ paragraph-separate: "[ ]*$" version-control: never End: - diff --git a/README-hacking b/README-hacking index 7f4710e..fd22328 100644 --- a/README-hacking +++ b/README-hacking @@ -1,9 +1,9 @@ -These notes intend to help people working on the CVS version of +These notes intend to help people working on the Git version of this package. * Requirements -You need the following packages to build the CVS version of GNU +You need the following packages to build the Git version of GNU Anubis. We do not make any efforts to accommodate older versions of these packages, so please make sure that you have the latest stable version. @@ -20,7 +20,7 @@ version. * Bootstrapping Obviously, if you are reading these notes, you did manage to check out -Anubis from CVS. The next step is to get other files needed to build, +Anubis from Git. The next step is to get other files needed to build, which are extracted from other source packages: 1. Change to the source tree directory @@ -72,4 +72,3 @@ paragraph-separate: "[ ^L]*$" version-control: never End: - diff --git a/m4/.cvsignore b/am/.gitignore index 7050797..7050797 100644 --- a/m4/.cvsignore +++ b/am/.gitignore diff --git a/m4/anubis.m4 b/am/anubis.m4 index f2dfc5e..f2dfc5e 100644 --- a/m4/anubis.m4 +++ b/am/anubis.m4 diff --git a/m4/gpgme.m4 b/am/gpgme.m4 index 351b8e8..351b8e8 100644 --- a/m4/gpgme.m4 +++ b/am/gpgme.m4 diff --git a/m4/gsasl.m4 b/am/gsasl.m4 index 89983c9..89983c9 100644 --- a/m4/gsasl.m4 +++ b/am/gsasl.m4 diff --git a/m4/guile.m4 b/am/guile.m4 index 7109c42..7109c42 100644 --- a/m4/guile.m4 +++ b/am/guile.m4 diff --git a/m4/libgnutls.m4 b/am/libgnutls.m4 index 0fdbd5a..0fdbd5a 100644 --- a/m4/libgnutls.m4 +++ b/am/libgnutls.m4 diff --git a/bootstrap.conf b/bootstrap.conf index b113971..ea99812 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -7,6 +7,7 @@ gnulib_name=libanubis gnulib_modules="\ gettext\ getline\ + gitlog-to-changelog\ obstack\ getopt\ getpass\ diff --git a/build/.cvsignore b/build/.gitignore index 5aa1ba6..27a67ad 100644 --- a/build/.cvsignore +++ b/build/.gitignore @@ -5,6 +5,7 @@ config.rpath config.sub depcomp elisp-comp +gitlog-to-changelog install-sh link-warning.h mdate-sh diff --git a/build/bootstrap b/build/bootstrap index 9a85762..bc9373c 100755 --- a/build/bootstrap +++ b/build/bootstrap @@ -2,7 +2,7 @@ # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2008 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -96,11 +96,6 @@ package=`sed -n "$extract_package_name" configure.ac` || exit gnulib_name=lib$package build_aux=build-aux -source_base=lib -m4_base=m4 -doc_base=doc -tests_base=tests - # Extra files from gnulib, which override files from other sources. gnulib_extra_files=" $build_aux/install-sh @@ -126,9 +121,6 @@ XGETTEXT_OPTIONS='\\\ --flag=error:3:c-format --flag=error_at_line:5:c-format\\\ ' -# Package bug report address for gettext files -MSGID_BUGS_ADDRESS=bug-$package@gnu.org - # Files we don't want to import. excluded_files= @@ -278,7 +270,6 @@ update_po_files() { new_po="$ref_po_dir/$po.po" cksum_file="$ref_po_dir/$po.s1" if ! test -f "$cksum_file" || - ! test -f "$po_dir/$po.po" || ! sha1sum -c --status "$cksum_file" < "$new_po" > /dev/null; then echo "updated $po_dir/$po.po..." cp "$new_po" "$po_dir/$po.po" && sha1sum < "$new_po" > "$cksum_file" @@ -376,11 +367,11 @@ cp_mark_as_generated() *) c1= ; c2= ;; esac - # If the destination directory doesn't exist, create it. - # This is required at least for "lib/uniwidth/cjk.h". dst_dir=`dirname "$cp_dst"` - test -d "$dst_dir" || mkdir -p "$dst_dir" - + if ! test -d "$dst_dir"; then + mkdir -p "$dst_dir" + fi + if test -z "$c1"; then cmp -s "$cp_src" "$cp_dst" || { echo "$0: cp -f $cp_src $cp_dst" && @@ -414,9 +405,7 @@ version_controlled_file() { grep -F "/$file/" $dir/CVS/Entries 2>/dev/null | grep '^/[^/]*/[0-9]' > /dev/null && found=yes elif test -d .git; then - git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes - elif test -d .svn; then - svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes + git-rm -n "$dir/$file" > /dev/null 2>&1 && found=yes else echo "$0: no version control for $dir/$file?" >&2 fi @@ -498,13 +487,13 @@ gnulib_tool_options="\ --import\ --no-changelog\ --aux-dir $bt/$build_aux\ - --doc-base $bt/$doc_base\ + --doc-base $bt/doc\ --lib $gnulib_name\ - --m4-base $bt/$m4_base/\ - --source-base $bt/$source_base/\ - --tests-base $bt/$tests_base\ + --m4-base $bt/m4/\ + --source-base $bt/lib/\ + --tests-base $bt/tests\ --local-dir $local_gl_dir\ - $gnulib_tool_option_extras\ +$gnulib_tool_option_extras\ " echo "$0: $gnulib_tool $gnulib_tool_options --import ..." $gnulib_tool $gnulib_tool_options --import $gnulib_modules && @@ -548,23 +537,12 @@ if test -f $mam_template; then done fi -# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some -# gnulib-populated directories. Such .m4 files would cause aclocal to fail. -# The following requires GNU find 4.2.3 or newer. Considering the usual -# portability constraints of this script, that may seem a very demanding -# requirement, but it should be ok. Ignore any failure, which is fine, -# since this is only a convenience to help developers avoid the relatively -# unusual case in which a symlinked-to .m4 file is git-removed from gnulib -# between successive runs of this script. -find "$m4_base" "$source_base" \ - -depth \( -name '*.m4' -o -name '*.[ch]' \) \ - -type l -xtype l -delete > /dev/null 2>&1 - # Reconfigure, getting other files. +aclocal_flags=`sed -n 's/ACLOCAL_AMFLAGS *=//p' Makefile.am` for command in \ libtool \ - 'aclocal --force -I m4' \ + "aclocal --force $aclocal_flags" \ 'autoconf --force' \ 'autoheader --force' \ 'automake --add-missing --copy --force-missing'; @@ -595,7 +573,7 @@ if test $with_gettext = yes; then rm -f po/Makevars sed ' /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/ - /^MSGID_BUGS_ADDRESS *=/s/=.*/= '"$MSGID_BUGS_ADDRESS"'/ + /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ /^XGETTEXT_OPTIONS *=/{ s/$/ \\/ a\ diff --git a/build/guile-1.6/.cvsignore b/build/guile-1.6/.gitignore index 282522d..282522d 100644 --- a/build/guile-1.6/.cvsignore +++ b/build/guile-1.6/.gitignore diff --git a/contrib/.cvsignore b/contrib/.gitignore index 282522d..282522d 100644 --- a/contrib/.cvsignore +++ b/contrib/.gitignore diff --git a/doc/.cvsignore b/doc/.gitignore index 3c5d1b5..3c5d1b5 100644 --- a/doc/.cvsignore +++ b/doc/.gitignore diff --git a/elisp/.cvsignore b/elisp/.gitignore index fb858fb..fb858fb 100644 --- a/elisp/.cvsignore +++ b/elisp/.gitignore diff --git a/examples/.cvsignore b/examples/.gitignore index 282522d..282522d 100644 --- a/examples/.cvsignore +++ b/examples/.gitignore diff --git a/examples/pam/.cvsignore b/examples/pam/.gitignore index 282522d..282522d 100644 --- a/examples/pam/.cvsignore +++ b/examples/pam/.gitignore diff --git a/guile/.cvsignore b/guile/.gitignore index 282522d..282522d 100644 --- a/guile/.cvsignore +++ b/guile/.gitignore diff --git a/lib/.cvsignore b/lib/.gitignore index 628abc5..628abc5 100644 --- a/lib/.cvsignore +++ b/lib/.gitignore diff --git a/po/.cvsignore b/po/.gitignore index 99948d7..7ed1111 100644 --- a/po/.cvsignore +++ b/po/.gitignore @@ -2,12 +2,12 @@ *.mo *.po .reference +LINGUAS Makefile Makefile.in Makefile.in.in Makevars Makevars.template -LINGUAS POTFILES Rules-quot anubis.pot diff --git a/scripts/.cvsignore b/scripts/.gitignore index 282522d..282522d 100644 --- a/scripts/.cvsignore +++ b/scripts/.gitignore diff --git a/src/.cvsignore b/src/.gitignore index 72982e8..72982e8 100644 --- a/src/.cvsignore +++ b/src/.gitignore diff --git a/testsuite/.cvsignore b/testsuite/.gitignore index 17766c7..17766c7 100644 --- a/testsuite/.cvsignore +++ b/testsuite/.gitignore diff --git a/testsuite/data/.cvsignore b/testsuite/data/.gitignore index c6f00ca..c6f00ca 100644 --- a/testsuite/data/.cvsignore +++ b/testsuite/data/.gitignore diff --git a/testsuite/etc/.cvsignore b/testsuite/etc/.gitignore index d5c0614..d5c0614 100644 --- a/testsuite/etc/.cvsignore +++ b/testsuite/etc/.gitignore |