[Guile-commits] GNU Guile branch, master, updated. release_1-9-1-74-g7577d1c

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=7577d1c4bac443a6cf220cbdbf0d637b6d388431

The branch, master has been updated
       via  7577d1c4bac443a6cf220cbdbf0d637b6d388431 (commit)
       via  c1a15f3dd7788e391db2f6eea9562a3fd9f7a7e9 (commit)
      from  e3c9c676ae8b45ab98296532ac9756566dc46631 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7577d1c4bac443a6cf220cbdbf0d637b6d388431
Author: Ludovic Courtès <address@hidden>
Date:   Sat Aug 15 12:06:28 2009 +0200

    Update `.gitignore' for GNU Global.

commit c1a15f3dd7788e391db2f6eea9562a3fd9f7a7e9
Author: Ludovic Courtès <address@hidden>
Date:   Sat Aug 15 12:05:36 2009 +0200

    Switch from `guile-1.8.pc' to `guile-2.0.pc'.
    
    * configure.ac: Produce guile-2.0*.pc.
    
    * meta/Makefile.am (EXTRA_DIST): Rename guile-1.8*.pc.in to
      guile-2.0*.pc.in.
      (pkgconfig_DATA): Update accordingly.
    
    * meta/guile-config (guile-module): Likewise.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                                         |    7 ++++++-
 configure.ac                                       |    4 ++--
 meta/Makefile.am                                   |    6 +++---
 ...installed.pc.in => guile-2.0-uninstalled.pc.in} |    0
 meta/{guile-1.8.pc.in => guile-2.0.pc.in}          |    0
 meta/guile-config                                  |    4 ++--
 6 files changed, 13 insertions(+), 8 deletions(-)
 rename meta/{guile-1.8-uninstalled.pc.in => guile-2.0-uninstalled.pc.in} (100%)
 rename meta/{guile-1.8.pc.in => guile-2.0.pc.in} (100%)

diff --git a/.gitignore b/.gitignore
index 29f29be..004c7f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,7 +69,8 @@ guile-readline/guile-readline-config.h
 guile-readline/guile-readline-config.h.in
 *.go
 TAGS
-guile-1.8.pc
+/meta/guile-2.0.pc
+/meta/guile-2.0-uninstalled.pc
 gdb-pre-inst-guile
 cscope.out
 cscope.files
@@ -108,3 +109,7 @@ INSTALL
 /lib/time.h
 /lib/unistd.h
 /lib/unistr/.dirstamp
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
diff --git a/configure.ac b/configure.ac
index 7f6df87..ddc092e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1539,8 +1539,8 @@ AC_CONFIG_FILES([
   testsuite/Makefile
 ])
 
-AC_CONFIG_FILES([meta/guile-1.8.pc])
-AC_CONFIG_FILES([meta/guile-1.8-uninstalled.pc])
+AC_CONFIG_FILES([meta/guile-2.0.pc])
+AC_CONFIG_FILES([meta/guile-2.0-uninstalled.pc])
 AC_CONFIG_FILES([check-guile], [chmod +x check-guile])
 AC_CONFIG_FILES([benchmark-guile], [chmod +x benchmark-guile])
 AC_CONFIG_FILES([meta/guile], [chmod +x meta/guile])
diff --git a/meta/Makefile.am b/meta/Makefile.am
index e047038..ba79794 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with Automake to create Makefile.in
 ## Jim Blandy <address@hidden> --- September 1997
 ##
-##     Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008 Free Software 
Foundation, Inc.
+##     Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009 Free Software 
Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##   
@@ -23,10 +23,10 @@
 bin_SCRIPTS=guile-config guile-tools
 EXTRA_DIST= $(bin_SCRIPTS) \
        guile.m4 ChangeLog-2008 \
-       guile-1.8.pc.in guile-1.8-uninstalled.pc.in
+       guile-2.0.pc.in guile-2.0-uninstalled.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = guile-1.8.pc
+pkgconfig_DATA = guile-2.0.pc
 
 ## FIXME: in the future there will be direct automake support for
 ## doing this.  When that happens, switch over.
diff --git a/meta/guile-1.8-uninstalled.pc.in b/meta/guile-2.0-uninstalled.pc.in
similarity index 100%
rename from meta/guile-1.8-uninstalled.pc.in
rename to meta/guile-2.0-uninstalled.pc.in
diff --git a/meta/guile-1.8.pc.in b/meta/guile-2.0.pc.in
similarity index 100%
rename from meta/guile-1.8.pc.in
rename to meta/guile-2.0.pc.in
diff --git a/meta/guile-config b/meta/guile-config
index 7304ae2..6c640c4 100755
--- a/meta/guile-config
+++ b/meta/guile-config
@@ -4,7 +4,7 @@ exec guile -e main -s $0 "$@"
 ;;;; guile-config --- utility for linking programs with Guile
 ;;;; Jim Blandy <address@hidden> --- September 1997
 ;;;; 
-;;;;   Copyright (C) 1998, 2001, 2004, 2005, 2006, 2008 Free Software 
Foundation, Inc.
+;;;;   Copyright (C) 1998, 2001, 2004, 2005, 2006, 2008, 2009 Free Software 
Foundation, Inc.
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -71,7 +71,7 @@ exec guile -e main -s $0 "$@"
     (dle "  " p " --help      - show usage info (this message)")
     (dle "  " p " --help SUBCOMMAND - show help for SUBCOMMAND")))
 
-(define guile-module "guile-1.8")
+(define guile-module "guile-2.0")
 
 (define (pkg-config . args)
   (let* ((real-args (cons "pkg-config" args))


hooks/post-receive
-- 
GNU Guile