Changes - SailfishOS Open Build Service

Changes of Revision 5

[-] [+]	Changed	_service:tar_git:libglibutil.changes
@@ -1,3 +1,8 @@ +* Tue Mar 17 2020 Slava Monich <slava.monich@jolla.com> - 1.0.44 +- [build] Adapted to side-by-side linking. JB#49231 +- [build] Allow overriding CC for unit tests +- [license] Refreshed license + * Fri Dec 20 2019 Slava Monich <slava.monich@jolla.com> - 1.0.43 - [glibutil] Added default GLogProc2 compatible callbacks. JB#48496 - [glibutil] Allow specifying per-module logging function. JB#48496
[-] [+]	Changed	_service:tar_git:libglibutil.spec ^
@@ -1,5 +1,5 @@ Name: libglibutil -Version: 1.0.43 +Version: 1.0.44 Release: 0 Summary: Library of glib utilities Group: Development/Libraries
[-] [+]	Changed	_service ^
@@ -6,7 +6,7 @@ <service name="tar_git"> <param name="url">https://git.sailfishos.org/mer-core/libglibutil.git</param> <param name="branch">master</param> - <param name="revision"/> + <param name="revision">e8f82c19782c0d6af0ee5cbec64c13c3d45c53e4</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Added	_service:tar_git:libglibutil-1.0.44.tar.bz2/LICENSE ^
@@ -0,0 +1,28 @@ +Copyright (C) 2014-2020 Jolla Ltd. + +You may use this file under the terms of BSD license as follows: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the names of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE.
[-] [+]	Changed	_service:tar_git:libglibutil-1.0.44.tar.bz2/Makefile ^
@@ -20,7 +20,7 @@ VERSION_MAJOR = 1 VERSION_MINOR = 0 -VERSION_RELEASE = 43 +VERSION_RELEASE = 44 # Version for pkg-config PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) @@ -113,6 +113,8 @@ RELEASE_LIB = $(RELEASE_BUILD_DIR)/$(LIB) DEBUG_LINK = $(DEBUG_BUILD_DIR)/$(LIB_SYMLINK1) RELEASE_LINK = $(RELEASE_BUILD_DIR)/$(LIB_SYMLINK1) +DEBUG_DEV_LINK = $(DEBUG_BUILD_DIR)/$(LIB_DEV_SYMLINK) +RELEASE_DEV_LINK = $(RELEASE_BUILD_DIR)/$(LIB_DEV_SYMLINK) DEBUG_STATIC_LIB = $(DEBUG_BUILD_DIR)/$(STATIC_LIB) RELEASE_STATIC_LIB = $(RELEASE_BUILD_DIR)/$(STATIC_LIB) COVERAGE_STATIC_LIB = $(COVERAGE_BUILD_DIR)/$(STATIC_LIB) @@ -137,9 +139,9 @@ # Rules # -debug: $(DEBUG_STATIC_LIB) $(DEBUG_LIB) $(DEBUG_LINK) +debug: $(DEBUG_STATIC_LIB) $(DEBUG_LIB) $(DEBUG_LINK) $(DEBUG_DEV_LINK) -release: $(RELEASE_STATIC_LIB) $(RELEASE_LIB) $(RELEASE_LINK) +release: $(RELEASE_STATIC_LIB) $(RELEASE_LIB) $(RELEASE_LINK) $(RELEASE_DEV_LINK) coverage: $(COVERAGE_STATIC_LIB) @@ -204,6 +206,12 @@ $(RELEASE_LINK): ln -sf $(LIB) $@ +$(DEBUG_DEV_LINK): + ln -sf $(LIB_SYMLINK1) $@ + +$(RELEASE_DEV_LINK): + ln -sf $(LIB_SYMLINK1) $@ + $(DEBUG_STATIC_LIB): $(DEBUG_OBJS) $(AR) rc $@ $?
[-] [+]	Changed	_service:tar_git:libglibutil-1.0.44.tar.bz2/debian/changelog ^
@@ -1,3 +1,10 @@ +libglibutil (1.0.44) unstable; urgency=low + + * Adapted to side-by-side linking + * Allow overriding CC for unit tests + + -- Slava Monich <slava.monich@jolla.com> Tue, 17 Mar 2020 19:01:45 +0200 + libglibutil (1.0.43) unstable; urgency=low * Allow specifying per-module logging function
[-] [+]	Changed	_service:tar_git:libglibutil-1.0.44.tar.bz2/debian/copyright ^
@@ -1,5 +1,4 @@ -Copyright (C) 2014-2015 Jolla Ltd. -Contact: Slava Monich <slava.monich@jolla.com> +Copyright (C) 2014-2020 Jolla Ltd. You may use this file under the terms of BSD license as follows: @@ -12,9 +11,9 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of the Jolla Ltd nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. + 3. Neither the names of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
[-] [+]	Changed	_service:tar_git:libglibutil-1.0.44.tar.bz2/test/common/Makefile ^
@@ -41,7 +41,7 @@ # Tools and flags # -CC = $(CROSS_COMPILE)gcc +CC ?= $(CROSS_COMPILE)gcc LD = $(CC) WARNINGS = -Wall INCLUDES = -I$(LIB_DIR)/include -I$(LIB_DIR)/src -I$(COMMON_DIR)