[liggghts] 04/04: Minor fix.
Anton Gladky
gladk at moszumanska.debian.org
Thu Mar 6 19:43:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository liggghts.
commit f01a307da15208918f10bc16a41e782ed1bcc3d3
Author: Anton Gladky <gladk at debian.org>
Date: Thu Mar 6 20:39:24 2014 +0100
Minor fix.
---
debian/control | 8 ++++----
debian/{libliggghts2.install => libliggghts3.install} | 0
debian/patches/01_add_cmake_files.patch | 10 +---------
debian/rules | 2 +-
4 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/debian/control b/debian/control
index 6f66cc4..bbfaa5a 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Pre-Depends:
${misc:Pre-Depends}
Multi-Arch: same
Depends:
- libliggghts2 (= ${binary:Version}),
+ libliggghts3 (= ${binary:Version}),
mpi-default-bin,
${misc:Depends},
${shlibs:Depends}
@@ -40,7 +40,7 @@ Description: Open Source DEM Particle Simulation Software. Development files
.
The package contains development files.
-Package: libliggghts2
+Package: libliggghts3
Architecture: any
Depends:
mpi-default-bin,
@@ -62,7 +62,7 @@ Description: Open Source DEM Particle Simulation Software. Shared library
.
The package contains shared library.
-Package: libliggghts2-dbg
+Package: libliggghts3-dbg
Architecture: any
Section: debug
Pre-Depends:
@@ -90,7 +90,7 @@ Package: liggghts
Architecture: any
Multi-Arch: foreign
Depends:
- libliggghts2 (>= ${source:Version}),
+ libliggghts3 (>= ${source:Version}),
mpi-default-bin,
${misc:Depends},
${shlibs:Depends}
diff --git a/debian/libliggghts2.install b/debian/libliggghts3.install
similarity index 100%
rename from debian/libliggghts2.install
rename to debian/libliggghts3.install
diff --git a/debian/patches/01_add_cmake_files.patch b/debian/patches/01_add_cmake_files.patch
index 3479008..be2e0f8 100644
--- a/debian/patches/01_add_cmake_files.patch
+++ b/debian/patches/01_add_cmake_files.patch
@@ -4,7 +4,7 @@ Last-Update: 2014-03-04
--- /dev/null
+++ b/CMakeLists.txt
-@@ -0,0 +1,88 @@
+@@ -0,0 +1,80 @@
+# ENABLE_PACKAGE: enable PACKAGE-modules (OFF by default)
+# ENABLE_PACKAGEUSER: enable PACKAGEUSER-modules (OFF by default)
+# SUFFIX: add sufix to binary-name (NONE by default)
@@ -19,16 +19,8 @@ Last-Update: 2014-03-04
+SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cMake")
+
+SET(VERSION 3.0.0)
-+SET(USERPATH 1)
+#=======================================
+
-+IF (NOT CMAKE_CXX_FLAGS)
-+ #If flags are not set, add default flags
-+ SET(CMAKE_BUILD_TYPE Release)
-+ SET(CMAKE_CXX_FLAGS " -Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security")
-+ENDIF (NOT CMAKE_CXX_FLAGS)
-+
-+#=======================================
+FIND_PACKAGE(Boost COMPONENTS mpi serialization REQUIRED)
+INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS})
+#=======================================
diff --git a/debian/rules b/debian/rules
index bfebdab..17afaea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,5 +25,5 @@ ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_auto_test_archs_simple)))
endif
override_dh_strip:
- dh_strip --dbg-package=libliggghts2-dbg
+ dh_strip --dbg-package=libliggghts3-dbg
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/liggghts.git
More information about the debian-science-commits
mailing list