Changes - SailfishOS Open Build Service

Changes of Revision 3

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:libdsme.changes
@@ -1,3 +1,18 @@ +* Wed Jun 10 2015 Simo Piiroinen <simo.piiroinen@jollamobile.com> - 0.64.1 +- [packaging] Add missing execute bit to unit test binary. Fixes JB#29776 +- [packaging] Make rpms own the directories where files are installed. Contributes to JB#29776 + +* Thu Jun 04 2015 Simo Piiroinen <simo.piiroinen@jollamobile.com> - 0.64.0 +- [build] Bump dynamic library versions to 0.3.0. Contributes to JB#12048 +- [build] Rewrite Makefile +- [cleanup] Remove .gitignore +- [cleanup] Remove unsused .todo file +- [packaging] Bring version number in Makefile up to date +- [packaging] Fix soname used by the libraries. Contributes to JB#12048 +- [packaging] Make sure the various version numbers stay in sync +- [packaging] Use wildcards for filename matching (Contributes to JB#12048) +- [spec] Remove spectacle cruft (Contributes to JB#12048) + * Fri Apr 24 2015 Thomas Perl <m@thp.io> - 0.63.2 - [pkg-config] Bump version to 0.63.2 (contributes to JB#12048)
[-] [+]	Changed	_service:tar_git:libdsme.spec ^
@@ -1,15 +1,7 @@ -# -# Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.27 -# - Name: libdsme -# >> macros -# << macros - Summary: DSME dsmesock dynamic library -Version: 0.63.2 +Version: 0.64.1 Release: 0 Group: System/System Control License: LGPL @@ -47,57 +39,40 @@ %prep %setup -q -n %{name}-%{version} -# >> setup -# << setup - %build +./verify_version unset LD_AS_NEEDED -# >> build pre -# << build pre - - make %{?jobs:-j%jobs} -# >> build post -# << build post - %install rm -rf %{buildroot} -# >> install pre -# << install pre %make_install -# >> install post - - -# << install post - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) -# >> files -%{_libdir}/libdsme.so.0.2.0 -%{_libdir}/libdsme_dbus_if.so.0.2.0 -%{_libdir}/libthermalmanager_dbus_if.so.0.2.0 +%{_libdir}/libdsme.so.* +%{_libdir}/libdsme_dbus_if.so.* +%{_libdir}/libthermalmanager_dbus_if.so.* %doc debian/copyright %doc COPYING -# << files %files devel %defattr(-,root,root,-) -# >> files devel +%dir %{_includedir}/dsme %{_includedir}/dsme/* %{_libdir}/libdsme.so %{_libdir}/libdsme_dbus_if.so %{_libdir}/libthermalmanager_dbus_if.so +%dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/* -# << files devel %files tests %defattr(-,root,root,-) -# >> files tests +%dir /opt +%dir /opt/tests +%dir /opt/tests/libdsme /opt/tests/libdsme/* -# << files tests
[-] [+]	Changed	_service ^
@@ -1,10 +1,6 @@ <services> -<service name="webhook"> -<param name="repourl">https://github.com/kimmoli/libdsme.git</param> -<param name="branch">master</param> -</service> <service name="tar_git"> - <param name="url">https://github.com/kimmoli/libdsme.git</param> + <param name="url">https://github.com/nemomobile/libdsme.git</param> <param name="branch">master</param> <param name="revision"/> <param name="token"/>
[-] [+]	Deleted	_service:tar_git:libdsme-0.63.2.tar.bz2/.gitignore ^
@@ -1,23 +0,0 @@ -.o -.a -.so -.so.* -.depend -build-stamp -configure-stamp - -.gcda -.gcno -lcov.info -coverage - -ut_libdsme - -debian/files -debian/libdsme0.2.0-dbg.* -debian/libdsme0.2.0-dbg/ -debian/libdsme0.2.0-dev.* -debian/libdsme0.2.0-dev/ -debian/libdsme0.2.0* -debian/libdsme0.2.0/ -debian/tmp/
[-] [+]	Deleted	_service:tar_git:libdsme-0.63.2.tar.bz2/.todo ^
@@ -1,33 +0,0 @@ -<?xml version="1.0"?> -<todo version="0.1.20"> - <note priority="medium" time="1228308492" done="1232699668"> - disable memory thermal object - <comment> - disabled in 0.60.1 - </comment> - </note> - <note priority="medium" time="1229084875" done="1229090017"> - make lifeguard to listen to STATE_CHANGE_IND instead of PROCESS_CLEAR - <note priority="medium" time="1229084912" done="0"> - remove DSM_MSGTYPE_PROCESS_CLEAR - </note> - </note> - <note priority="medium" time="1229678796" done="1237213146"> - remove field 'state' from DSM_MSGTYPE_SHUTDOWN_REQ - </note> - <note priority="medium" time="1228210816"> - Thermal Manager: do not poll at NORMAL level - </note> - <note priority="medium" time="1228219029"> - dbus_connection_set_exit_on_disconnect(,0) - <note priority="medium" time="1228223903"> - upstart should notify dsme about D-Bus restart - </note> - </note> - <note priority="medium" time="1234964310"> - wait 2 s for alarm count to go 0 before actdead->user - </note> - <note priority="medium" time="1251959677"> - do not accept new processwd clients after committing to shutdown - </note> -</todo>
[-] [+]	Deleted	_service:tar_git:libdsme-0.63.2.tar.bz2/Rules.make ^
@@ -1,275 +0,0 @@ -.PHONY: all_dependok clean depend all install local_install -# -# Default values -# - -CC := gcc - -# C++ suffix -CXX_SUFFIX := cxx -# Dynamic library version -LIBRARY_VERSION := 0.0.0 - -# -# Subdirectory variables -# -BUILD_SUBDIRS := $(addprefix _subbuild_,$(SUBDIRS)) -INSTALL_SUBDIRS := $(addprefix _subinstall_,$(SUBDIRS)) -CLEAN_SUBDIRS := $(addprefix _subclean_,$(SUBDIRS)) -DEPEND_SUBDIRS := $(addprefix _subdepend_,$(SUBDIRS)) -DISTCLN_SUBDIRS += $(addprefix _distclean_,$(SUBDIRS)) -.PHONY: $(BUILD_SUBDIRS) $(INSTALL_SUBDIRS) $(CLEAN_SUBDIRS) $(DEPEND_SUBDIRS) $(DISTCLN_SUBDIRS) - - -# -# Complete library names -# -C_A_LIBS := $(addsuffix .a,$(A_LIBRARIES)) -C_SO_LIBS := $(addsuffix .so,$(SO_LIBRARIES)) -vpath %.so $(LD_LIBPATHS) -vpath %.a $(LD_LIBPATHS) - - -# -# C(XX)FLAGS and MKDEP_C(XX)FLAGS (make depend) -# -# Don't try to optimize this, especially do not try single CFLAGS definition -# and conditional assignment OPTFLAGS = DBGFLAGS. It would break overrides. -# CFLAGS may not be immediately evaluated for same reason. -# -ifndef DEBUG -CFLAGS = $(C_GENFLAGS) $(C_EXTRA_GENFLAGS) \ - $(C_OPTFLAGS) $(C_EXTRA_OPTFLAGS) \ - $(addprefix -I,$(C_INCDIRS)) \ - $(addprefix -I,$(C_EXTRA_INCDIRS)) \ - $(addprefix -D,$(C_DEFINES)) \ - $(addprefix -D,$(C_EXTRA_DEFINES)) -CXXFLAGS = $(CXX_GENFLAGS) $(CXX_EXTRA_GENFLAGS) \ - $(CXX_OPTFLAGS) $(CXX_EXTRA_OPTFLAGS) \ - $(addprefix -I,$(CXX_INCDIRS)) \ - $(addprefix -I,$(CXX_EXTRA_INCDIRS)) \ - $(addprefix -D,$(CXX_DEFINES)) \ - $(addprefix -D,$(CXX_EXTRA_DEFINES)) -else -CFLAGS = $(C_GENFLAGS) $(C_EXTRA_GENFLAGS) \ - $(C_DBGFLAGS) $(C_EXTRA_DBGFLAGS) \ - $(addprefix -I,$(C_INCDIRS)) \ - $(addprefix -I,$(C_EXTRA_INCDIRS)) \ - $(addprefix -D,$(C_DEFINES)) \ - $(addprefix -D,$(C_EXTRA_DEFINES)) -CXXFLAGS = $(CXX_GENFLAGS) $(CXX_EXTRA_GENFLAGS) \ - $(CXX_DBGFLAGS) $(CXX_EXTRA_DBGFLAGS) \ - $(addprefix -I,$(CXX_INCDIRS)) \ - $(addprefix -I,$(CXX_EXTRA_INCDIRS)) \ - $(addprefix -D,$(CXX_DEFINES)) \ - $(addprefix -D,$(CXX_EXTRA_DEFINES)) -endif -MKDEP_CFLAGS = $(addprefix -I,$(C_INCDIRS)) \ - $(addprefix -I,$(C_EXTRA_INCDIRS)) \ - $(MKDEP_INCFLAGS) \ - $(addprefix -D,$(C_DEFINES)) \ - $(addprefix -D,$(C_EXTRA_DEFINES)) -MKDEP_CXXFLAGS = $(addprefix -I,$(CXX_INCDIRS)) \ - $(addprefix -I,$(CXX_EXTRA_INCDIRS)) \ - $(addprefix -D,$(CXX_DEFINES)) \ - $(addprefix -D,$(CXX_EXTRA_DEFINES)) -LDFLAGS = $(LD_GENFLAGS) $(LD_EXTRA_GENFLAGS) \ - $(addprefix -L,$(LD_LIBPATHS)) \ - $(addprefix -L,$(LD_EXTRA_LIBPATHS)) -ifdef COVERAGE -C_GENFLAGS += --coverage -LD_GENFLAGS += --coverage -endif - - -# -# All object files -# -C_OBJS := $(sort $(foreach BINARY, $(BINARIES) $(A_LIBRARIES) $(SO_LIBRARIES), $($(BINARY)_C_OBJS))) -CXX_OBJS := $(sort $(foreach BINARY, $(BINARIES) $(A_LIBRARIES) $(SO_LIBRARIES), $($(BINARY)_CXX_OBJS))) -ASM_OBJS := $(sort $(foreach BINARY, $(BINARIES) $(A_LIBRARIES) $(SO_LIBRARIES), $($(BINARY)_ASM_OBJS))) -OBJS := $(C_OBJS) $(CXX_OBJS) $(ASM_OBJS) - -# -# Source files -# -C_SRCS := $(C_OBJS:.o=.c) -CXX_SRCS := $(CXX_OBJS:.o=.$(CXX_SUFFIX)) -ASM_SRCS := $(ASM_OBJS:.o=.S) -SRCS := $(C_SRCS) $(CXX_SRCS) $(ASM_SRCS) - -# -# Helper variable, not to be expanded here. Used to manage target dependencies. -# -TARGET_OBJS = $($(1)_C_OBJS) $($(1)_CXX_OBJS) $($(1)_ASM_OBJS) -TARGET_NONSTD_LIBS = $(patsubst %,lib%.so,$($(1)_SO_LIBS)) \ - $(patsubst %,lib%.a,$($(1)_A_LIBS)) - - -# -# "make all" targets -# -BUILD_TARGETS := $(BINARIES) \ - $(C_A_LIBS) \ - $(C_SO_LIBS) \ - $(BUILD_SUBDIRS) - - -# -# Depend is built recursively so possible overrides affect results properly -# Use different .depend file for debug/nondebug -# -ifdef DEBUG -DEPENDNAME := .depend-debug -else -DEPENDNAME := .depend -endif - -# -# Targets -# - -# all: make sure .depend is up to date, then recursively do real work -all: $(DEPENDNAME) - @$(MAKE) --no-print-directory all_dependok - -all_dependok: $(BUILD_TARGETS) - @true - - -install: $(DEPENDNAME) - @$(MAKE) --no-print-directory install_dependok - -install_dependok: $(INSTALL_BINARIES) $(INSTALL_A_LIBRARIES) \ - $(INSTALL_SO_LIBRARIES) $(INSTALL_OTHER) - @$(MAKE) --no-print-directory install_targetsok INSTALLING=x -ifdef INSTALL_SUBDIRS - @$(MAKE) $(INSTALL_SUBDIRS) -else - @true -endif - -install_targetsok: $(INSTALL_BINARIES) $(INSTALL_A_LIBRARIES) \ - $(INSTALL_SO_LIBRARIES) $(INSTALL_INCLUDES) \ - $(INSTALL_OTHER) local_install - @true - - -# clean: clean up in subdirectories, then delete targets and intermediates -clean: $(CLEAN_SUBDIRS) - rm -f $(BINARIES) $(C_A_LIBS) $(addsuffix ,$(C_SO_LIBS)) $(OBJS) - - -# distclean: clean and rinse in subdirectiories, then locally. -distclean: $(DISTCLN_SUBDIRS) - rm -f $(BINARIES) $(C_A_LIBS) $(addsuffix ,$(C_SO_LIBS)) $(OBJS) $(DISTCLEAN_FILES) .depend .depend-debug -ifdef DISTCLEAN_DIRS - rm -rf $(DISTCLEAN_DIRS) -endif - - -# Subdirectory rules -$(BUILD_SUBDIRS): - @echo Building in directory $(patsubst _subbuild_%, %, $@)... - @$(MAKE) --no-print-directory -C $(patsubst _subbuild_%, %, $@) -$(INSTALL_SUBDIRS): - @echo Installing in directory $(patsubst _subinstall_%, %, $@)... - @$(MAKE) --no-print-directory -C $(patsubst _subinstall_%, %, $@) install -$(CLEAN_SUBDIRS): - @echo Cleaning in directory $(patsubst _subclean_%, %, $@)... - @$(MAKE) --no-print-directory -C $(patsubst _subclean_%, %, $@) clean -$(DEPEND_SUBDIRS): - @echo Depend in directory $(patsubst _subdepend_%, %, $@)... - @$(MAKE) -o $(DEPENDNAME) --no-print-directory -C $(patsubst _subdepend_%, %, $@) depend -$(DISTCLN_SUBDIRS): - @echo Distcleaning in directory $(patsubst _distclean_%, %, $@)... - @$(MAKE) --no-print-directory -C $(patsubst _distclean_%, %, $@) distclean - - -# Common rule for all executables -ifndef INSTALLING -$(BINARIES): - $(CC) -o $@ $(LDFLAGS) $(call TARGET_OBJS,$@) $(addprefix -l,$($@_SO_LIBS) $($@_A_LIBS) $($@_LIBS)) -endif - - -# Common rule for all static libraries -ifndef INSTALLING -$(C_A_LIBS): - $(AR) rf $@ $^
[-] [+]	Changed	_service:tar_git:libdsme-0.64.1.tar.bz2/Makefile ^
@@ -1,163 +1,150 @@ -# -# Build targets -# -A_LIBRARIES := libdsme -SO_LIBRARIES := libdsme libdsme_dbus_if libthermalmanager_dbus_if -BINARIES := ut_libdsme - -VERSION := 0.62.0 - -# -# Install files in this directory -# -INSTALL_PERM := 644 -INSTALL_OWNER := $(shell id -u) -INSTALL_GROUP := $(shell id -g) - -INSTALL_A_LIBRARIES := libdsme.a -$(INSTALL_A_LIBRARIES) : INSTALL_DIR := $(DESTDIR)/usr/lib -INSTALL_SO_LIBRARIES := libdsme.so \ - libdsme_dbus_if.so \ - libthermalmanager_dbus_if.so -$(INSTALL_SO_LIBRARIES): INSTALL_PERM := 755 -$(INSTALL_SO_LIBRARIES): INSTALL_DIR := $(DESTDIR)/usr/lib -INSTALL_INCLUDES := include/dsme/protocol.h \ - include/dsme/messages.h \ - include/dsme/alarm_limit.h \ - include/dsme/processwd.h \ - include/dsme/state.h \ - include/dsme/state_states.h \ - modules/dsme_dbus_if.h \ - modules/thermalmanager_dbus_if.h -$(INSTALL_INCLUDES) : INSTALL_DIR := $(DESTDIR)/usr/include/dsme -#INSTALL_OTHER := README -#README: INSTALL_DIR := $(DESTDIR)/usr/share/doc/dsme -INSTALL_OTHER := dsme.pc \ - dsme_dbus_if.pc \ - thermalmanager_dbus_if.pc -dsme.pc : INSTALL_DIR := $(DESTDIR)/usr/lib/pkgconfig -dsme_dbus_if.pc : INSTALL_DIR := $(DESTDIR)/usr/lib/pkgconfig -thermalmanager_dbus_if.pc : INSTALL_DIR := $(DESTDIR)/usr/lib/pkgconfig - -INSTALL_TEST_BINARIES := ut_libdsme -$(INSTALL_TEST_BINARIES) : INSTALL_DIR := $(DESTDIR)/opt/tests/libdsme -$(INSTALL_TEST_BINARIES) : INSTALL_PERM := 755 -INSTALL_TEST_DEFINITION := tests/tests.xml -$(INSTALL_TEST_DEFINITION): INSTALL_DIR := $(DESTDIR)/opt/tests/libdsme -INSTALL_OTHER += $(INSTALL_TEST_BINARIES) \ - $(INSTALL_TEST_DEFINITION) - -# -# Compiler and tool flags -# C_OPTFLAGS are not used for debug builds (ifdef DEBUG) -# C_DBGFLAGS are not used for normal builds -# -C_GENFLAGS := -DPRG_VERSION=$(VERSION) -pthread -g \ - -Wall -Wwrite-strings -Wmissing-prototypes -Werror# -pedantic -C_OPTFLAGS := -O2 -s -C_DBGFLAGS := -g -DDEBUG -DDSME_LOG_ENABLE -C_DEFINES := DSME_POSIX_TIMER DSME_WD_SYNC DSME_BMEIPC -C_INCDIRS := $(TOPDIR)/include $(TOPDIR)/modules $(TOPDIR) -MKDEP_INCFLAGS := $$(pkg-config --cflags-only-I glib-2.0) - -LD_GENFLAGS := -pthread -LD_LIBPATHS := $(TOPDIR) - -# If OSSO_DEBUG is defined, compile in the logging -#ifdef OSSO_LOG -C_OPTFLAGS += -DDSME_LOG_ENABLE -#endif - -ifneq (,$(findstring DSME_BMEIPC,$(C_DEFINES))) -export DSME_BMEIPC = yes -endif - -ifneq (,$(findstring DSME_MEMORY_THERMAL_MGMT,$(C_DEFINES))) -export DSME_MEMORY_THERMAL_MGMT = yes -endif - -# -# Target composition and overrides -# - - -# libdsme.so and libdsme.a -protocol.o : C_EXTRA_GENFLAGS := -fPIC $$(pkg-config --cflags glib-2.0) -message.o : C_EXTRA_GENFLAGS := -fPIC -alarm_limit.o : C_EXTRA_GENFLAGS := -fPIC -libdsme_C_OBJS := protocol.o message.o alarm_limit.o -libdsme_EXTRA_LDFLAGS := $$(pkg-config --libs glib-2.0) -libdsme.so : LIBRARY_VERSION := 0.2.0 - -# libdsme_dbus_if.so -libdsme_dbus_if_C_OBJS := modules/dsme_dbus_if.o -modules/dsme_dbus_if.o: C_EXTRA_GENFLAGS := -fPIC -libdsme_dbus_if.so : LIBRARY_VERSION := 0.2.0 - -# libthermalmanager_dbus_if.so -libthermalmanager_dbus_if_C_OBJS := modules/thermalmanager_dbus_if.o -modules/thermalmanager_dbus_if.o: C_EXTRA_GENFLAGS := -fPIC -libthermalmanager_dbus_if.so : LIBRARY_VERSION := 0.2.0 +# Package version +VERSION := 0.64.1 +# Shared object version +SOMAJOR := .0 +SOMINOR := .3 +SORELEASE := .0 + +SOLINK := .so +SONAME := .so$(SOMAJOR) +SOVERS := .so$(SOMAJOR)$(SOMINOR)$(SORELEASE) + +# Files to build / install +TARGETS_LIB += libdsme.a + +TARGETS_DSO += libdsme$(SOVERS) +TARGETS_DSO += libdsme_dbus_if$(SOVERS) +TARGETS_DSO += libthermalmanager_dbus_if$(SOVERS) + +INSTALL_HDR += include/dsme/protocol.h +INSTALL_HDR += include/dsme/messages.h +INSTALL_HDR += include/dsme/alarm_limit.h +INSTALL_HDR += include/dsme/processwd.h +INSTALL_HDR += include/dsme/state.h +INSTALL_HDR += include/dsme/state_states.h +INSTALL_HDR += modules/dsme_dbus_if.h +INSTALL_HDR += modules/thermalmanager_dbus_if.h + +INSTALL_PC += dsme.pc +INSTALL_PC += dsme_dbus_if.pc +INSTALL_PC += thermalmanager_dbus_if.pc + +TARGETS_UT_BIN += tests/ut_libdsme +INSTALL_UT_XML += tests/tests.xml + +TARGETS_ALL += $(TARGETS_LIB) $(TARGETS_DSO) $(TARGETS_UT_BIN) + +# Dummy default install dir - override from packaging scripts +DESTDIR ?= /tmp/libdsme-test-install + +# ---------------------------------------------------------------------------- +# Top level targets +# ---------------------------------------------------------------------------- + +.PHONY: build install clean distclean mostlyclean + +build:: $(TARGETS_ALL) + +install:: build + +clean:: mostlyclean + $(RM) $(TARGETS_ALL) + +distclean:: clean + +mostlyclean:: + $(RM) .o ~ /.o /~ + +install :: install_main install_devel install_tests + +install_main:: + # dynamic libraries + install -d -m 755 $(DESTDIR)/usr/lib + install -m 644 $(TARGETS_DSO) $(DESTDIR)/usr/lib + +install_devel:: + # headers + install -d -m 755 $(DESTDIR)/usr/include/dsme + install -m 644 $(INSTALL_HDR) $(DESTDIR)/usr/include/dsme + # pkg config + install -d -m 755 $(DESTDIR)/usr/lib/pkgconfig + install -m 644 $(INSTALL_PC) $(DESTDIR)/usr/lib/pkgconfig + # static libraries + install -d -m 755 $(DESTDIR)/usr/lib + install -m 644 $(TARGETS_LIB) $(DESTDIR)/usr/lib + # symlinks for dynamic linking + for f in $(TARGETS_DSO); do \ + ln -sf $$(basename $$f $(SOVERS))$(SONAME) \ + $(DESTDIR)/usr/lib/$$(basename $$f $(SOVERS))$(SOLINK); \ + done + +install_tests:: + # xml + install -d -m 755 $(DESTDIR)/opt/tests/libdsme + install -m644 $(INSTALL_UT_XML) $(DESTDIR)/opt/tests/libdsme + # binary + install -m755 $(TARGETS_UT_BIN) $(DESTDIR)/opt/tests/libdsme + +# ---------------------------------------------------------------------------- +# Build rules +# ---------------------------------------------------------------------------- + +%.pic.o : %.c ; $(CC) -o $@ -c $< -fPIC $(CPPFLAGS) $(CFLAGS) +%.o : %.c ; $(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS) +%$(SOVERS) : ; $(CC) -o $@ -shared -Wl,-soname,$*$(SONAME) $^ $(LDFLAGS) $(LDLIBS) +% : %.o ; $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) +%.a : ; $(AR) ru $@ $^ + +# ----------------------------------------------------------------------------
[-] [+]	Changed	_service:tar_git:libdsme-0.64.1.tar.bz2/alarm_limit.c ^
@@ -22,7 +22,7 @@ License along with Dsme. If not, see <http://www.gnu.org/licenses/>. / -#include "dsme/alarm_limit.h" +#include "include/dsme/alarm_limit.h" #define SNOOZE_TIMEOUT 120 / 2 minutes */
[-] [+]	Changed	_service:tar_git:libdsme-0.64.1.tar.bz2/debian/changelog ^
@@ -1,3 +1,25 @@ +libdsme (0.64.1) unstable; urgency=low + + * [packaging] Add missing execute bit to unit test binary. Fixes JB#29776 + * [packaging] Make rpms own the directories where files are installed. + Contributes to JB#29776 + + -- Simo Piiroinen <simo.piiroinen@jollamobile.com> Wed, 10 Jun 2015 10:03:43 +0300 + +libdsme (0.64.0) unstable; urgency=low + + * [packaging] Use wildcards for filename matching (Contributes to JB#12048) + * [spec] Remove spectacle cruft (Contributes to JB#12048) + * [build] Rewrite Makefile + * [cleanup] Remove .gitignore + * [packaging] Fix soname used by the libraries. Contributes to JB#12048 + * [packaging] Bring version number in Makefile up to date + * [packaging] Make sure the various version numbers stay in sync + * [build] Bump dynamic library versions to 0.3.0. Contributes to JB#12048 + * [cleanup] Remove unsused .todo file + + -- Simo Piiroinen <simo.piiroinen@jollamobile.com> Thu, 04 Jun 2015 11:30:45 +0300 + libdsme (0.61.6) unstable; urgency=low * add dsme_snooze_timeout_in_seconds() (Fixes: NB#218425)
[-] [+]	Changed	_service:tar_git:libdsme-0.64.1.tar.bz2/debian/libdsme0.2.0.install ^
@@ -1,3 +1,3 @@ -debian/tmp/usr/lib/libdsme.so.0.2.0 -debian/tmp/usr/lib/libdsme_dbus_if.so.0.2.0 -debian/tmp/usr/lib/libthermalmanager_dbus_if.so.0.2.0 +debian/tmp/usr/lib/libdsme.so.* +debian/tmp/usr/lib/libdsme_dbus_if.so.* +debian/tmp/usr/lib/libthermalmanager_dbus_if.so.*
[-] [+]	Changed	_service:tar_git:libdsme-0.64.1.tar.bz2/dsme.pc ^
@@ -4,7 +4,7 @@ Name: dsme Description: DSME dsmesock dynamic library -Version: 0.63.2 +Version: 0.64.1 Requires: Libs: -L${libdir} -ldsme Cflags: -I${includedir}
[-] [+]	Changed	_service:tar_git:libdsme-0.64.1.tar.bz2/dsme_dbus_if.pc ^
@@ -4,7 +4,7 @@ Name: dsme_dbus_if Description: DSME D-Bus interface dynamic library -Version: 0.63.2 +Version: 0.64.1 Requires: Libs: -L${libdir} -ldsme_dbus_if Cflags: -I${includedir}
[-] [+]	Changed	_service:tar_git:libdsme-0.64.1.tar.bz2/include/dsme/state.h ^
@@ -30,7 +30,7 @@ #define _GNU_SOURCE #endif -#include "dsme/messages.h" +#include "messages.h" #include <stdbool.h> /**
[-] [+]	Changed	_service:tar_git:libdsme-0.64.1.tar.bz2/message.c ^
@@ -22,7 +22,7 @@ License along with Dsme. If not, see <http://www.gnu.org/licenses/>. */ -#include "dsme/messages.h" +#include "include/dsme/messages.h" #include <stdlib.h>
[-] [+]	Changed	_service:tar_git:libdsme-0.64.1.tar.bz2/protocol.c ^
@@ -27,8 +27,8 @@ #define _GNU_SOURCE #endif -#include "dsme/protocol.h" -#include "dsme/messages.h" +#include "include/dsme/protocol.h" +#include "include/dsme/messages.h" #include <glib.h> #include <sys/types.h>
[-] [+]	Changed	_service:tar_git:libdsme-0.64.1.tar.bz2/tests/ut_libdsme.c ^
@@ -39,9 +39,9 @@ #include <sys/stat.h> #include <sys/wait.h> -#include "dsme/messages.h" -#include "dsme/protocol.h" -#include "dsme/state.h" +#include "../include/dsme/messages.h" +#include "../include/dsme/protocol.h" +#include "../include/dsme/state.h" static const char* const TMP_SOCKFILE = "/tmp/ut_libdsme.sock";
[-] [+]	Changed	_service:tar_git:libdsme-0.64.1.tar.bz2/thermalmanager_dbus_if.pc ^
@@ -4,7 +4,7 @@ Name: thermalmanager_dbus_if Description: Thermal Manager D-Bus interface dynamic library -Version: 0.63.2 +Version: 0.64.1 Requires: Libs: -L${libdir} -lthermalmanager_dbus_if Cflags: -I${includedir}
[-] [+]	Added	_service:tar_git:libdsme-0.64.1.tar.bz2/verify_version ^
@@ -0,0 +1,55 @@ +#!/bin/sh + +# Check that all files that should have the current version agree on it + +# Makefile has the version that other sources must match +MASTER_PATH=Makefile +MASTER_VERS=$(grep '^VERSION.:=' $MASTER_PATH \|sed -e 's/^.:=[[:space:]]//') + +# Assume success +RES=0 + +# Check debian/changelog (only warn on mismatch) +DEB_PATH=debian/changelog +DEB_VERS=$(head -1 $DEB_PATH \| sed -e 's/^.(//' -e 's/).$//') + +if [ "$DEB_VERS" != "$MASTER_VERS" ]; then + echo >&2 "$MASTER_PATH $MASTER_VERS vs $DEB_PATH $DEB_VERS (ignored)" +fi + +# Check rpm/libdsme.rpm +RPM_PATH=${RPM_SOURCE_DIR:-rpm}/${RPM_PACKAGE_NAME:-libdsme}.spec +RPM_VERS=$(grep '^Version:' $RPM_PATH \|sed -e 's/^.:[[:space:]]//') +# Remove initial part of rpm version that equals with version from Makefile +RPM_XTRA=${RPM_VERS#$MASTER_VERS} +# From that remove initial part that equals with version from spec-file +RPM_XTRA=${RPM_XTRA#$RPM_VERS} +# If the result is non-empty string, then OBS is doing +# delta-after-matching-tag kind of build, which is ok. +# But empty string means that spec and Makefile are completely +# out of sync, which is bad. + +if [ "$RPM_VERS" != "$MASTER_VERS" ]; then + if [ -z "$RPM_XTRA" ]; then + echo >&2 "$MASTER_PATH $MASTER_VERS vs $RPM_PATH $RPM_VERS" + RES=1 + else + echo "(ignoring patch level in spec file: $RPM_XTRA)" + fi +fi + +# Check pkgconfig files +for PC_PATH in dsme.pc dsme_dbus_if.pc thermalmanager_dbus_if.pc; do + PC_VERS=$(grep '^Version:' $PC_PATH \|sed -e 's/^.:[[:space:]]*//') + if [ "$PC_VERS" != "$MASTER_VERS" ]; then + echo >&2 "$MASTER_PATH $MASTER_VERS vs $PC_PATH $PC_VERS" + RES=1 + fi +done + +# Done +if [ $RES -ne 0 ]; then + echo >&2 "Conflicting package versions" +fi + +exit $RES