[teem] 02/03: Replace cdbs by dh (try d-shlibs but failed since there is no static library)
Andreas Tille
tille at debian.org
Tue Apr 12 11:51:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository teem.
commit b1ff7d8584e8813ff86791d38a92a9d4b898ad20
Author: Andreas Tille <tille at debian.org>
Date: Tue Apr 12 13:48:59 2016 +0200
Replace cdbs by dh (try d-shlibs but failed since there is no static library)
---
debian/changelog | 2 ++
debian/control | 8 +++----
debian/patches/add_static_lib.patch | 16 ++++++++++++++
debian/rules | 43 +++++++++++++++++++------------------
4 files changed, 44 insertions(+), 25 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 31ab9e4..7de7e0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ teem (1.12.0~20160122-1) UNRELEASED; urgency=medium
* Do not explicitly depend from quilt
* Update and split up quilt patches and add DEP3 headers
* DEP5 fix
+ * Replace cdbs by dh (try d-shlibs but failed since there is no static
+ library)
-- Andreas Tille <tille at debian.org> Tue, 26 Jan 2016 16:37:08 +0100
diff --git a/debian/control b/debian/control
index 4afcad9..3af2c62 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
Source: teem
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Dominique Belhachemi <domibel at debian.org>
-Section: libs
+Section: science
Priority: optional
Build-Depends: debhelper (>= 9),
+# d-shlibs,
cmake,
zlib1g-dev,
libpng-dev,
- libbz2-dev,
- cdbs
+ libbz2-dev
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/teem.git
Vcs-Git: https://anonscm.debian.org/debian-science/packages/teem.git
@@ -45,7 +45,6 @@ Description: Tools to process and visualize scientific data and images - develop
Package: teem-apps
Architecture: any
-Section: libdevel
Depends: libteem2 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
@@ -72,6 +71,7 @@ Description: Tools to process and visualize scientific data and images - command
Package: libteem2
Architecture: any
+Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Tools to process and visualize scientific data and images - runtime
diff --git a/debian/patches/add_static_lib.patch b/debian/patches/add_static_lib.patch
new file mode 100644
index 0000000..c09e685
--- /dev/null
+++ b/debian/patches/add_static_lib.patch
@@ -0,0 +1,16 @@
+Description: Deactivated since does not help to create static library
+
+--- a/CMake/TeemUse.cmake
++++ b/CMake/TeemUse.cmake
+@@ -36,9 +36,9 @@ if(Teem_BUILD_SETTINGS_FILE)
+ endif()
+
+ # Support static builds
+-if(NOT Teem_BUILD_SHARED_LIBS)
++#if(NOT Teem_BUILD_SHARED_LIBS)
+ add_definitions(-DTEEM_STATIC=1)
+-endif()
++#endif()
+
+ # Add compiler flags needed to use Teem.
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${Teem_REQUIRED_C_FLAGS}")
diff --git a/debian/rules b/debian/rules
index 8b1042e..544e7e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,17 @@
#!/usr/bin/make -f
# Set this value to 0/1 to turn off/on verbose mode.
-export DH_VERBOSE=0
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+export DH_VERBOSE=1
ABI_VERSION := 2
UVERSION := $(shell dpkg-parsechangelog | awk '/^Version:/ { print $$2 }' | sed 's/^\([0-9\.]\+\)[+~].*-[0-9]\+$$/\1/')
+BUILDDIR := obj-$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEBPKGNAME := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
-DEB_BUILD_PARALLEL := true
-
-DEB_CMAKE_EXTRA_FLAGS = \
+CMAKE_EXTRA_FLAGS += \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=$(DH_VERBOSE) \
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DBUILD_EXPERIMENTAL_APPS:BOOL=OFF \
-DBUILD_EXPERIMENTAL_LIBS:BOOL=OFF \
@@ -22,27 +19,31 @@ DEB_CMAKE_EXTRA_FLAGS = \
-DTeem_USE_LIB_INSTALL_SUBDIR:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON \
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU), i386))
- CFLAGS += -ffloat-store
-endif
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU), powerpc ppc64 s390x))
- CFLAGS += -ffp-contract=off
-endif
+%:
+ dh $@ --parallel
+override_dh_auto_configure:
+ dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
-build/libteem${ABI_VERSION}::
- cd $(DEB_BUILDDIR) && LD_LIBRARY_PATH=`pwd`/bin:$$LD_LIBRARY_PATH ctest -VV -D ExperimentalTest
+override_dh_auto_test:
+ dh_auto_test -- LD_LIBRARY_PATH="`pwd`/$(BUILDDIR)/bin:$LD_LIBRARY_PATH"
-install/libteem${ABI_VERSION}::
+override_dh_install:
+ dh_install
dh_install -plibteem${ABI_VERSION} debian/tmp/usr/lib/Teem-$(UVERSION)/*so.* usr/lib
-
-install/libteem-dev::
dh_install -plibteem-dev debian/tmp/usr/lib/Teem-$(UVERSION)/*.so usr/lib
dh_install -plibteem-dev debian/tmp/usr/lib/Teem-$(UVERSION)/*.cmake usr/lib/Teem-$(UVERSION)
dh_install -plibteem-dev debian/tmp/usr/include/teem/* usr/include/teem
-install/teem-apps::
- dh_install -pteem-apps debian/tmp/usr/bin/* usr/bin
+override_dh_install_d-shlibs: # This does only work for packages with static lib
+ dh_install
+ d-shlibmove --commit \
+ --multiarch \
+ --devunversioned \
+ --movedev "debian/tmp/usr/include/$(DEBPKGNAME) usr/include \
+ --movedev "debian/tmp/usr/lib/Teem-$(UVERSION)/*.cmake usr/lib/Teem-$(UVERSION) \
+ debian/tmp/usr/lib/*/lib$(DEBPKGNAME).so
+
get-orig-source:
/bin/sh $(CURDIR)/debian/get-orig-source
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/teem.git
More information about the debian-science-commits
mailing list