From 0357e056234f5dea38935f555c80dd215b3bfa31 Mon Sep 17 00:00:00 2001 From: "P.M. Kuipers" Date: Mon, 9 Jan 2023 22:07:54 +0100 Subject: [PATCH] Version bump and script tweak --- Makefile | 56 +++++++++++++++++++++++++------------------------- config.hpp | 4 ++-- configure.ac | 2 +- debpackager.sh | 1 + version.py | 2 +- 5 files changed, 33 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index f1ca44a..c224c80 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.hpp CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(init_d_dirdir)" \ +am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(systemddir)" \ "$(DESTDIR)$(dbus_confdir)" "$(DESTDIR)$(rsyslog_confdir)" PROGRAMS = $(sbin_PROGRAMS) am__dirstamp = $(am__leading_dot)dirstamp @@ -148,7 +148,7 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -SCRIPTS = $(init_d_dir_SCRIPTS) +SCRIPTS = $(systemd_SCRIPTS) AM_V_P = $(am__v_P_$(V)) am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY)) am__v_P_0 = false @@ -295,10 +295,10 @@ OBJEXT = o PACKAGE = mediacore-hid PACKAGE_BUGREPORT = bugs@miqra.nl PACKAGE_NAME = MediaCore HID Server -PACKAGE_STRING = MediaCore HID Server 4.1.0 +PACKAGE_STRING = MediaCore HID Server 4.1.1 PACKAGE_TARNAME = mediacore-hid PACKAGE_URL = http://www.miqra.nl/ -PACKAGE_VERSION = 4.1.0 +PACKAGE_VERSION = 4.1.1 PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config PKG_CONFIG_LIBDIR = @@ -306,7 +306,7 @@ PKG_CONFIG_PATH = SET_MAKE = SHELL = /bin/bash STRIP = -VERSION = 4.1.0 +VERSION = 4.1.1 abs_builddir = /home/pi/mediacore-hid abs_srcdir = /home/pi/mediacore-hid abs_top_builddir = /home/pi/mediacore-hid @@ -379,12 +379,12 @@ SUPPORT_SRC = src/log/log.hpp \ src/gpio/mailbox.c EXTRA_DIST = cfg/dbus/nl.miqra.MediaCore.Hid.conf \ - cfg/init.d/mediacore-hid.in \ + lib/systemd/system/mediacore-hid.service.in \ cfg/rsyslog/syslog.MediaCore.Hid.conf \ src/mc-hid-introspect.xml -init_d_dirdir = $(sysconfdir)/init.d -init_d_dir_SCRIPTS = cfg/init.d/mediacore-hid +systemddir = /lib/systemd/system/mediacore-hid.service +systemd_SCRIPTS = lib/systemd/system/mediacore-hid.service dbus_confdir = $(sysconfdir)/dbus-1/system.d dbus_conf_DATA = cfg/dbus/nl.miqra.MediaCore.Hid.conf rsyslog_confdir = $(sysconfdir)/rsyslog.d @@ -553,12 +553,12 @@ src/gpio/mediacore_hid_server-mailbox.$(OBJEXT): \ mediacore-hid-server$(EXEEXT): $(mediacore_hid_server_OBJECTS) $(mediacore_hid_server_DEPENDENCIES) $(EXTRA_mediacore_hid_server_DEPENDENCIES) @rm -f mediacore-hid-server$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(mediacore_hid_server_OBJECTS) $(mediacore_hid_server_LDADD) $(LIBS) -install-init_d_dirSCRIPTS: $(init_d_dir_SCRIPTS) +install-systemdSCRIPTS: $(systemd_SCRIPTS) @$(NORMAL_INSTALL) - @list='$(init_d_dir_SCRIPTS)'; test -n "$(init_d_dirdir)" || list=; \ + @list='$(systemd_SCRIPTS)'; test -n "$(systemddir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(init_d_dirdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(init_d_dirdir)" || exit 1; \ + echo " $(MKDIR_P) '$(DESTDIR)$(systemddir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(systemddir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -577,17 +577,17 @@ install-init_d_dirSCRIPTS: $(init_d_dir_SCRIPTS) while read type dir files; do \ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(init_d_dirdir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(init_d_dirdir)$$dir" || exit $$?; \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(systemddir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(systemddir)$$dir" || exit $$?; \ } \ ; done -uninstall-init_d_dirSCRIPTS: +uninstall-systemdSCRIPTS: @$(NORMAL_UNINSTALL) - @list='$(init_d_dir_SCRIPTS)'; test -n "$(init_d_dirdir)" || exit 0; \ + @list='$(systemd_SCRIPTS)'; test -n "$(systemddir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(init_d_dirdir)'; $(am__uninstall_files_from_dir) + dir='$(DESTDIR)$(systemddir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1032,7 +1032,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.hpp installdirs: - for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(init_d_dirdir)" "$(DESTDIR)$(dbus_confdir)" "$(DESTDIR)$(rsyslog_confdir)"; do \ + for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(systemddir)" "$(DESTDIR)$(dbus_confdir)" "$(DESTDIR)$(rsyslog_confdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1110,8 +1110,8 @@ info: info-am info-am: -install-data-am: install-dbus_confDATA install-init_d_dirSCRIPTS \ - install-rsyslog_confDATA +install-data-am: install-dbus_confDATA install-rsyslog_confDATA \ + install-systemdSCRIPTS install-dvi: install-dvi-am @@ -1165,8 +1165,8 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dbus_confDATA uninstall-init_d_dirSCRIPTS \ - uninstall-rsyslog_confDATA uninstall-sbinPROGRAMS +uninstall-am: uninstall-dbus_confDATA uninstall-rsyslog_confDATA \ + uninstall-sbinPROGRAMS uninstall-systemdSCRIPTS .MAKE: all check install install-am install-strip @@ -1180,15 +1180,15 @@ uninstall-am: uninstall-dbus_confDATA uninstall-init_d_dirSCRIPTS \ install install-am install-data install-data-am \ install-dbus_confDATA install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ - install-info-am install-init_d_dirSCRIPTS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-rsyslog_confDATA install-sbinPROGRAMS install-strip \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-rsyslog_confDATA \ + install-sbinPROGRAMS install-strip install-systemdSCRIPTS \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-dbus_confDATA \ - uninstall-init_d_dirSCRIPTS uninstall-rsyslog_confDATA \ - uninstall-sbinPROGRAMS + uninstall-rsyslog_confDATA uninstall-sbinPROGRAMS \ + uninstall-systemdSCRIPTS .PRECIOUS: Makefile @@ -1196,7 +1196,7 @@ uninstall-am: uninstall-dbus_confDATA uninstall-init_d_dirSCRIPTS \ src/mc-hid-server-glue.hpp: src/mc-hid-introspect.xml dbusxx-xml2cpp $^ --adaptor=$@ -cfg/init.d/mediacore-hid: cfg/init.d/mediacore-hid.in +lib/systemd/system/mediacore-hid.service: lib/systemd/system/mediacore-hid.service.in cat $^ > $@ sed -i "s#@BIN_DIR@#$(bindir)#" $@ sed -i "s#@ETC_DIR@#$(sysconfdir)#" $@ diff --git a/config.hpp b/config.hpp index 191d445..8eb3497 100644 --- a/config.hpp +++ b/config.hpp @@ -11,7 +11,7 @@ #define PACKAGE_NAME "MediaCore HID Server" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "MediaCore HID Server 4.1.0" +#define PACKAGE_STRING "MediaCore HID Server 4.1.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "mediacore-hid" @@ -20,4 +20,4 @@ #define PACKAGE_URL "http://www.miqra.nl/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.1.0" +#define PACKAGE_VERSION "4.1.1" diff --git a/configure.ac b/configure.ac index a7f24a9..fd02873 100755 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([MediaCore HID Server], [4.1.0], [bugs@miqra.nl], [mediacore-hid], [http://www.miqra.nl/]) +AC_INIT([MediaCore HID Server], [4.1.1], [bugs@miqra.nl], [mediacore-hid], [http://www.miqra.nl/]) AC_PREREQ([2.59]) AM_INIT_AUTOMAKE([1.11 no-define foreign subdir-objects]) AC_CONFIG_HEADERS([config.hpp]) diff --git a/debpackager.sh b/debpackager.sh index 98fb7a8..39480d8 100755 --- a/debpackager.sh +++ b/debpackager.sh @@ -1,5 +1,6 @@ #!/bin/bash +rm -r deb_dist rm version.py make version.py python debpackager.py diff --git a/version.py b/version.py index 43ea239..657bc9a 100644 --- a/version.py +++ b/version.py @@ -1,2 +1,2 @@ PACKAGE="mediacore-hid" -VERSION="4.1.0" +VERSION="4.1.1"