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

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

Revision: 5690
          http://sourceforge.net/p/fuse-emulator/code/5690
Author:   fredm
Date:     2016-07-19 10:57:38 +0000 (Tue, 19 Jul 2016)
Log Message:
-----------
Merge libspectrum_1_2_0-branch back to trunk for 1.2.1 release.

Modified Paths:
--------------
    trunk/libspectrum/ChangeLog
    trunk/libspectrum/Makefile.am
    trunk/libspectrum/README
    trunk/libspectrum/doc/libspectrum.3
    trunk/libspectrum/hacking/ChangeLog

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

Index: trunk/libspectrum
===================================================================
--- trunk/libspectrum	2016-07-19 10:51:41 UTC (rev 5689)
+++ trunk/libspectrum	2016-07-19 10:57:38 UTC (rev 5690)

Property changes on: trunk/libspectrum
___________________________________________________________________
Modified: svn:mergeinfo
## -8,7 +8,7 ##
 /branches/libspectrum_0_5_0-branch:3809-3956
 /branches/libspectrum_1_0_0-branch:4185-4222
 /branches/libspectrum_1_1_0-branch:4928-5385
-/branches/libspectrum_1_2_0-branch:5387-5603
+/branches/libspectrum_1_2_0-branch:5387-5689
 /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-07-19 10:51:41 UTC (rev 5689)
+++ trunk/libspectrum/ChangeLog	2016-07-19 10:57:38 UTC (rev 5690)
@@ -1,4 +1,4 @@
-2016-07-??  Philip Kendall  <phi...@sh...>
+2016-07-17  Philip Kendall  <phi...@sh...>
 
         * libspectrum 1.2.1 released.
 

Modified: trunk/libspectrum/Makefile.am
===================================================================
--- trunk/libspectrum/Makefile.am	2016-07-19 10:51:41 UTC (rev 5689)
+++ trunk/libspectrum/Makefile.am	2016-07-19 10:57:38 UTC (rev 5690)
@@ -63,7 +63,16 @@
 			 zlib.c \
 			 zxs.c
 
-libspectrum_la_LDFLAGS = -version-info 10:0:2 -no-undefined @WINDRES_LDFLAGS@
+## The version info is made of three components: current, revision and age
+## We update the version when we release according to the guide at
+## https://autotools.io/libtool/version.html
+## The rules of thumb, when dealing with these values are:
+## * Always increase the revision value.
+## * Increase the current value whenever an interface has been added, removed or
+##   changed.
+## * Increase the age value only if the changes made to the ABI are backward
+##   compatible.
+libspectrum_la_LDFLAGS = -version-info 11:1:3 -no-undefined @WINDRES_LDFLAGS@
 
 libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ @GLIB_LIBS@ -lm
 

Modified: trunk/libspectrum/README
===================================================================
--- trunk/libspectrum/README	2016-07-19 10:51:41 UTC (rev 5689)
+++ trunk/libspectrum/README	2016-07-19 10:57:38 UTC (rev 5690)
@@ -67,6 +67,6 @@
 Then, type "make" and if everything went well, "make install".
 
 Philip Kendall <phi...@sh...>
-6th June, 2016
+17th July, 2016
 
 $Id$

Modified: trunk/libspectrum/doc/libspectrum.3
===================================================================
--- trunk/libspectrum/doc/libspectrum.3	2016-07-19 10:51:41 UTC (rev 5689)
+++ trunk/libspectrum/doc/libspectrum.3	2016-07-19 10:57:38 UTC (rev 5690)
@@ -22,7 +22,7 @@
 .\" E-mail: phi...@sh...
 .\"
 .\"
-.TH libspectrum 3 "6th June, 2016" "Version 1.2.1" "Emulators"
+.TH libspectrum 3 "17th July, 2016" "Version 1.2.1" "Emulators"
 .\"
 .\"------------------------------------------------------------------
 .\"

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2016-07-19 10:51:41 UTC (rev 5689)
+++ trunk/libspectrum/hacking/ChangeLog	2016-07-19 10:57:38 UTC (rev 5690)
@@ -1073,7 +1073,13 @@
 20160606 ChangeLog,README,configure.ac,doc/libspectrum.3: update release dates
          and mark this release as 1.2.0 (Fred).
 20160622 make-perl.c,myglib/garray.c: add implementations of
-         g_array_sized_new() and g_array_remove_index_fast(). (Thanks, Sergio)
+         g_array_sized_new() and g_array_remove_index_fast() (thanks, Sergio)
          (Phil).
 20160709 ChangeLog,README,configure.ac,doc/{libspectrum.3,libspectrum.txt}: 
          bump some version numbers for 1.2.1 release (Fred).
+20160710 README,Makefile.am,configure.ac,doc/libspectrum.3: bump release dates,
+         mark release as 1.2.1-pre1 and bump libtool version (Fred).
+20160712 Makefile.am: add comments on assigning libtool version (thanks, Sergio)
+         (Fred).
+20160717 ChangeLog,README,configure.ac,doc/libspectrum.3: update release dates
+         and mark this release as 1.2.1 (Fred).

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