Hello community, here is the log from the commit of package guile-json for openSUSE:Factory checked in at 2018-08-31 10:43:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guile-json (Old) and /work/SRC/openSUSE:Factory/.guile-json.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guile-json" Fri Aug 31 10:43:39 2018 rev:7 rq:631507 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/guile-json/guile-json.changes 2018-05-29 16:52:35.555117028 +0200 +++ /work/SRC/openSUSE:Factory/.guile-json.new/guile-json.changes 2018-08-31 10:44:15.235188864 +0200 @@ -1,0 +2,11 @@ +Fri Aug 24 12:07:57 UTC 2018 - [email protected] + +- bump to 1.2.0 + changes since 1.0.1 + - License only GPLv3+ + - install .go file to %(libdir)/guile +- add guile as runtime dependency to avoid "compiling" when using + (json) for the first time +- needs guile-devel to avoid build failure + +------------------------------------------------------------------- Old: ---- guile-json-1.0.1.tar.gz guile-json-1.0.1.tar.gz.sig New: ---- guile-json-1.2.0.tar.gz guile-json-1.2.0.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guile-json.spec ++++++ --- /var/tmp/diff_new_pack.yaVdDn/_old 2018-08-31 10:44:15.747189476 +0200 +++ /var/tmp/diff_new_pack.yaVdDn/_new 2018-08-31 10:44:15.747189476 +0200 @@ -17,17 +17,18 @@ Name: guile-json -Version: 1.0.1 +Version: 1.2.0 Release: 0 Summary: JSON module for Guile -License: LGPL-3.0-or-later AND GPL-3.0-or-later +License: GPL-3.0-or-later Group: Development/Libraries/Other Url: https://savannah.nongnu.org/projects/guile-json/ Source0: http://download.savannah.gnu.org/releases/guile-json/%{name}-%{version}.tar.gz Source1: http://download.savannah.gnu.org/releases/guile-json/%{name}-%{version}.tar.gz.sig Source2: https://savannah.nongnu.org/people/viewgpg.php?user_id=11331#/%{name}.keyring Source1000: guile-json-rpmlintrc -BuildRequires: guile >= 2.0.0 +BuildRequires: guile-devel >= 2.0.0 +Requires: guile >= 2.0.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -52,8 +53,9 @@ %files %defattr(-,root,root,-) -%license COPYING.LESSER +%license COPYING %doc AUTHORS NEWS README -%{_datadir}/guile/site/json* +%{_datadir}/guile* +%{_libdir}/guile* %changelog ++++++ guile-json-1.0.1.tar.gz -> guile-json-1.2.0.tar.gz ++++++ ++++ 2487 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/guile-json-1.0.1/AUTHORS new/guile-json-1.2.0/AUTHORS --- old/guile-json-1.0.1/AUTHORS 2018-05-23 19:45:25.000000000 +0200 +++ new/guile-json-1.2.0/AUTHORS 2018-08-14 08:28:16.000000000 +0200 @@ -3,6 +3,7 @@ List of contributors (in alphabetical order): +Ludovic Courtès <[email protected]> Christopher Lam <[email protected]> Jan Nieuwenhuizen <[email protected]> Ian Price <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/guile-json-1.0.1/COPYING.LESSER new/guile-json-1.2.0/COPYING.LESSER --- old/guile-json-1.0.1/COPYING.LESSER 2013-05-14 06:55:05.000000000 +0200 +++ new/guile-json-1.2.0/COPYING.LESSER 1970-01-01 01:00:00.000000000 +0100 @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/guile-json-1.0.1/ChangeLog new/guile-json-1.2.0/ChangeLog --- old/guile-json-1.0.1/ChangeLog 2018-05-24 20:22:44.000000000 +0200 +++ new/guile-json-1.2.0/ChangeLog 2018-08-23 06:19:39.000000000 +0200 @@ -1,3 +1,141 @@ +commit a2b6b3ac5fe1207609ed4593a73781bd7d903ee2 +Author: Aleix Conchillo Flaqué <[email protected]> +Date: Wed Aug 22 21:17:59 2018 -0700 + + bump version to 1.2.0 + + NEWS | 7 +++++++ + README.org | 2 +- + configure.ac | 2 +- + 3 files changed, 9 insertions(+), 2 deletions(-) + +commit 2699b2f64738d11e83f6454ebd6c3a3d8f18730e +Author: Aleix Conchillo Flaqué <[email protected]> +Date: Wed Aug 22 21:13:55 2018 -0700 + + switch to GPLv3 + + COPYING.LESSER | 165 -------------------------- + ChangeLog | 5 +- + Makefile.am | 22 ++-- + README.org | 17 ++- + build-aux/guile.m4 | 341 ----------------------------------------------------- + configure.ac | 22 ++-- + json.scm | 22 ++-- + json/Makefile.am | 22 ++-- + json/builder.scm | 22 ++-- + json/parser.scm | 22 ++-- + pkg-list.scm.in | 26 ++-- + 11 files changed, 82 insertions(+), 604 deletions(-) + delete mode 100644 COPYING.LESSER + delete mode 100644 build-aux/guile.m4 + +commit 7efbc39eaa2db43a4ed344c39e53f4d4e8adb971 +Author: Aleix Conchillo Flaqué <[email protected]> +Date: Tue Aug 14 01:18:38 2018 -0700 + + bump version to 1.1.1 + + NEWS | 4 ++++ + README.org | 2 +- + configure.ac | 2 +- + 3 files changed, 6 insertions(+), 2 deletions(-) + +commit dc897555936141dbaa8b30614f02f139c1d3e019 +Author: Aleix Conchillo Flaqué <[email protected]> +Date: Tue Aug 14 01:12:52 2018 -0700 + + builder: don't output extra space unless pretty printing + + json/builder.scm | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +commit c543d3f63581f686f8de86848c6e4852b364aca9 +Author: Aleix Conchillo Flaqué <[email protected]> +Date: Thu Jul 26 08:58:51 2018 -0700 + + re-add extraneous sed '' in dist-hook (os x needs it) + + Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 35a924df347bd719d2eb3f7842c5e8b0719d08a3 +Author: Aleix Conchillo Flaqué <[email protected]> +Date: Thu Jul 26 08:54:34 2018 -0700 + + bump version to 1.1.0 + + AUTHORS | 1 + + NEWS | 6 ++++++ + README.org | 2 +- + configure.ac | 2 +- + 4 files changed, 9 insertions(+), 2 deletions(-) + +commit e3b2367f1829068f272cc9540b18e21039054f05 +Merge: 5fea4a2 ae0a4c6 +Author: Aleix Conchillo Flaqué <[email protected]> +Date: Thu Jul 26 08:37:05 2018 -0700 + + Merge pull request #17 from civodul/wip-module-installation + + Install .go files to $(libdir)/guile + +commit ae0a4c67d02f04dbb3e3d2702e8322474d83463b +Author: Ludovic Courtès <[email protected]> +Date: Thu Jun 28 14:52:52 2018 +0200 + + build: Remove extraneous 'sed' argument in 'dist-hook'. + + * Makefile.am (dist-hook): Remove ''. + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f7c1c5ac7f244d3a2d98967e374e34806bdd5633 +Author: Ludovic Courtès <[email protected]> +Date: Thu Jun 28 14:47:25 2018 +0200 + + build: Install .go files to $(libdir)/guile. + + * Makefile.am (objdir): New variable. + (nobase_mod_DATA): Move $(GOBJECTS) to... + (nobase_nodist_obj_DATA): ... here. New variable. + * json/Makefile.am (objdir): New variable. + (nobase_mod_DATA): Move $(GOBJECTS) to... + (nobase_nodist_obj_DATA): ... here. New variable. + + Makefile.am | 6 ++++-- + json/Makefile.am | 5 ++++- + 2 files changed, 8 insertions(+), 3 deletions(-) + +commit d87c8eb4ca01c890dc43d6e9d7da7529ad203903 +Author: Ludovic Courtès <[email protected]> +Date: Thu Jun 28 14:24:40 2018 +0200 + + build: Append Guile's effective version to the module directory. + + * configure.ac: Use 'GUILE_PKG'. + * Makefile.am (moddir): Append @GUILE_EFFECTIVE_VERSION@. + * json/Makefile.am (moddir): Likewise. + + Makefile.am | 2 +- + configure.ac | 7 +++++++ + json/Makefile.am | 2 +- + 3 files changed, 9 insertions(+), 2 deletions(-) + +commit 895c94c144e28ae4037f49b2f308d9ce1385dff6 +Author: Ludovic Courtès <[email protected]> +Date: Thu Jun 28 14:23:22 2018 +0200 + + build: Define 'moddir' in terms of $(datadir). + + * Makefile.am (moddir): Define in terms of $(datadir). + * json/Makefile.am (moddir): Likewise. + + Makefile.am | 2 +- + json/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + commit 5fea4a2330444df81596188c0a9e5c51ca803eb1 Author: Aleix Conchillo Flaqué <[email protected]> Date: Thu May 24 11:20:52 2018 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/guile-json-1.0.1/Makefile.am new/guile-json-1.2.0/Makefile.am --- old/guile-json-1.0.1/Makefile.am 2018-05-23 19:39:01.000000000 +0200 +++ new/guile-json-1.2.0/Makefile.am 2018-08-23 06:08:22.000000000 +0200 @@ -5,22 +5,18 @@ # # This file is part of guile-json. # -# guile-json is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License and -# the GNU Lesser General Public License as published by the Free -# Software Foundation; either version 3 of the License, or (at your -# option) any later version. +# guile-json is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# guile-json is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License and the GNU Lesser General Public License -# for more details. +# guile-json is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# and the GNU Lesser General Public License along with guile-json; -# if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# along with guile-json. If not, see https://www.gnu.org/licenses/. # SUBDIRS = json @@ -32,15 +28,18 @@ dist-hook: $(SHELL) $(top_srcdir)/ChangeLog > $(top_distdir)/ChangeLog cp $(top_srcdir)/pkg-list.scm.in $(top_distdir)/pkg-list.scm + # '' is to make OS X happy sed -i '' "s/%VERSION%/$(PKG_LIST_VERSION)/g" $(top_distdir)/pkg-list.scm -moddir=$(prefix)/share/guile/site +moddir = $(datadir)/guile/site/@GUILE_EFFECTIVE_VERSION@ +objdir = $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache SOURCES = json.scm - GOBJECTS = $(SOURCES:%.scm=%.go) -nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES) $(GOBJECTS) +nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES) +nobase_nodist_obj_DATA = $(GOBJECTS) + EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES) CLEANFILES = $(GOBJECTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/guile-json-1.0.1/NEWS new/guile-json-1.2.0/NEWS --- old/guile-json-1.0.1/NEWS 2018-05-24 20:19:19.000000000 +0200 +++ new/guile-json-1.2.0/NEWS 2018-08-23 06:16:14.000000000 +0200 @@ -1,4 +1,21 @@ + +* Version 1.2.0 (Aug 22, 2018) + + - Switch to GPLv3. + + +* Version 1.1.1 (Aug 14, 2018) + + - Don't output extra spaces except with pretty printing. + + +* Version 1.1.0 (Jul 26, 2018) + + - Install .go files to $(libdir)/guile. + (thanks to Ludovic Courtès) + + * Version 1.0.1 (May 24, 2018) - Fixes an issue while handling alists with #nil at the beginning. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/guile-json-1.0.1/README new/guile-json-1.2.0/README --- old/guile-json-1.0.1/README 2018-05-24 20:19:58.000000000 +0200 +++ new/guile-json-1.2.0/README 2018-08-23 06:17:47.000000000 +0200 @@ -14,13 +14,9 @@ * Installation -guile-json is freely available for download under the terms of the GNU General -Public License version 3 (GPLv3) as well as the GNU Lesser General Public -License version 3 (LGPLv3). - Download the latest tarball and untar it: -- [[http://download.savannah.gnu.org/releases/guile-json/guile-json-1.0.1.tar.gz][guile-json-1.0.1.tar.gz]] +- [[http://download.savannah.gnu.org/releases/guile-json/guile-json-1.2.0.tar.gz][guile-json-1.2.0.tar.gz]] If you are cloning the repository make sure you run this first: @@ -159,3 +155,16 @@ : scheme@(guile-user)> (define values '(234 98.56)) : scheme@(guile-user)> (scm->json `(("values" ,@values))) : {"values" : [234, 98.56]} + + +* License + +guile-json is freely available for download under the terms of the GNU General +Public License version 3 (GPLv3). + +Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without any warranty. + +Copyright (C) 2013-2018 Aleix Conchillo Flaque <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/guile-json-1.0.1/build-aux/guile.m4 new/guile-json-1.2.0/build-aux/guile.m4 --- old/guile-json-1.0.1/build-aux/guile.m4 2014-08-18 11:40:58.000000000 +0200 +++ new/guile-json-1.2.0/build-aux/guile.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,341 +0,0 @@ -## Autoconf macros for working with Guile. -## -## Copyright (C) 1998,2001, 2006, 2010, 2012, 2013, 2014 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 License -## as published by the Free Software Foundation; either version 3 of -## the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library; if not, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301 USA - -# serial 10 - -## Index -## ----- -## -## GUILE_PKG -- find Guile development files -## GUILE_PROGS -- set paths to Guile interpreter, config and tool programs -## GUILE_FLAGS -- set flags for compiling and linking with Guile -## GUILE_SITE_DIR -- find path to Guile "site" directory -## GUILE_CHECK -- evaluate Guile Scheme code and capture the return value -## GUILE_MODULE_CHECK -- check feature of a Guile Scheme module -## GUILE_MODULE_AVAILABLE -- check availability of a Guile Scheme module -## GUILE_MODULE_REQUIRED -- fail if a Guile Scheme module is unavailable -## GUILE_MODULE_EXPORTS -- check if a module exports a variable -## GUILE_MODULE_REQUIRED_EXPORT -- fail if a module doesn't export a variable - -## Code -## ---- - -## NOTE: Comments preceding an AC_DEFUN (starting from "Usage:") are massaged -## into doc/ref/autoconf-macros.texi (see Makefile.am in that directory). - -# GUILE_PKG -- find Guile development files -# -# Usage: GUILE_PKG([VERSIONS]) -# -# This macro runs the @code{pkg-config} tool to find development files -# for an available version of Guile. -# -# By default, this macro will search for the latest stable version of -# Guile (e.g. 2.0), falling back to the previous stable version -# (e.g. 1.8) if it is available. If no guile-@var{VERSION}.pc file is -# found, an error is signalled. The found version is stored in -# @var{GUILE_EFFECTIVE_VERSION}. -# -# If @code{GUILE_PROGS} was already invoked, this macro ensures that the -# development files have the same effective version as the Guile -# program. -# -# @var{GUILE_EFFECTIVE_VERSION} is marked for substitution, as by -# @code{AC_SUBST}. -# -AC_DEFUN([GUILE_PKG], - [PKG_PROG_PKG_CONFIG - _guile_versions_to_search="m4_default([$1], [2.0 1.8])" - if test -n "$GUILE_EFFECTIVE_VERSION"; then - _guile_tmp="" - for v in $_guile_versions_to_search; do - if test "$v" = "$GUILE_EFFECTIVE_VERSION"; then - _guile_tmp=$v - fi - done - if test -z "$_guile_tmp"; then - AC_MSG_FAILURE([searching for guile development files for versions $_guile_versions_to_search, but previously found $GUILE version $GUILE_EFFECTIVE_VERSION]) - fi - _guile_versions_to_search=$GUILE_EFFECTIVE_VERSION - fi - GUILE_EFFECTIVE_VERSION="" - _guile_errors="" - for v in $_guile_versions_to_search; do - if test -z "$GUILE_EFFECTIVE_VERSION"; then - AC_MSG_NOTICE([checking for guile $v]) - PKG_CHECK_EXISTS([guile-$v], [GUILE_EFFECTIVE_VERSION=$v], []) - fi - done - - if test -z "$GUILE_EFFECTIVE_VERSION"; then - AC_MSG_ERROR([ -No Guile development packages were found. - -Please verify that you have Guile installed. If you installed Guile -from a binary distribution, please verify that you have also installed -the development packages. If you installed it yourself, you might need -to adjust your PKG_CONFIG_PATH; see the pkg-config man page for more. -]) - fi - AC_MSG_NOTICE([found guile $GUILE_EFFECTIVE_VERSION]) - AC_SUBST([GUILE_EFFECTIVE_VERSION]) - ]) - -# GUILE_FLAGS -- set flags for compiling and linking with Guile -# -# Usage: GUILE_FLAGS -# -# This macro runs the @code{pkg-config} tool to find out how to compile -# and link programs against Guile. It sets four variables: -# @var{GUILE_CFLAGS}, @var{GUILE_LDFLAGS}, @var{GUILE_LIBS}, and -# @var{GUILE_LTLIBS}. -# -# @var{GUILE_CFLAGS}: flags to pass to a C or C++ compiler to build code that -# uses Guile header files. This is almost always just one or more @code{-I} -# flags. -# -# @var{GUILE_LDFLAGS}: flags to pass to the compiler to link a program -# against Guile. This includes @code{-lguile-@var{VERSION}} for the -# Guile library itself, and may also include one or more @code{-L} flag -# to tell the compiler where to find the libraries. But it does not -# include flags that influence the program's runtime search path for -# libraries, and will therefore lead to a program that fails to start, -# unless all necessary libraries are installed in a standard location -# such as @file{/usr/lib}. -# -# @var{GUILE_LIBS} and @var{GUILE_LTLIBS}: flags to pass to the compiler or to -# libtool, respectively, to link a program against Guile. It includes flags -# that augment the program's runtime search path for libraries, so that shared -# libraries will be found at the location where they were during linking, even -# in non-standard locations. @var{GUILE_LIBS} is to be used when linking the -# program directly with the compiler, whereas @var{GUILE_LTLIBS} is to be used -# when linking the program is done through libtool. -# -# The variables are marked for substitution, as by @code{AC_SUBST}. -# -AC_DEFUN([GUILE_FLAGS], - [AC_REQUIRE([GUILE_PKG]) - PKG_CHECK_MODULES(GUILE, [guile-$GUILE_EFFECTIVE_VERSION]) - - dnl GUILE_CFLAGS and GUILE_LIBS are already defined and AC_SUBST'd by - dnl PKG_CHECK_MODULES. But GUILE_LIBS to pkg-config is GUILE_LDFLAGS - dnl to us. - - GUILE_LDFLAGS=$GUILE_LIBS - - dnl Determine the platform dependent parameters needed to use rpath. - dnl AC_LIB_LINKFLAGS_FROM_LIBS is defined in gnulib/m4/lib-link.m4 and needs - dnl the file gnulib/build-aux/config.rpath. - AC_LIB_LINKFLAGS_FROM_LIBS([GUILE_LIBS], [$GUILE_LDFLAGS], []) - GUILE_LIBS="$GUILE_LDFLAGS $GUILE_LIBS" - AC_LIB_LINKFLAGS_FROM_LIBS([GUILE_LTLIBS], [$GUILE_LDFLAGS], [yes]) - GUILE_LTLIBS="$GUILE_LDFLAGS $GUILE_LTLIBS" - - AC_SUBST([GUILE_EFFECTIVE_VERSION]) - AC_SUBST([GUILE_CFLAGS]) - AC_SUBST([GUILE_LDFLAGS]) - AC_SUBST([GUILE_LIBS]) - AC_SUBST([GUILE_LTLIBS]) - ]) - -# GUILE_SITE_DIR -- find path to Guile "site" directory -# -# Usage: GUILE_SITE_DIR -# -# This looks for Guile's "site" directory, usually something like -# PREFIX/share/guile/site, and sets var @var{GUILE_SITE} to the path. -# Note that the var name is different from the macro name. -# -# The variable is marked for substitution, as by @code{AC_SUBST}. -# -AC_DEFUN([GUILE_SITE_DIR], - [AC_REQUIRE([GUILE_PKG]) - AC_MSG_CHECKING(for Guile site directory) - GUILE_SITE=`$PKG_CONFIG --print-errors --variable=sitedir guile-$GUILE_EFFECTIVE_VERSION` - AC_MSG_RESULT($GUILE_SITE) - if test "$GUILE_SITE" = ""; then - AC_MSG_FAILURE(sitedir not found) - fi - AC_SUBST(GUILE_SITE) - ]) - -# GUILE_PROGS -- set paths to Guile interpreter, config and tool programs -# -# Usage: GUILE_PROGS([VERSION]) -# -# This macro looks for programs @code{guile} and @code{guild}, setting -# variables @var{GUILE} and @var{GUILD} to their paths, respectively. -# If @code{guile} is not found, signal an error. -# -# By default, this macro will search for the latest stable version of -# Guile (e.g. 2.0). x.y or x.y.z versions can be specified. If an older -# version is found, the macro will signal an error. -# -# The effective version of the found @code{guile} is set to -# @var{GUILE_EFFECTIVE_VERSION}. This macro ensures that the effective -# version is compatible with the result of a previous invocation of -# @code{GUILE_FLAGS}, if any. -# -# As a legacy interface, it also looks for @code{guile-config} and -# @code{guile-tools}, setting @var{GUILE_CONFIG} and @var{GUILE_TOOLS}. -# -# The variables are marked for substitution, as by @code{AC_SUBST}. -# -AC_DEFUN([GUILE_PROGS], - [AC_PATH_PROG(GUILE,guile) - _guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])" - if test -z "$_guile_required_version"; then - _guile_required_version=2.0 - fi - if test "$GUILE" = "" ; then - AC_MSG_ERROR([guile required but not found]) - fi - AC_SUBST(GUILE) - - _guile_effective_version=`$GUILE -c "(display (effective-version))"` - if test -z "$GUILE_EFFECTIVE_VERSION"; then - GUILE_EFFECTIVE_VERSION=$_guile_effective_version - elif test "$GUILE_EFFECTIVE_VERSION" != "$_guile_effective_version"; then - AC_MSG_ERROR([found development files for Guile $GUILE_EFFECTIVE_VERSION, but $GUILE has effective version $_guile_effective_version]) - fi - - _guile_major_version=`$GUILE -c "(display (major-version))"` - _guile_minor_version=`$GUILE -c "(display (minor-version))"` - _guile_micro_version=`$GUILE -c "(display (micro-version))"` - _guile_prog_version="$_guile_major_version.$_guile_minor_version.$_guile_micro_version" - - AC_MSG_CHECKING([for Guile version >= $_guile_required_version]) - _major_version=`echo $_guile_required_version | cut -d . -f 1` - _minor_version=`echo $_guile_required_version | cut -d . -f 2` - _micro_version=`echo $_guile_required_version | cut -d . -f 3` - if test "$_guile_major_version" -ge "$_major_version"; then - if test "$_guile_minor_version" -ge "$_minor_version"; then - if test -n "$_micro_version"; then - if test "$_guile_micro_version" -lt "$_micro_version"; then - AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found]) - fi - fi - elif test "$GUILE_EFFECTIVE_VERSION" == "$_major_version.$_minor_version" -a -z "$_micro_version"; then - # Allow prereleases that have the right effective version. - true - else - as_fn_error $? "Guile $_guile_required_version required, but $_guile_prog_version found" "$LINENO" 5 - fi - else - AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found]) - fi - AC_MSG_RESULT([$_guile_prog_version]) - - AC_PATH_PROG(GUILD,guild) - AC_SUBST(GUILD) - - AC_PATH_PROG(GUILE_CONFIG,guile-config) - AC_SUBST(GUILE_CONFIG) - if test -n "$GUILD"; then - GUILE_TOOLS=$GUILD - else - AC_PATH_PROG(GUILE_TOOLS,guile-tools) - fi - AC_SUBST(GUILE_TOOLS) - ]) - -# GUILE_CHECK -- evaluate Guile Scheme code and capture the return value -# -# Usage: GUILE_CHECK_RETVAL(var,check) -# -# @var{var} is a shell variable name to be set to the return value. -# @var{check} is a Guile Scheme expression, evaluated with "$GUILE -c", and -# returning either 0 or non-#f to indicate the check passed. -# Non-0 number or #f indicates failure. -# Avoid using the character "#" since that confuses autoconf. -# -AC_DEFUN([GUILE_CHECK], - [AC_REQUIRE([GUILE_PROGS]) - $GUILE -c "$2" > /dev/null 2>&1 - $1=$? - ]) - -# GUILE_MODULE_CHECK -- check feature of a Guile Scheme module -# -# Usage: GUILE_MODULE_CHECK(var,module,featuretest,description) -# -# @var{var} is a shell variable name to be set to "yes" or "no". -# @var{module} is a list of symbols, like: (ice-9 common-list). -# @var{featuretest} is an expression acceptable to GUILE_CHECK, q.v. -# @var{description} is a present-tense verb phrase (passed to AC_MSG_CHECKING). -# -AC_DEFUN([GUILE_MODULE_CHECK], - [AC_MSG_CHECKING([if $2 $4]) - GUILE_CHECK($1,(use-modules $2) (exit ((lambda () $3)))) - if test "$$1" = "0" ; then $1=yes ; else $1=no ; fi - AC_MSG_RESULT($$1) - ]) - -# GUILE_MODULE_AVAILABLE -- check availability of a Guile Scheme module -# -# Usage: GUILE_MODULE_AVAILABLE(var,module) -# -# @var{var} is a shell variable name to be set to "yes" or "no". -# @var{module} is a list of symbols, like: (ice-9 common-list). -# -AC_DEFUN([GUILE_MODULE_AVAILABLE], - [GUILE_MODULE_CHECK($1,$2,0,is available) - ]) - -# GUILE_MODULE_REQUIRED -- fail if a Guile Scheme module is unavailable -# -# Usage: GUILE_MODULE_REQUIRED(symlist) -# -# @var{symlist} is a list of symbols, WITHOUT surrounding parens, -# like: ice-9 common-list. -# -AC_DEFUN([GUILE_MODULE_REQUIRED], - [GUILE_MODULE_AVAILABLE(ac_guile_module_required, ($1)) - if test "$ac_guile_module_required" = "no" ; then - AC_MSG_ERROR([required guile module not found: ($1)]) - fi - ]) - -# GUILE_MODULE_EXPORTS -- check if a module exports a variable -# -# Usage: GUILE_MODULE_EXPORTS(var,module,modvar) -# -# @var{var} is a shell variable to be set to "yes" or "no". -# @var{module} is a list of symbols, like: (ice-9 common-list). -# @var{modvar} is the Guile Scheme variable to check. -# -AC_DEFUN([GUILE_MODULE_EXPORTS], - [GUILE_MODULE_CHECK($1,$2,$3,exports `$3') - ]) - -# GUILE_MODULE_REQUIRED_EXPORT -- fail if a module doesn't export a variable -# -# Usage: GUILE_MODULE_REQUIRED_EXPORT(module,modvar) -# -# @var{module} is a list of symbols, like: (ice-9 common-list). -# @var{modvar} is the Guile Scheme variable to check. -# -AC_DEFUN([GUILE_MODULE_REQUIRED_EXPORT], - [GUILE_MODULE_EXPORTS(guile_module_required_export,$1,$2) - if test "$guile_module_required_export" = "no" ; then - AC_MSG_ERROR([module $1 does not export $2; required]) - fi - ]) - -## guile.m4 ends here diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/guile-json-1.0.1/configure.ac new/guile-json-1.2.0/configure.ac --- old/guile-json-1.0.1/configure.ac 2018-05-24 20:19:31.000000000 +0200 +++ new/guile-json-1.2.0/configure.ac 2018-08-23 06:15:33.000000000 +0200 @@ -5,30 +5,33 @@ # # This file is part of guile-json. # -# guile-json is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License and -# the GNU Lesser General Public License as published by the Free -# Software Foundation; either version 3 of the License, or (at your -# option) any later version. +# guile-json is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# guile-json is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License and the GNU Lesser General Public License -# for more details. +# guile-json is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# and the GNU Lesser General Public License along with guile-json; -# if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# along with guile-json. If not, see https://www.gnu.org/licenses/. # -AC_INIT([guile-json], [1.0.1], [[email protected]]) +AC_INIT([guile-json], [1.2.0], [[email protected]]) AC_CONFIG_SRCDIR(json.scm) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([color-tests -Wall -Wno-portability]) AM_SILENT_RULES([yes]) +dnl We require pkg.m4 (from pkg-config) and guile.m4 (from Guile.) +dnl Make sure they are available. +m4_pattern_forbid([PKG_CHECK_MODULES]) +m4_pattern_forbid([^GUILE_PKG]) + +dnl Check for Guile 2.x, and substitute 'GUILE_EFFECTIVE_VERSION'. +GUILE_PKG([2.2 2.0]) GUILE_PROGS AC_CONFIG_FILES([Makefile json/Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/guile-json-1.0.1/json/Makefile.am new/guile-json-1.2.0/json/Makefile.am --- old/guile-json-1.0.1/json/Makefile.am 2018-05-23 19:49:42.000000000 +0200 +++ new/guile-json-1.2.0/json/Makefile.am 2018-08-23 06:08:40.000000000 +0200 @@ -5,31 +5,30 @@ # # This file is part of guile-json. # -# guile-json is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License and -# the GNU Lesser General Public License as published by the Free -# Software Foundation; either version 3 of the License, or (at your -# option) any later version. +# guile-json is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# guile-json is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License and the GNU Lesser General Public License -# for more details. +# guile-json is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# and the GNU Lesser General Public License along with guile-json; -# if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# along with guile-json. If not, see https://www.gnu.org/licenses/. # -moddir=$(prefix)/share/guile/site/json +moddir = $(datadir)/guile/site/@GUILE_EFFECTIVE_VERSION@/json +objdir = $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache/json SOURCES = builder.scm parser.scm GOBJECTS = $(SOURCES:%.scm=%.go) -nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES) $(GOBJECTS) +nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES) +nobase_nodist_obj_DATA = $(GOBJECTS) + EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES) CLEANFILES = $(GOBJECTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/guile-json-1.0.1/json/builder.scm new/guile-json-1.2.0/json/builder.scm --- old/guile-json-1.0.1/json/builder.scm 2018-05-24 20:14:30.000000000 +0200 +++ new/guile-json-1.2.0/json/builder.scm 2018-08-23 06:09:03.000000000 +0200 @@ -5,22 +5,18 @@ ;; ;; This file is part of guile-json. ;; -;; guile-json is free software; you can redistribute it and/or -;; modify it under the terms of the GNU General Public License and -;; the GNU Lesser General Public License as published by the Free -;; Software Foundation; either version 3 of the License, or (at your -;; option) any later version. -;; -;; guile-json is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; General Public License and the GNU Lesser General Public License -;; for more details. +;; guile-json is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 3 of the License, or +;; (at your option) any later version. +;; +;; guile-json is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License -;; and the GNU Lesser General Public License along with guile-json; -;; if not, write to the Free Software Foundation, Inc., -;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +;; along with guile-json. If not, see https://www.gnu.org/licenses/. ;;; Commentary: @@ -92,14 +88,19 @@ (define (build-object-pair p port escape pretty level) (display (indent-string pretty level) port) (json-build-string (car p) port escape) - (display " : " port) + (build-space port pretty) + (display ":" port) + (build-space port pretty) (json-build (cdr p) port escape pretty level)) (define (build-newline port pretty) (cond (pretty (newline port)))) +(define (build-space port pretty) + (cond (pretty (display " " port)))) + (define (indent-string pretty level) - (if pretty (format #f "~v_" (* 4 level)) "")) + (if pretty (format #f "~v_" (* 2 level)) "")) ;; ;; Main builder functions @@ -157,13 +158,15 @@ (unless (null? scm) (json-build (car scm) port escape pretty (+ level 1)) (for-each (lambda (v) - (display ", " port) + (display "," port) + (build-space port pretty) (json-build v port escape pretty (+ level 1))) (cdr scm))) (display "]" port)) (define (json-build-object scm port escape pretty level) - (build-newline port pretty) + (cond ((> level 0) + (build-newline port pretty))) (simple-format port "~A{" (indent-string pretty level)) (build-newline port pretty) (let ((pairs scm)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/guile-json-1.0.1/json/parser.scm new/guile-json-1.2.0/json/parser.scm --- old/guile-json-1.0.1/json/parser.scm 2018-05-23 19:39:21.000000000 +0200 +++ new/guile-json-1.2.0/json/parser.scm 2018-08-23 06:09:27.000000000 +0200 @@ -4,22 +4,18 @@ ;; ;; This file is part of guile-json. ;; -;; guile-json is free software; you can redistribute it and/or -;; modify it under the terms of the GNU General Public License and -;; the GNU Lesser General Public License as published by the Free -;; Software Foundation; either version 3 of the License, or (at your -;; option) any later version. +;; guile-json is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 3 of the License, or +;; (at your option) any later version. ;; -;; guile-json is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; General Public License and the GNU Lesser General Public License -;; for more details. +;; guile-json is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License -;; and the GNU Lesser General Public License along with guile-json; -;; if not, write to the Free Software Foundation, Inc., -;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +;; along with guile-json. If not, see https://www.gnu.org/licenses/. ;;; Commentary: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/guile-json-1.0.1/json.scm new/guile-json-1.2.0/json.scm --- old/guile-json-1.0.1/json.scm 2018-05-23 19:50:46.000000000 +0200 +++ new/guile-json-1.2.0/json.scm 2018-08-23 06:09:42.000000000 +0200 @@ -4,22 +4,18 @@ ;; ;; This file is part of guile-json. ;; -;; guile-json is free software; you can redistribute it and/or -;; modify it under the terms of the GNU General Public License and -;; the GNU Lesser General Public License as published by the Free -;; Software Foundation; either version 3 of the License, or (at your -;; option) any later version. +;; guile-json is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 3 of the License, or +;; (at your option) any later version. ;; -;; guile-json is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; General Public License and the GNU Lesser General Public License -;; for more details. +;; guile-json is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License -;; and the GNU Lesser General Public License along with guile-json; -;; if not, write to the Free Software Foundation, Inc., -;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +;; along with guile-json. If not, see https://www.gnu.org/licenses/. ;;; Commentary: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/guile-json-1.0.1/pkg-list.scm new/guile-json-1.2.0/pkg-list.scm --- old/guile-json-1.0.1/pkg-list.scm 2018-05-24 20:22:44.000000000 +0200 +++ new/guile-json-1.2.0/pkg-list.scm 2018-08-23 06:19:39.000000000 +0200 @@ -3,31 +3,27 @@ ;; ;; This file is part of guile-json. ;; -;; guile-json is free software; you can redistribute it and/or -;; modify it under the terms of the GNU General Public License and -;; the GNU Lesser General Public License as published by the Free -;; Software Foundation; either version 3 of the License, or (at your -;; option) any later version. +;; guile-json is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 3 of the License, or +;; (at your option) any later version. ;; -;; guile-json is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; General Public License and the GNU Lesser General Public License -;; for more details. +;; guile-json is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License -;; and the GNU Lesser General Public License along with guile-json; -;; if not, write to the Free Software Foundation, Inc., -;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +;; along with guile-json. If not, see https://www.gnu.org/licenses/. ;; -(package (json (1 0 1)) +(package (json (1 2 0)) (depends (srfi-1)) (synopsis "JSON parser/writer for Guile") (description "guile-json supports the parsing and writing of JSON from Guile." "It aims to be fully compliant with the json.org specification, and" - "is released under the GPLv3 and the LGPLv3.") + "is released under the GPLv3.") (homepage "https://github.com/aconchillo/guile-json";) (libraries "json.scm" "json") - (documentation "README" "COPYING" "COPYING.LESSER")) + (documentation "README" "COPYING"))
