[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[756] trunk/libspectrum
Brought to you by:
fredm
From: <fr...@us...> - 2013-05-25 04:16:58
|
Revision: 756 http://sourceforge.net/p/fuse-for-macosx/code/756 Author: fredm Date: 2013-05-25 04:16:54 +0000 (Sat, 25 May 2013) Log Message: ----------- Merge up to vendor 1.1.0 release branches r4995. Revision Links: -------------- http://sourceforge.net/p/fuse-for-macosx/code/4995 Modified Paths: -------------- trunk/libspectrum/Info.plist trunk/libspectrum/libspectrum/ChangeLog trunk/libspectrum/libspectrum/Makefile.am trunk/libspectrum/libspectrum/README trunk/libspectrum/libspectrum/configure.ac trunk/libspectrum/libspectrum/doc/libspectrum.3 trunk/libspectrum/libspectrum/doc/libspectrum.txt trunk/libspectrum/libspectrum/hacking/ChangeLog trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj Property Changed: ---------------- trunk/libspectrum/libspectrum/ Modified: trunk/libspectrum/Info.plist =================================================================== --- trunk/libspectrum/Info.plist 2013-05-25 03:45:58 UTC (rev 755) +++ trunk/libspectrum/Info.plist 2013-05-25 04:16:54 UTC (rev 756) @@ -23,6 +23,6 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>1.1.0</string> + <string>1.1.1</string> </dict> </plist> Index: trunk/libspectrum/libspectrum =================================================================== --- trunk/libspectrum/libspectrum 2013-05-25 03:45:58 UTC (rev 755) +++ trunk/libspectrum/libspectrum 2013-05-25 04:16:54 UTC (rev 756) Property changes on: trunk/libspectrum/libspectrum ___________________________________________________________________ Modified: svn:mergeinfo ## -1,5 +1,5 ## /vendor/fuse-emulator/0.10.0/libspectrum:556-557 /vendor/fuse-emulator/0.10.0-pre1/libspectrum:545-546 -/vendor/fuse-emulator/current/libspectrum:530-752 +/vendor/fuse-emulator/current/libspectrum:530-755 /vendor/fuse-emulator/fuse-1.0.0a/libspectrum:668-669 /vendor/fuse-emulator/fuse-r4617/libspectrum:686 \ No newline at end of property Modified: trunk/libspectrum/libspectrum/ChangeLog =================================================================== --- trunk/libspectrum/libspectrum/ChangeLog 2013-05-25 03:45:58 UTC (rev 755) +++ trunk/libspectrum/libspectrum/ChangeLog 2013-05-25 04:16:54 UTC (rev 756) @@ -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. @@ -333,5 +340,5 @@ * libspectrum separated from Fuse just before the 0.5.0 release of Fuse; see Fuse's ChangeLog for changes up to this point -$Id: ChangeLog 4948 2013-05-16 21:00:24Z pak21 $ +$Id: ChangeLog 4994 2013-05-24 19:52:37Z zubzero $ Modified: trunk/libspectrum/libspectrum/Makefile.am =================================================================== --- trunk/libspectrum/libspectrum/Makefile.am 2013-05-25 03:45:58 UTC (rev 755) +++ trunk/libspectrum/libspectrum/Makefile.am 2013-05-25 04:16:54 UTC (rev 756) @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in ## Copyright (c) 2001-2013 Philip Kendall -## $Id: Makefile.am 4935 2013-05-16 19:43:50Z pak21 $ +## $Id: Makefile.am 4985 2013-05-24 17:27:14Z zubzero $ ## 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 @@ -63,7 +63,7 @@ zlib.c \ zxs.c -libspectrum_la_LDFLAGS = -version-info 9:0:0 -no-undefined @WINDRES_LDFLAGS@ +libspectrum_la_LDFLAGS = -version-info 9:0:1 -no-undefined @WINDRES_LDFLAGS@ libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ @GLIB_LIBS@ -lm Modified: trunk/libspectrum/libspectrum/README =================================================================== --- trunk/libspectrum/libspectrum/README 2013-05-25 03:45:58 UTC (rev 755) +++ trunk/libspectrum/libspectrum/README 2013-05-25 04:16:54 UTC (rev 756) @@ -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: README 4951 2013-05-17 18:48:41Z pak21 $ +$Id: README 4992 2013-05-24 19:49:15Z zubzero $ Modified: trunk/libspectrum/libspectrum/configure.ac =================================================================== --- trunk/libspectrum/libspectrum/configure.ac 2013-05-25 03:45:58 UTC (rev 755) +++ trunk/libspectrum/libspectrum/configure.ac 2013-05-25 04:16:54 UTC (rev 756) @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. dnl Copyright (c) 1999-2012 Philip Kendall -dnl $Id: configure.ac 4847 2013-01-03 09:16:15Z zubzero $ +dnl $Id: configure.ac 4986 2013-05-24 19:03:20Z zubzero $ dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -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/libspectrum/doc/libspectrum.3 =================================================================== --- trunk/libspectrum/libspectrum/doc/libspectrum.3 2013-05-25 03:45:58 UTC (rev 755) +++ trunk/libspectrum/libspectrum/doc/libspectrum.3 2013-05-25 04:16:54 UTC (rev 756) @@ -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/libspectrum/doc/libspectrum.txt =================================================================== --- trunk/libspectrum/libspectrum/doc/libspectrum.txt 2013-05-25 03:45:58 UTC (rev 755) +++ trunk/libspectrum/libspectrum/doc/libspectrum.txt 2013-05-25 04:16:54 UTC (rev 756) @@ -1,4 +1,4 @@ -libspectrum 1.1.0 +libspectrum 1.1.1 ================= libspectrum is a fairly simple library designed to make the handling @@ -1826,4 +1826,4 @@ Write `data' to register `reg' of the IDE channel `chn'. -$Id: libspectrum.txt 4964 2013-05-19 05:30:32Z sbaldovi $ +$Id: libspectrum.txt 4986 2013-05-24 19:03:20Z zubzero $ Modified: trunk/libspectrum/libspectrum/hacking/ChangeLog =================================================================== --- trunk/libspectrum/libspectrum/hacking/ChangeLog 2013-05-25 03:45:58 UTC (rev 755) +++ trunk/libspectrum/libspectrum/hacking/ChangeLog 2013-05-25 04:16:54 UTC (rev 756) @@ -947,3 +947,9 @@ 20130516 ChangeLog: update date in main changelog. 20130517 README: update one more date for the 1.1 release. 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). Modified: trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj =================================================================== --- trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj 2013-05-25 03:45:58 UTC (rev 755) +++ trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj 2013-05-25 04:16:54 UTC (rev 756) @@ -375,7 +375,7 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; DEBUG_INFORMATION_FORMAT = dwarf; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -394,7 +394,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -412,7 +412,7 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; DEBUG_INFORMATION_FORMAT = dwarf; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -434,7 +434,7 @@ FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../bzip2/build/Deployment\""; FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../libgcrypt/build/Deployment\""; FRAMEWORK_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../audiofile/build/Deployment\""; - FRAMEWORK_VERSION = 1.1.0; + FRAMEWORK_VERSION = 1.1.1; GCC_DYNAMIC_NO_PIC = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_NO_COMMON_BLOCKS = YES; @@ -481,7 +481,7 @@ FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../bzip2/build/Deployment\""; FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../libgcrypt/build/Deployment\""; FRAMEWORK_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../audiofile/build/Deployment\""; - FRAMEWORK_VERSION = 1.1.0; + FRAMEWORK_VERSION = 1.1.1; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 2; @@ -526,7 +526,7 @@ FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../bzip2/build/Deployment\""; FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../libgcrypt/build/Deployment\""; FRAMEWORK_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../audiofile/build/Deployment\""; - FRAMEWORK_VERSION = 1.1.0; + FRAMEWORK_VERSION = 1.1.1; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 2; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |