[scram] 01/01: Update configurations for the 0.11.5 upstream
Olzhas Rakhimov
rakhimov-guest at moszumanska.debian.org
Mon Dec 12 11:27:01 UTC 2016
This is an automated email from the git hooks/post-receive script.
rakhimov-guest pushed a commit to branch master
in repository scram.
commit 4059aa1053c6e89a874fbd3acea128535193cf0a
Author: rakhimov <ol.rakhimov at gmail.com>
Date: Mon Dec 12 03:17:24 2016 -0800
Update configurations for the 0.11.5 upstream
- Update the changelog
- Use the man page from the doc directly
(this had a typo in the previous release)
- Remove the patch of CMakeLists.txt
and use options provided in the new release
---
debian/changelog | 6 ++
debian/manpages | 2 +-
...-Disable-installation-of-the-libscramcore.patch | 91 ---------------------
debian/patches/series | 1 -
debian/rules | 2 +
debian/scram.1 | 93 ----------------------
6 files changed, 9 insertions(+), 186 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9c83ad4..7f542e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scram (0.11.5-1) UNRELEASED; urgency=medium
+
+ * Incorporate patches from the initial Debian package
+
+ -- Olzhas Rakhimov <ol.rakhimov at gmail.com> Mon, 12 Dec 2016 03:06:48 -0800
+
scram (0.11.4-1) unstable; urgency=low
* Initial Debian Package (Closes: #842766)
diff --git a/debian/manpages b/debian/manpages
index c74e1c3..4e2d032 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1 +1 @@
-debian/scram.1
+doc/scram.1
diff --git a/debian/patches/0001-Disable-installation-of-the-libscramcore.patch b/debian/patches/0001-Disable-installation-of-the-libscramcore.patch
deleted file mode 100644
index ac7a698..0000000
--- a/debian/patches/0001-Disable-installation-of-the-libscramcore.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 7ab531d8de29d0746709f3e4f99f943532ea8d50 Mon Sep 17 00:00:00 2001
-From: rakhimov <ol.rakhimov at gmail.com>
-Date: Thu, 17 Nov 2016 08:59:51 -0800
-Subject: [PATCH] Disable installation of the libscramcore
-
-This should've been an option instead of setting.
-The shared library is not necessary at this stage.
----
- CMakeLists.txt | 4 ++--
- src/CMakeLists.txt | 40 ++++++++++++++++++++--------------------
- 2 files changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8ae6226..e79e952 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,7 +18,7 @@ set(SCRAM_VERSION_MICRO 4) # Bug fixes.
-
- ####################### Begin Options ###################
-
--set(BUILD_SHARED_LIBS TRUE) # Change this for static building.
-+set(BUILD_SHARED_LIBS FALSE) # Change this for static building.
-
- # Linking of external libraries, such as BOOST.
- option(WITH_STATIC_LIBS "Try to link against static libraries" OFF)
-@@ -118,7 +118,7 @@ set(CMAKE_SKIP_BUILD_RPATH FALSE)
- # (but later on when installing).
- set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
--set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+# set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-
- # Add the automatically determined parts of the RPATH,
- # which point to directories outside the build tree
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5c6000c..d33b34d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -54,29 +54,29 @@ set(SCRAM_CORE_SRC
- )
- add_library(scramcore ${SCRAM_CORE_SRC})
-
--set_target_properties(scramcore
-- PROPERTIES
-- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
-- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
-- LINK_FLAGS "${LIB_LINK_FLAGS}"
-- )
-+# set_target_properties(scramcore
-+# PROPERTIES
-+# INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
-+# INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
-+# LINK_FLAGS "${LIB_LINK_FLAGS}"
-+# )
-
- target_link_libraries(scramcore ${LIBS})
-
--if(WIN32)
-- install(
-- TARGETS scramcore
-- RUNTIME DESTINATION bin COMPONENT scram
-- LIBRARY DESTINATION lib COMPONENT scram
-- ARCHIVE DESTINATION lib COMPONENT scram
-- )
--else()
-- install(
-- TARGETS scramcore
-- DESTINATION lib
-- COMPONENT scram
-- )
--endif()
-+# if(WIN32)
-+# install(
-+# TARGETS scramcore
-+# RUNTIME DESTINATION bin COMPONENT scram
-+# LIBRARY DESTINATION lib COMPONENT scram
-+# ARCHIVE DESTINATION lib COMPONENT scram
-+# )
-+# else()
-+# install(
-+# TARGETS scramcore
-+# DESTINATION lib
-+# COMPONENT scram
-+# )
-+# endif()
-
- add_executable(scram scram.cc)
- target_link_libraries(scram scramcore ${Boost_LIBRARIES})
---
-2.7.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f14e14e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Disable-installation-of-the-libscramcore.patch
diff --git a/debian/rules b/debian/rules
index 33c6cc8..372a2ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@ export DEB_LDFLAGS_MAINT_PREPEND = -Wl,-z,defs -Wl,--as-needed
override_dh_auto_configure:
dh_auto_configure -- \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DINSTALL_LIBS=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_GUI=OFF \
-DBUILD_TESTS=OFF
diff --git a/debian/scram.1 b/debian/scram.1
deleted file mode 100644
index 6c685d7..0000000
--- a/debian/scram.1
+++ /dev/null
@@ -1,93 +0,0 @@
-.TH SCRAM "1" "September 2016" "SCRAM 0.11.4" "SCRAM Manual"
-.SH NAME
-SCRAM \- Command-line Risk Analysis Multi-tool
-.SH SYNOPSIS
-.B scram
-[\fIinput-files\fR] [\fIoptions\fR]
-.SH DESCRIPTION
-.PP
-\fBSCRAM\fP is a probabilistic risk analysis (PRA) tool.
-It can perform static fault tree analysis,
-analysis with common cause failure models,
-probability calculations with importance analysis,
-and uncertainty analysis with Monte Carlo simulations.
-This tool can handle non-coherent fault trees, containing NOT logic.
-.PP
-\fBSCRAM\fP works with PRA models and constructs described
-in OpenPSA Model Exchange Format.
-.SH OPTIONS
-.TP
-\fB\-\-version\fR
-Prints version information of SCRAM and its dependencies
-.TP
-\fB\-\-help\fR
-Prints the help message with a list of commands
-.TP
-\fB\-\-input\-files\fR arg
-Run with analysis constructs from XML input files
-.TP
-\fB\-\-config\-file\fR arg
-Run analysis with configurations from XML configuration file
-.TP
-\fB\-\-validate\fR
-Validate input and configuration files without analysis
-.TP
-\fB\-\-bdd\fR
-Perform qualitative analysis with Binary Decision Diagrams
-.TP
-\fB\-\-zbdd\fR
-Perform qualitative analysis with Zero-Suppressed Binary Decision Diagrams
-.TP
-\fB\-\-mocus\fR
-Perform qualitative analysis with the MOCUS algorithm
-.TP
-\fB\-\-prime\-implicants\fR
-Calculate prime implicants instead of minimal cut sets
-.TP
-\fB\-\-probability\fR arg
-Perform probability analysis
-.TP
-\fB\-\-importance\fR arg
-Perform importance analysis
-.TP
-\fB\-\-uncertainty\fR arg
-Perform uncertainty analysis
-.TP
-\fB\-\-ccf\fR arg
-Perform common\-cause failure analysis
-.TP
-\fB\-\-rare\-event\fR
-Use the rare event approximation for probability
-calculations
-.TP
-\fB\-\-mcub\fR
-Use the MCUB approximation for probability
-calculations
-.HP
-\fB\-l\fR [ \fB\-\-limit\-order\fR ] arg
-Upper limit for the product order
-.TP
-\fB\-\-cut\-off\fR arg
-Cut\-off probability for products
-.TP
-\fB\-\-mission\-time\fR arg
-Set the system mission time in hours for probability calculations
-.TP
-\fB\-\-num\-trials\fR arg
-Set the number of trials for Monte Carlo simulations
-.TP
-\fB\-\-num\-quantiles\fR arg
-Set the number of quantiles for distributions
-.TP
-\fB\-\-num\-bins\fR arg
-Set the number of bins for histograms
-.TP
-\fB\-\-seed\fR arg
-Set the seed for the pseudo\-random number generator
-.HP
-\fB\-o\fR [ \fB\-\-output\-path\fR ] arg Output path for reports
-.TP
-\fB\-\-verbosity\fR arg
-Set the log verbosity
-.SH "SEE ALSO"
-http://scram-pra.org
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scram.git
More information about the debian-science-commits
mailing list