- Updated copyright headers into the New Year (2024).

CMakeLists.txt

@@ -3,42 +3,34 @@ cmake_minimum_required (VERSION 3.13)
 project (qsampler
   VERSION 0.9.12
   DESCRIPTION "A LinuxSampler Qt GUI Interface"
+  HOMEPAGE_URL "https://qsampler.sourceforge.io"
   LANGUAGES C CXX)
 
-set (CONFIG_VERSION ${PROJECT_VERSION})
 execute_process (
   COMMAND git describe --tags --dirty --abbrev=6
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
   OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
   RESULT_VARIABLE GIT_DESCRIBE_RESULT
   OUTPUT_STRIP_TRAILING_WHITESPACE)
 if (GIT_DESCRIBE_RESULT EQUAL 0)
-  set (VERSION "${GIT_DESCRIBE_OUTPUT}")
-  string (REGEX REPLACE "^[^0-9]+" "" VERSION "${VERSION}")
-  string (REGEX REPLACE "^1_"      "" VERSION "${VERSION}")
-  string (REGEX REPLACE "^[_vV]+"  "" VERSION "${VERSION}")
-  string (REGEX REPLACE "-g"   "git." VERSION "${VERSION}")
-  string (REGEX REPLACE "[_|-]"   "." VERSION "${VERSION}")
+  set (GIT_VERSION "${GIT_DESCRIBE_OUTPUT}")
+  string (REGEX REPLACE "^[^0-9]+" "" GIT_VERSION "${GIT_VERSION}")
+  string (REGEX REPLACE "^1_"      "" GIT_VERSION "${GIT_VERSION}")
+  string (REGEX REPLACE "^[_vV]+"  "" GIT_VERSION "${GIT_VERSION}")
+  string (REGEX REPLACE "-g"   "git." GIT_VERSION "${GIT_VERSION}")
+  string (REGEX REPLACE "[_|-]"   "." GIT_VERSION "${GIT_VERSION}")
   execute_process (
     COMMAND git rev-parse --abbrev-ref HEAD
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     OUTPUT_VARIABLE GIT_REVPARSE_OUTPUT
     RESULT_VARIABLE GIT_REVPARSE_RESULT
     OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if (GIT_REVPARSE_RESULT EQUAL 0 AND NOT GIT_REVPARSE_OUTPUT STREQUAL "master")
-    set (VERSION "${VERSION} [${GIT_REVPARSE_OUTPUT}]")
+  if (GIT_REVPARSE_RESULT EQUAL 0 AND NOT GIT_REVPARSE_OUTPUT STREQUAL "main")
+    set (GIT_VERSION "${GIT_VERSION} [${GIT_REVPARSE_OUTPUT}]")
   endif ()
-else ()
-  set (VERSION "${PROJECT_VERSION}")
+  set (PROJECT_VERSION "${GIT_VERSION}")
 endif ()
 
-set (PACKAGE_NAME "Qsampler")
-set (PACKAGE_VERSION "${VERSION}")
-set (PACKAGE_BUGREPORT "rncbc@rncbc.org")
-set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
-set (PACKAGE_TARNAME "qsampler")
-
-set (CONFIG_BUILD_VERSION "${PACKAGE_VERSION}")
 
 if (CMAKE_BUILD_TYPE MATCHES "Debug")
   set (CONFIG_DEBUG 1)

ChangeLog

@@ -6,7 +6,7 @@ ChangeLog
 
 GIT HEAD
 
-- Bumping into next development cycle (Qt >= 6.6)
+- Updated copyright headers into the New Year (2024).
 
 
 0.9.11  2023-09-09  An End-of-Summer'23 Release.

debian/copyright

@@ -4,7 +4,7 @@ Upstream-Contact: Rui Nuno Capela <rncbc@rncbc.org>
 Source: https://qsampler.sourceforge.io
 
 Files: *
-Copyright: 2004-2023 Rui Nuno Capela <rncbc@rncbc.org>
+Copyright: 2004-2024 Rui Nuno Capela <rncbc@rncbc.org>
            2007,2008,2015 Christian Schoenebeck
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@ License: GPL-2+
  License can be found in /usr/share/common-licenses/GPL-2.
 
 Files: src/appdata/*
-Copyright: 2004-2023 Rui Nuno Capela <rncbc@rncbc.org>
+Copyright: 2004-2024 Rui Nuno Capela <rncbc@rncbc.org>
 License: FSFAP
  Copying and distribution of this file, with or without modification,
  are permitted in any medium without royalty provided the copyright

rpm/qsampler.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qsampler
 #
-# Copyright (C) 2004-2023, rncbc aka Rui Nuno Capela. All rights reserved.
+# Copyright (C) 2004-2024, rncbc aka Rui Nuno Capela. All rights reserved.
 # Copyright (C) 2007,2008,2015 Christian Schoenebeck
 #
 # All modifications and additions to the file contributed by third parties

src/appdata/org.rncbc.qsampler.metainfo.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2004-2022 Rui Nuno Capela <rncbc@rncbc.org> -->
+<!-- Copyright 2004-2024 Rui Nuno Capela <rncbc@rncbc.org> -->
 <component type="desktop">
  <id>org.rncbc.qsampler</id>
  <metadata_license>FSFAP</metadata_license>

src/config.h.cmake

@@ -1,26 +1,17 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-/* Define to the full name of this package. */
-#cmakedefine PACKAGE_NAME "@PACKAGE_NAME@"
-
-/* Define to the full name and version of this package. */
-#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@"
+/* Define to the name of this package. */
+#cmakedefine PROJECT_NAME "@PROJECT_NAME@"
 
 /* Define to the version of this package. */
-#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
-
-/* Define to the address where bug reports for this package should be sent. */
-#cmakedefine PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
+#cmakedefine PROJECT_VERSION "@PROJECT_VERSION@"
 
-/* Define to the one symbol short name of this package. */
-#cmakedefine PACKAGE_TARNAME "@PACKAGE_TARNAME@"
-
-/* Define to the version of this package. */
-#cmakedefine CONFIG_VERSION "@CONFIG_VERSION@"
+/* Define to the description of this package. */
+#cmakedefine PROJECT_DESCRIPTION "@PROJECT_DESCRIPTION@"
 
-/* Define to the build version of this package. */
-#cmakedefine CONFIG_BUILD_VERSION "@CONFIG_BUILD_VERSION@"
+/* Define to the homepage of this package. */
+#cmakedefine PROJECT_HOMEPAGE_URL "@PROJECT_HOMEPAGE_URL@"
 
 /* Default installation prefix. */
 #cmakedefine CONFIG_PREFIX "@CONFIG_PREFIX@"

src/qsampler.cpp

@@ -1,7 +1,7 @@
 // qsampler.cpp
 //
 /****************************************************************************
-   Copyright (C) 2004-2023, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2004-2024, rncbc aka Rui Nuno Capela. All rights reserved.
    Copyright (C) 2007,2008,2015,2019 Christian Schoenebeck
 
    This program is free software; you can redistribute it and/or
@@ -141,9 +141,9 @@ qsamplerApplication::qsamplerApplication ( int& argc, char **argv )
 	//	QSAMPLER_TITLE " - " + QObject::tr(QSAMPLER_SUBTITLE));
 #if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
 	QApplication::setDesktopFileName(
-		QString("org.rncbc.%1").arg(PACKAGE_TARNAME));
+		QString("org.rncbc.%1").arg(PROJECT_NAME));
 #endif
-	QString sVersion(CONFIG_BUILD_VERSION);
+	QString sVersion(PROJECT_VERSION);
 	sVersion += '\n';
 	sVersion += QString("Qt: %1").arg(qVersion());
 #if defined(QT_STATIC)

src/qsampler.h

@@ -1,7 +1,7 @@
 // qsampler.h
 //
 /****************************************************************************
-   Copyright (C) 2003-2023, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2003-2024, rncbc aka Rui Nuno Capela. All rights reserved.
    Copyright (C) 2007,2008,2015,2019 Christian Schoenebeck
 
    This program is free software; you can redistribute it and/or

src/qsamplerAbout.h

@@ -1,7 +1,7 @@
 // qsamplerAbout.h
 //
 /****************************************************************************
-   Copyright (C) 2004-2023, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2004-2024, rncbc aka Rui Nuno Capela. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -24,14 +24,14 @@
 
 #include "config.h"
 
-#define QSAMPLER_TITLE        PACKAGE_NAME
+#define QSAMPLER_TITLE      "Qsampler"
 
-#define QSAMPLER_SUBTITLE     "A LinuxSampler Qt GUI Interface"
-#define QSAMPLER_WEBSITE      "https://qsampler.sourceforge.io"
-#define QSAMPLER_COPYRIGHT    "Copyright (C) 2004-2023, rncbc aka Rui Nuno Capela. All rights reserved."
-#define QSAMPLER_COPYRIGHT2   "Copyright (C) 2007-2019, Christian Schoenebeck"
+#define QSAMPLER_SUBTITLE   PROJECT_DESCRIPTION
+#define QSAMPLER_WEBSITE    PROJECT_HOMEPAGE_URL
 
-#define QSAMPLER_DOMAIN       "linuxsampler.org"
+#define QSAMPLER_COPYRIGHT  "Copyright (C) 2004-2024, rncbc aka Rui Nuno Capela. All rights reserved."
+#define QSAMPLER_COPYRIGHT2 "Copyright (C) 2007-2019, Christian Schoenebeck"
+#define QSAMPLER_DOMAIN     "linuxsampler.org"
 
 #endif  // __qsamplerAbout_h