[med-svn] [libshark] 01/01: Update packaging: - bump debhelper compat level to 9 - split package - build shared library - add multiarch support - add DEB_BUILD_OPTIONS nocheck and nodoc - add Qlustar vendor support

Goswin von Brederlow goswin-guest at moszumanska.debian.org
Mon Feb 9 14:48:55 UTC 2015 

This is an automated email from the git hooks/post-receive script.

goswin-guest pushed a commit to branch master
in repository libshark.

commit 63c6a85b11add51cc03b61d0687476bd9038dadd
Author: Goswin von Brederlow <brederlo at q-leap.de>
Date:   Fri Feb 6 13:13:44 2015 +0000

    Update packaging:
    - bump debhelper compat level to 9
    - split package
    - build shared library
    - add multiarch support
    - add DEB_BUILD_OPTIONS nocheck and nodoc
    - add Qlustar vendor support
---
 .gitignore                  | 11 +++++++++
 CMakeLists.txt              |  6 ++---
 debian/changelog            | 12 +++++++++
 debian/compat               |  2 +-
 debian/control              | 60 +++++++++++++++++++++++++++++++++++++++------
 debian/libshark-dev.install |  4 +++
 debian/libshark-doc.install |  6 +++++
 debian/libshark3.install    |  1 +
 debian/rules                | 36 +++++++++++++++++++++++++++
 src/CMakeLists.txt          | 10 ++++----
 10 files changed, 131 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0753402..a4a70b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -263,3 +263,14 @@ examples/Unsupervised/*.cpp
 /src/*.dsw
 /src/Makefile
 /src/Makefile.in
+
+debian/tmp/
+debian/files
+obj-*/
+debian/*.log
+debian/*.substvars
+debian/*.debhelper
+debian/libshark3/
+debian/libshark-dev/
+debian/libshark-doc/
+*~
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dcdfa2..304ffe0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,10 +107,10 @@ SET( CPACK_DEBIAN_PACKAGE_MAINTAINER "Christian Igel <c.igel at ieee.org>" )
 #####################################################################
 IF( UNIX )
 	SET( SHARK_INSTALL_INCLUDE_DIR include/ )
-	SET( SHARK_INSTALL_LIB_DIR lib/ )
+	SET( SHARK_INSTALL_LIB_DIR lib/${CMAKE_LIBRARY_ARCHITECTURE}/ )
 	SET( SHARK_INSTALL_CONTRIB_DIR share/shark/contrib/ )
-	SET( SHARK_INSTALL_EXAMPLE_DIR share/shark/examples/ )
-	SET( SHARK_INSTALL_DOC_DIR share/shark/doc/ )
+	SET( SHARK_INSTALL_EXAMPLE_DIR share/doc/shark/examples/ )
+	SET( SHARK_INSTALL_DOC_DIR share/doc/shark/ )
 ELSE( UNIX )
 	SET( SHARK_INSTALL_INCLUDE_DIR include/shark/ )
 	SET( SHARK_INSTALL_LIB_DIR lib/ )
diff --git a/debian/changelog b/debian/changelog
index 53ba1de..96f61e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libshark (3.0.0~svn+3424-1) unstable; urgency=medium
+
+  * Update upstream to current svn
+  * bump debhelper compat level to 9
+  * split package into libshark3, libshark-dev and libshark-doc
+  * build libshark as shared library
+  * add multiarch support
+  * add DEB_BUILD_OPTIONS nocheck and nodoc
+  * add Qlustar vendor support
+
+ -- Goswin von Brederlow <brederlo at q-leap.de>  Fri, 06 Feb 2015 15:23:26 +0000
+
 libshark (3.0.11) oneiric; urgency=low
 	
   * Added build-dependency on python-pyparsing
diff --git a/debian/compat b/debian/compat
index c793025..f11c82a 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
\ No newline at end of file
+9
\ No newline at end of file
diff --git a/debian/control b/debian/control
index 99020c5..8ab3907 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,65 @@
 Source: libshark
-Maintainer: Thomas Voß <thomas.voss at rub.de>
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Uploaders: Goswin von Brederlow <brederlo at q-leap.de>
 Section: science
 Priority: optional
 Standards-Version: 3.0.0
-Build-Depends: graphviz, python-pip, doxygen, texlive-full, python-pyparsing, python-sphinx, cmake, libboost1.46-all-dev, debhelper (>= 7.3.8)
+Build-Depends:
+ cmake,
+ debhelper (>= 9),
+ doxygen,
+ graphviz,
+ libboost-system-dev,
+ libboost-date-time-dev,
+ libboost-filesystem-dev,
+ libboost-program-options-dev,
+ libboost-serialization-dev,
+ libboost-test-dev,
+ libboost-thread-dev,
+ python-pip,
+ python-pyparsing,
+ python-sphinx,
+ texlive-full
+Vcs-Browser: http://anonscm.debian.org/cgit/debian-med/libshark.git/
+Vcs-Git: git://anonscm.debian.org/cgit/debian-med/libshark.git/
 Homepage: http://shark-project.sourceforge.net
 
-Package: libshark
-Architecture: any
+Package: libshark3
+Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Shark Machine Learning Library
+Multi-Arch: same
+Description: Shark Machine Learning Library (runtime library)
  SHARK is a modular C++ library for the design and
  optimization of adaptive systems. It provides methods for linear and
  nonlinear optimization, in particular evolutionary and gradient-based
  algorithms, kernel-based learning algorithms and neural networks, and
  various other machine learning techniques. SHARK serves as a toolbox
  to support real world applications as well as research indifferent
- domains of computational intelligence and machine learning. The
- sources are compatible with the following platforms: Windows, Solaris,
- MacOS X, and Linux.
\ No newline at end of file
+ domains of computational intelligence and machine learning.
+
+Package: libshark-dev
+Section: libdevel
+Architecture: amd64 i386
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Description: Shark Machine Learning Library (developement files)
+ SHARK is a modular C++ library for the design and
+ optimization of adaptive systems. It provides methods for linear and
+ nonlinear optimization, in particular evolutionary and gradient-based
+ algorithms, kernel-based learning algorithms and neural networks, and
+ various other machine learning techniques. SHARK serves as a toolbox
+ to support real world applications as well as research indifferent
+ domains of computational intelligence and machine learning.
+
+Package: libshark-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Shark Machine Learning Library (documentation and examples)
+ SHARK is a modular C++ library for the design and
+ optimization of adaptive systems. It provides methods for linear and
+ nonlinear optimization, in particular evolutionary and gradient-based
+ algorithms, kernel-based learning algorithms and neural networks, and
+ various other machine learning techniques. SHARK serves as a toolbox
+ to support real world applications as well as research indifferent
+ domains of computational intelligence and machine learning.
diff --git a/debian/libshark-dev.install b/debian/libshark-dev.install
new file mode 100644
index 0000000..39fe074
--- /dev/null
+++ b/debian/libshark-dev.install
@@ -0,0 +1,4 @@
+usr/include
+usr/lib/*/libshark.so
+usr/lib/*/shark
+usr/lib/CMake
diff --git a/debian/libshark-doc.install b/debian/libshark-doc.install
new file mode 100644
index 0000000..5a3ce64
--- /dev/null
+++ b/debian/libshark-doc.install
@@ -0,0 +1,6 @@
+usr/share/doc/shark/examples/*/*.cpp
+usr/share/doc/shark/examples/*/*.txt
+usr/share/doc/shark/examples/*/*/*.cpp
+usr/share/doc/shark/examples/Unsupervised/data
+usr/share/doc/shark/examples/Data
+usr/share/doc/shark/examples/Supervised/data
diff --git a/debian/libshark3.install b/debian/libshark3.install
new file mode 100644
index 0000000..a9e5240
--- /dev/null
+++ b/debian/libshark3.install
@@ -0,0 +1 @@
+usr/lib/*/libshark.so.*
diff --git a/debian/rules b/debian/rules
index cbe925d..7349b3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,39 @@
 #!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# include buildflags, vendor, ...
+include /usr/share/dpkg/default.mk 
+
+ifeq ($(call dpkg_vendor_derives_from Qlustar),yes)
+    # Qlustar specific stuff
+    include /usr/share/ql-deb-utils/Makefile
+endif
+
+# Parse DEB_BUILD_OPTIONS into seperate variables
+d_b_o:=$(shell echo "$$DEB_BUILD_OPTIONS"|sed 's/[^-_=[:alnum:]]/ /g')
+$(foreach o, $(d_b_o), $(if $(findstring =,$o),$(eval DEB_BUILD_OPT_$o),$(eval DEB_BUILD_OPT_$o=1)))
+
+ifdef DEB_BUILD_OPT_nocheck
+  $(info DEB_BUILD_OPTIONS: disabling build-time tests)
+  TESTS=OFF
+else
+  TESTS=ON
+endif
+
+ifdef DEB_BUILD_OPT_nodoc
+  $(info DEB_BUILD_OPTIONS: disabling docs)
+  DOCS=OFF
+else
+  $(warning FIXME: disabling docs because sphinxcontrib-doxylink is not packaged)
+  DOCS=OFF
+endif
+
 %:
 	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DOPT_DYNAMIC_LIBRARY=ON \
+	                     -DOPT_MAKE_TESTS=$(TESTS) \
+	                     -DOPT_COMPILE_DOCUMENTATION=$(DOCS)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8bcd6ae..efea1f4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,21 +38,21 @@ TARGET_LINK_LIBRARIES( Version ${LINK_LIBRARIES} )
 #                       Install the library                         #
 #####################################################################
 SET_TARGET_PROPERTIES( shark PROPERTIES
-	VERSION ${SHARK_VERSION_MAJOR}.${SHARK_VERSION_MINOR}.{SHARK_VERSION_PATCH}
-	SOVERSION ${SHARK_VERSION_MAJOR}.${SHARK_VERSION_MINOR}.{SHARK_VERSION_PATCH}
+	VERSION ${SHARK_VERSION_MAJOR}.${SHARK_VERSION_MINOR}.${SHARK_VERSION_PATCH}
+	SOVERSION ${SHARK_VERSION_MAJOR}
 )
 
 INSTALL(
 	TARGETS shark
 	EXPORT SharkTargets
 	RUNTIME DESTINATION bin
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
+	LIBRARY DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/
+	ARCHIVE DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/
 )
 INSTALL(
 	TARGETS Version
 	EXPORT SharkTargets
-	RUNTIME DESTINATION bin
+	RUNTIME DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/shark/
 )
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libshark.git

More information about the debian-med-commit mailing list