Compare commits

...

9 Commits

Author SHA1 Message Date
Dennis Klein
21904a8ea1 Release 1.5.0-4ubuntu1 2019-08-10 02:49:23 +02:00
Dennis Klein
be311a5c87 Depend on Boost 1.67 2019-08-10 02:48:35 +02:00
Dennis Klein
19e18ca05c Release 1.5.0-4 2019-08-10 01:46:25 +02:00
Dennis Klein
8cb955837e Refine package descriptions 2019-08-10 01:44:28 +02:00
Dennis Klein
ad55efc82b Release 1.5.0-3 2019-08-10 01:05:33 +02:00
Dennis Klein
210e1aa0b0 Fix dependency 2019-08-10 01:04:29 +02:00
Dennis Klein
b5a00887cd Release 1.5.0-2 2019-08-10 00:43:31 +02:00
Dennis Klein
6c41eceb05 Fix lib package 2019-08-10 00:43:43 +02:00
Dennis Klein
54e0ac2a83 Release 1.5.0-1 2019-08-10 00:43:31 +02:00
12 changed files with 190 additions and 0 deletions

29
debian/changelog vendored Normal file
View File

@@ -0,0 +1,29 @@
fairlogger (1.5.0-4ubuntu1) disco; urgency=medium
* Depend on Boost 1.67
-- Dennis Klein <d.klein@gsi.de> Sat, 10 Aug 2019 02:49:02 +0200
fairlogger (1.5.0-4) bionic; urgency=low
* Refine package descriptions
-- Dennis Klein <d.klein@gsi.de> Sat, 10 Aug 2019 01:44:53 +0200
fairlogger (1.5.0-3) bionic; urgency=high
* Fix dependency
-- Dennis Klein <d.klein@gsi.de> Sat, 10 Aug 2019 01:04:53 +0200
fairlogger (1.5.0-2) bionic; urgency=high
* Fix lib package
-- Dennis Klein <d.klein@gsi.de> Sat, 10 Aug 2019 00:41:10 +0200
fairlogger (1.5.0-1) bionic; urgency=medium
* Initial release
-- Dennis Klein <d.klein@gsi.de> Fri, 09 Aug 2019 19:43:33 +0200

1
debian/compat vendored Normal file
View File

@@ -0,0 +1 @@
10

26
debian/control vendored Normal file
View File

@@ -0,0 +1,26 @@
Source: fairlogger
Priority: optional
Maintainer: Dennis Klein <d.klein@gsi.de>
Build-Depends: debhelper (>= 10), cmake (>= 3.9.4), libboost1.67-dev
Standards-Version: 4.1.2
Section: libs
Homepage: https://github.com/FairRootGroup/FairLogger
Vcs-Git: https://github.com/FairRootGroup/FairLogger
Vcs-Browser: https://github.com/FairRootGroup/FairLogger
Package: fairlogger1
Architecture: amd64
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Lightweight and fast C++ Logging Library
* Log to stdout, file, and/or custom sinks.
* Configurable verbosity and severity levels.
* Thread-safe ostream logging via convenient LOG(severity) macro.
Package: fairlogger-dev
Architecture: amd64
Multi-Arch: same
Section: libdevel
Depends: fairlogger1, libboost1.67-dev, ${shlibs:Depends}, ${misc:Depends}
Description: FairLogger development files
This package provides the development header files and the CMake package.

30
debian/copyright vendored Normal file
View File

@@ -0,0 +1,30 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: FairLogger
Source: https://github.com/FairRootGroup/FairLogger
Files: *
Copyright: 2014-2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH
2014-2019 Alexey Rybalchenko <alexryba@gmail.com>
2014-2019 Dennis Klein <d.klein@gsi.de>
License: LGPL-3.0+
Files: debian/*
Copyright: 2019 Dennis Klein <d.klein@gsi.de>
License: LGPL-3.0+
License: LGPL-3.0+
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 3 of the License, or (at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in "/usr/share/common-licenses/LGPL-3".

2
debian/fairlogger-dev.install vendored Normal file
View File

@@ -0,0 +1,2 @@
usr/include/*/*
usr/lib/*/cmake/*

1
debian/fairlogger1.install vendored Normal file
View File

@@ -0,0 +1 @@
usr/lib/*/lib*.so*

View File

@@ -0,0 +1,35 @@
From: Dennis Klein <d.klein@gsi.de>
Date: Fri, 9 Aug 2019 22:16:06 +0200
Subject: CMake: Do not bake git version into installed files
---
CMakeLists.txt | 2 +-
cmake/FairLoggerLib.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 673e2ac..159cda3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ target_include_directories(FairLogger
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
set_target_properties(FairLogger PROPERTIES
- VERSION ${PROJECT_GIT_VERSION}
+ VERSION ${PROJECT_VERSION}
SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
)
diff --git a/cmake/FairLoggerLib.cmake b/cmake/FairLoggerLib.cmake
index b038058..ca4f52f 100644
--- a/cmake/FairLoggerLib.cmake
+++ b/cmake/FairLoggerLib.cmake
@@ -215,7 +215,7 @@ endfunction()
macro(install_cmake_package)
include(CMakePackageConfigHelpers)
set(PACKAGE_INSTALL_DESTINATION
- ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_GIT_VERSION}
+ ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_VERSION}
)
install(EXPORT ${PROJECT_EXPORT_SET}
NAMESPACE ${PROJECT_NAME}::

View File

@@ -0,0 +1,26 @@
From: Dennis Klein <d.klein@gsi.de>
Date: Fri, 9 Aug 2019 22:18:31 +0200
Subject: CMake: Disable relative install RPATH
---
cmake/FairLoggerLib.cmake | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/cmake/FairLoggerLib.cmake b/cmake/FairLoggerLib.cmake
index ca4f52f..d15d163 100644
--- a/cmake/FairLoggerLib.cmake
+++ b/cmake/FairLoggerLib.cmake
@@ -131,11 +131,9 @@ macro(set_fairlogger_defaults)
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "-Wl,--enable-new-dtags")
set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-Wl,--enable-new-dtags")
- set(CMAKE_INSTALL_RPATH "$ORIGIN/../${PROJECT_INSTALL_LIBDIR}")
+ # set(CMAKE_INSTALL_RPATH "$ORIGIN/../${PROJECT_INSTALL_LIBDIR}")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
- set(CMAKE_INSTALL_RPATH "@loader_path/../${PROJECT_INSTALL_LIBDIR}")
- else()
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR}")
+ # set(CMAKE_INSTALL_RPATH "@loader_path/../${PROJECT_INSTALL_LIBDIR}")
endif()
endif()

View File

@@ -0,0 +1,21 @@
From: Dennis Klein <d.klein@gsi.de>
Date: Fri, 9 Aug 2019 22:24:46 +0200
Subject: CMake: Workaround broken pristine tar
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 159cda3..7a457cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ cmake_policy(VERSION 3.9...3.14)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
include(FairLoggerLib)
-get_git_version()
+get_git_version(DEFAULT_VERSION 1.5.0)
project(FairLogger VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${PROJECT_GIT_VERSION} from ${PROJECT_DATE}")

3
debian/patches/series vendored Normal file
View File

@@ -0,0 +1,3 @@
0001-CMake-Do-not-bake-git-version-into-installed-files.patch
0002-CMake-Disable-relative-install-RPATH.patch
0003-CMake-Workaround-broken-pristine-tar.patch

15
debian/rules vendored Executable file
View File

@@ -0,0 +1,15 @@
#!/usr/bin/make -f
# output every command that modifies files on the build system.
export DH_VERBOSE = 1
%:
dh $@ --builddirectory=build
override_dh_auto_configure:
mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTING=OFF -DUSE_BOOST_PRETTY_FUNCTION=ON -DCMAKE_BUILD_TYPE=Release ..
override_dh_auto_build:
cd build && make
override_dh_auto_install:
cd build && make install DESTDIR=../debian/tmp

1
debian/source/format vendored Normal file
View File

@@ -0,0 +1 @@
3.0 (quilt)