[med-svn] [Git][med-team/libgclib][master] 12 commits: link the shared library against pthread

Michael R. Crusoe gitlab at salsa.debian.org
Wed Sep 25 09:55:27 BST 2019



Michael R. Crusoe pushed to branch master at Debian Med / gclib


Commits:
a97fed13 by Michael R. Crusoe at 2019-09-25T08:06:16Z
link the shared library against pthread

- - - - -
169eb704 by Michael R. Crusoe at 2019-09-25T08:10:56Z
Add Build-Depends-Package: libgclib-dev to debian/libgclib0.symbols

- - - - -
b4e98ddc by Michael R. Crusoe at 2019-09-25T08:11:44Z
debhelper-compat 12

- - - - -
d06bf081 by Michael R. Crusoe at 2019-09-25T08:11:47Z
Standards-Version: 4.4.0

- - - - -
75e01291 by Michael R. Crusoe at 2019-09-25T08:11:49Z
Trim trailing whitespace.

Fixes lintian: file-contains-trailing-whitespace
See https://lintian.debian.org/tags/file-contains-trailing-whitespace.html for more details.

- - - - -
402bf8b1 by Michael R. Crusoe at 2019-09-25T08:11:49Z
Set upstream metadata fields: Name.

Fixes lintian: upstream-metadata-file-is-missing
See https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html for more details.

- - - - -
6b69112a by Michael R. Crusoe at 2019-09-25T08:19:19Z
avoid BLHC false positive

- - - - -
43c2faff by Michael R. Crusoe at 2019-09-25T08:41:38Z
clean up the build

- - - - -
61640cd2 by Michael R. Crusoe at 2019-09-25T08:41:38Z
verbose

- - - - -
e5488c12 by Michael R. Crusoe at 2019-09-25T08:41:39Z
Build mdtest and run it

- - - - -
09ff95b9 by Michael R. Crusoe at 2019-09-25T08:54:03Z
add autopkgtest

- - - - -
05b2f834 by Michael R. Crusoe at 2019-09-25T08:54:33Z
release

- - - - -


12 changed files:

- debian/README.source
- debian/changelog
- + debian/clean
- − debian/compat
- debian/control
- + debian/libgclib-dev.examples
- debian/libgclib0.symbols
- debian/patches/autoconf.patch
- debian/rules
- + debian/tests/control
- + debian/tests/run-test
- + debian/upstream/metadata


Changes:

=====================================
debian/README.source
=====================================
@@ -22,10 +22,4 @@ source files are built and included into the library:
              from what project these header files are used
   gdimg.cpp: This would introduce an unneeded dependency from libgd-dev
 
-
-FIXME: I tried to build mdtest but linking it against the just build
-library does not work the way I tried.  Some hint from someone who
-knows automake better than me might be helpful.
-
-
  -- Andreas Tille <tille at debian.org>  Thu, 18 Apr 2019 12:54:42 +0200


=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+libgclib (0.11.2-2) unstable; urgency=medium
+
+  * Team upload.
+  * Link the shared library against pthread
+  * Add Build-Depends-Package: libgclib-dev to debian/libgclib0.symbols
+  * debhelper-compat 12
+  * Standards-Version: 4.4.0
+  * Trim trailing whitespace.
+  * Set upstream metadata fields: Name.
+  * Build mdtest properly and use it as a rudimentary test
+  * Add autopkgtest
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Wed, 25 Sep 2019 10:54:10 +0200
+
 libgclib (0.11.2-1) unstable; urgency=medium
 
   * Initial release (Closes: #924582)


=====================================
debian/clean
=====================================
@@ -0,0 +1,11 @@
+.libs/
+config/
+config.h
+config.log
+config.status
+libgclib.pc
+libtool
+mdtest
+stamp-h1
+*.lo
+libgclib.la


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-12


=====================================
debian/control
=====================================
@@ -4,9 +4,9 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
            Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 12~),
+Build-Depends: debhelper-compat (= 12),
                d-shlibs
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/med-team/libgclib
 Vcs-Git: https://salsa.debian.org/med-team/libgclib.git
 Homepage: https://github.com/gpertea/gclib


=====================================
debian/libgclib-dev.examples
=====================================
@@ -0,0 +1 @@
+mdtest.cpp


=====================================
debian/libgclib0.symbols
=====================================
@@ -1,4 +1,5 @@
 libgclib.so.0 libgclib0 #MINVER#
+* Build-Depends-Package: libgclib-dev
  COLOR_buf at Base 0.11.2
  GA_flag_BAD_ALIGN at Base 0.11.2
  GA_flag_HAS_PARENT at Base 0.11.2


=====================================
debian/patches/autoconf.patch
=====================================
@@ -3,7 +3,7 @@ Last-Update: Thu, 18 Apr 2019 12:54:42 +0200
 Descriptions: Build proper libraries via automake
 
 --- /dev/null
-+++ b/Makefile.am
++++ libgclib/Makefile.am
 @@ -0,0 +1,38 @@
 +lib_LTLIBRARIES  = libgclib.la
 +
@@ -32,7 +32,7 @@ Descriptions: Build proper libraries via automake
 +#                       gtest.cpp # Seems to be just a test (FIXME: create autopkgtest from it)
 +
 +
-+libgclib_la_LDFLAGS = -version-info @LIB_VERSION@
++libgclib_la_LDFLAGS = -version-info @LIB_VERSION@ -lpthread
 +
 +libgclib_la_CPPFLAGS = $(INCLUDES)
 +
@@ -40,11 +40,11 @@ Descriptions: Build proper libraries via automake
 +pkgconfig_DATA = libgclib.pc
 +
 +# FIXME: Build mdtest to properly test the lib.  The code below does not work
-+# mdtest_SOURCES = mdtest.cpp libgclib.a
-+# mdtest_LDADD = -L. -lgclib
-+# bin_PROGRAMS = mdtest
++mdtest_SOURCES = mdtest.cpp libgclib.a
++mdtest_LDADD = libgclib.la
++bin_PROGRAMS = mdtest
 --- /dev/null
-+++ b/libgclib.pc.in
++++ libgclib/libgclib.pc.in
 @@ -0,0 +1,11 @@
 +prefix=@prefix@
 +exec_prefix=${prefix}
@@ -58,7 +58,7 @@ Descriptions: Build proper libraries via automake
 +Libs: -L${libdir} -lgclib
 +Cflags: -I${includedir}
 --- /dev/null
-+++ b/configure.ac
++++ libgclib/configure.ac
 @@ -0,0 +1,61 @@
 +#                                               -*- Autoconf -*-
 +# Process this file with autoconf to produce a configure script.
@@ -121,7 +121,7 @@ Descriptions: Build proper libraries via automake
 +	])
 +AC_OUTPUT
 +
---- a/Makefile
+--- libgclib.orig/Makefile
 +++ /dev/null
 @@ -1,114 +0,0 @@
 -INCDIRS := -I. -I${GDIR} -I${BAM}


=====================================
debian/rules
=====================================
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-# DH_VERBOSE := 1
+DH_VERBOSE := 1
 export LC_ALL=C.UTF-8
 
 include /usr/share/dpkg/default.mk
@@ -27,10 +27,11 @@ override_dh_install:
 	find debian/$(DEB_SOURCE)-dev -name gdimg.h -delete
 	find debian/$(DEB_SOURCE)-dev -name GBam.h -delete
 
+override_dh_installexamples:
+	dh_installexamples
+	chmod a-x debian/$(DEB_SOURCE)-dev/usr/share/doc/$(DEB_SOURCE)-dev/examples/*
+
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o mdtest mdtest.cpp ./.libs/libgclib.a $(LIBS) -lpthread
-	./mdtest
-	echo "FIXME: needs MD string as argument"
+	./mdtest 7TEST^BCT
 endif
-


=====================================
debian/tests/control
=====================================
@@ -0,0 +1,3 @@
+Tests: run-test
+Depends: libgclib-dev, build-essential
+Restrictions: allow-stderr


=====================================
debian/tests/run-test
=====================================
@@ -0,0 +1,10 @@
+#!/bin/sh -ex
+
+pkg=libgclib-dev
+if [ "$ADTTMP" = "" ] ; then
+        ADTTMP=$(mktemp -d /tmp/${pkg}-test.XXXXXX)
+fi
+cd "$ADTTMP"
+cp /usr/share/doc/libgclib-dev/examples/mdtest.cpp ./
+g++ -I /usr/include/gclib -o mdtest mdtest.cpp -lgclib
+./mdtest 7TEST^BCT


=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1 @@
+Name: gclib



View it on GitLab: https://salsa.debian.org/med-team/libgclib/compare/d14229d708d9f5edc2efa2cfc02ed640aa25e613...05b2f8346c5a70da9608de9aa1656ac47a8b5d8d

-- 
View it on GitLab: https://salsa.debian.org/med-team/libgclib/compare/d14229d708d9f5edc2efa2cfc02ed640aa25e613...05b2f8346c5a70da9608de9aa1656ac47a8b5d8d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190925/047efda9/attachment-0001.html>


More information about the debian-med-commit mailing list