[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[5386] trunk/libspectrum

[<fr...@us...>]

Revision: 5386
          http://sourceforge.net/p/fuse-emulator/code/5386
Author:   fredm
Date:     2016-04-24 12:33:20 +0000 (Sun, 24 Apr 2016)
Log Message:
-----------
Merge libspectrum_1_1_0-branch changes onto trunk.

Modified Paths:
--------------
    trunk/libspectrum/ChangeLog
    trunk/libspectrum/README
    trunk/libspectrum/configure.ac
    trunk/libspectrum/doc/libspectrum.3
    trunk/libspectrum/doc/libspectrum.txt
    trunk/libspectrum/hacking/ChangeLog

Property Changed:
----------------
    trunk/libspectrum/

Index: trunk/libspectrum
===================================================================
--- trunk/libspectrum	2016-04-24 11:52:46 UTC (rev 5385)
+++ trunk/libspectrum	2016-04-24 12:33:20 UTC (rev 5386)

Property changes on: trunk/libspectrum
___________________________________________________________________
Modified: svn:mergeinfo
## -4,6 +4,7 ##
 /branches/fmfx-2010-09-14/libspectrum:4160-4662
 /branches/libspectrum_0_5_0-branch:3809-3879
 /branches/libspectrum_1_0_0-branch:4185-4219
+/branches/libspectrum_1_1_0-branch:4928-5385
 /branches/ntsc-2009-04-11/libspectrum:4000-4147
 /branches/opus-20090722/libspectrum:4046-4059
 /branches/wii-20080828/libspectrum:3757-3946
\ No newline at end of property
Modified: trunk/libspectrum/ChangeLog
===================================================================
--- trunk/libspectrum/ChangeLog	2016-04-24 11:52:46 UTC (rev 5385)
+++ trunk/libspectrum/ChangeLog	2016-04-24 12:33:20 UTC (rev 5386)
@@ -1,3 +1,10 @@
+2013-05-24  Philip Kendall  <phi...@sh...>
+
+        * libspectrum 1.1.1 released.
+
+        * Decreased libtool version to allow binaries built against
+          libspectrum 1.0.0 to run with libspectrum 1.1.1.
+
 2013-05-18  Philip Kendall  <phi...@sh...>
 
         * libspectrum 1.1.0 released.

Modified: trunk/libspectrum/README
===================================================================
--- trunk/libspectrum/README	2016-04-24 11:52:46 UTC (rev 5385)
+++ trunk/libspectrum/README	2016-04-24 12:33:20 UTC (rev 5386)
@@ -1,4 +1,4 @@
-libspectrum 1.1.0
+libspectrum 1.1.1
 =================
 
 libspectrum is a library which is designed to make the input and
@@ -67,6 +67,6 @@
 Then, type "make" and if everything went well, "make install".
 
 Philip Kendall <phi...@sh...>
-18th May, 2013
+24th May, 2013
 
 $Id$

Modified: trunk/libspectrum/configure.ac
===================================================================
--- trunk/libspectrum/configure.ac	2016-04-24 11:52:46 UTC (rev 5385)
+++ trunk/libspectrum/configure.ac	2016-04-24 12:33:20 UTC (rev 5386)
@@ -22,12 +22,12 @@
 dnl E-mail: phi...@sh...
 
 dnl Package version
-m4_define([libspectrum_version], [1.1.0])
+m4_define([libspectrum_version], [1.1.1])
 
 dnl Product full version
 m4_define([libspectrum_major_version], [1])
 m4_define([libspectrum_minor_version], [1])
-m4_define([libspectrum_micro_version], [0])
+m4_define([libspectrum_micro_version], [1])
 m4_define([libspectrum_nano_version],  [0])
 m4_define([libspectrum_full_version],
           [libspectrum_major_version.libspectrum_minor_version.libspectrum_micro_version.libspectrum_nano_version])

Modified: trunk/libspectrum/doc/libspectrum.3
===================================================================
--- trunk/libspectrum/doc/libspectrum.3	2016-04-24 11:52:46 UTC (rev 5385)
+++ trunk/libspectrum/doc/libspectrum.3	2016-04-24 12:33:20 UTC (rev 5386)
@@ -22,7 +22,7 @@
 .\" E-mail: phi...@sh...
 .\"
 .\"
-.TH libspectrum 3 "18th May, 2013" "Version 1.1.0" "Emulators"
+.TH libspectrum 3 "24th May, 2013" "Version 1.1.1" "Emulators"
 .\"
 .\"------------------------------------------------------------------
 .\"

Modified: trunk/libspectrum/doc/libspectrum.txt
===================================================================
--- trunk/libspectrum/doc/libspectrum.txt	2016-04-24 11:52:46 UTC (rev 5385)
+++ trunk/libspectrum/doc/libspectrum.txt	2016-04-24 12:33:20 UTC (rev 5386)
@@ -1,4 +1,4 @@
-libspectrum 1.1.0
+libspectrum 1.1.1
 =================
 
 libspectrum is a fairly simple library designed to make the handling

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2016-04-24 11:52:46 UTC (rev 5385)
+++ trunk/libspectrum/hacking/ChangeLog	2016-04-24 12:33:20 UTC (rev 5386)
@@ -949,6 +949,10 @@
 20130518 doc/libspectrum.txt: update version number for 1.1 release (Sergio).
 20130524 Makefile.am: update libtool age to support binaries built against
          libspectrum 1.0.0 (Stuart).
+20130524 ChangeLog,README,configure.ac,doc/libspectrum.{3,txt},
+         hacking/ChangeLog: updates for a "1.1.1" release (Stuart).
+20130524 doc/libspectrum,README: further updates for 1.1.1(Stuart).
+20130524 ChangeLog: fill in date (Stuart).
 20130526 Makefile.am: add dll.c into the dist tarball (Sergio).
 20130928 configure.ac: use 'subdir-objects' option as advised by automake 1.14
          to place object files in subdirectories (Sergio).
@@ -1026,3 +1030,6 @@
 20160410 Makefile.am: revert revision 4731 / bug #262 as it makes configuring
          target flags for cross-compilation difficult (patch #357) (BogDan
          Vatra).
+20160424 ChangeLog,README,configure.ac,doc/libspectrum.{3,txt},
+         hacking/ChangeLog: merge libspectrum_1_1_0-branch changes onto trunk
+         (Fred).

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.