Andreas Tille pushed to branch master at Debian Med / pll-modules
Commits:
a241eafa by Andreas Tille at 2020-06-05T10:13:28+02:00
All missing sources are text files - no need to be mentioned here
- - - - -
5df40058 by Andreas Tille at 2020-06-05T10:18:18+02:00
Be nice to porters
- - - - -
a58eb91f by Andreas Tille at 2020-06-05T12:08:44+02:00
Distinguishable description
- - - - -
abcdf479 by Andreas Tille at 2020-06-05T12:09:11+02:00
Run build time test. I was using some dirty trick to do dh_auto_install first
to have easy access to headers and libraries. No idea whether this is a clever
solution.
Please keep on checking whether the test is **really** run. Silencing make is
not a sensible idea and we should make it probably more verbosely.
- - - - -
6 changed files:
- debian/control
- debian/libpll-modules-dev.install
- debian/libpll-modules0.install
- debian/patches/modify_test_makefile.patch
- debian/rules
- − debian/source/include-binaries
Changes:
=====================================
debian/control
=====================================
@@ -21,9 +21,11 @@ Section: libdevel
Depends: libpll-modules0 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
-Description: high level modules for the low level phylogenetic likelihood
library
+Description: high level modules for the low level phylogenetic likelihood
library (devel)
This package provides high level modules for the low level phylogenetic
likelihood library.
+ .
+ This package contains the static library and header files.
Package: libpll-modules0
Architecture: any
@@ -33,12 +35,13 @@ Depends: ${shlibs:Depends},
Description: high level modules for the low level phylogenetic likelihood
library
This package provides high level modules for the low level phylogenetic
likelihood library.
+ .
+ This package contains the shared library.
Package: libpll-modules-examples
Architecture: all
-Depends: ${misc:Depends},
- libpll0,
- libpll-modules-dev
+Depends: ${misc:Depends}
+Enhances: libpll-modules-dev
Description: example binaries for libpll-modules-dev
This package provides high level modules for the low level phylogenetic
likelihood library.
=====================================
debian/libpll-modules-dev.install
=====================================
@@ -1,4 +1,4 @@
#!/usr/bin/dh-exec
-usr/lib/*.a usr/lib/${DEB_HOST_MULTIARCH}
-usr/lib/*.so usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/*.a usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/*.so usr/lib/${DEB_HOST_MULTIARCH}
usr/include usr
=====================================
debian/libpll-modules0.install
=====================================
@@ -1,2 +1,2 @@
#!/usr/bin/dh-exec
-usr/lib/*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/*.so.* usr/lib/${DEB_HOST_MULTIARCH}
=====================================
debian/patches/modify_test_makefile.patch
=====================================
@@ -3,14 +3,26 @@ Description: modify library and header location in test's
Makefile
Author: Shayan Doust <[email protected]>
Last-Update: 2020-06-01
---
---- pll-modules.orig/test/Makefile
-+++ pll-modules/test/Makefile
-@@ -29,7 +29,7 @@
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -29,7 +29,7 @@ ifdef LIBPLL_INC
CFLAGS += -L$(LIBPLL_INC)
endif
else
- CFLAGS += -I../install/include/libpll -L../install/lib
-+ CFLAGS += -I/usr/include/libpll -L/usr/lib
++ CFLAGS += -I/usr/include/libpll
-I$(CURDIR)/../debian/tmp/usr/include/libpll -L/usr/lib
-L$(CURDIR)/../debian/tmp/usr/lib/`dpkg-architecture -qDEB_BUILD_MULTIARCH`/
endif
MODULES = binary optimize tree
+@@ -67,8 +67,9 @@ all: $(OBJCOMMON) $(OBJFILES) $(REQFILES
+ @mkdir -p $(RESULTDIR) $(foreach m,$(MODULES), $(RESULTDIR)/$(m))
+
+ $(DATADIR)/%:
+- @mkdir -p "$(@D)"
+- wget -O $@ $(ASSETS)/$@
++ #@mkdir -p "$(@D)"
++ #wget -O $@ $(ASSETS)/$@
++ ln -s ../debian/missing-sources/testdata .
+
+ obj/%: src/%.c $(DEPS)
+ @mkdir -p "$(@D)"
=====================================
debian/rules
=====================================
@@ -14,8 +14,15 @@ INSTALLATION_PREFIX = "/usr"
dh $@
override_dh_auto_configure:
- ./configure --prefix $(INSTALLATION_PREFIX)
CPPFLAGS="-I/usr/include/libpll" LDFLAGS="-L/usr/include/libpll"
+ dh_auto_configure -- --prefix $(INSTALLATION_PREFIX)
CPPFLAGS="-I/usr/include/libpll" LDFLAGS="-L/usr/include/libpll"
override_dh_missing:
find debian/tmp -name "*.la" -delete
dh_missing
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ # header files are needed in one place so do dh_auto_install right now
+ dh_auto_install
+ cd test && $(MAKE)
+endif
=====================================
debian/source/include-binaries deleted
=====================================
@@ -1,10 +0,0 @@
-debian/missing-source/testdata/worms16s.fas
-debian/missing-source/testdata/small.fas
-debian/missing-source/testdata/small.tree
-debian/missing-source/testdata/small.rooted.tree
-debian/missing-source/testdata/246x4465.fas
-debian/missing-source/testdata/246x4465.tree
-debian/missing-source/testdata/ribosomal_l5_pf00673.fas
-debian/missing-source/testdata/medium.fas
-debian/missing-source/testdata/medium.tree
-debian/missing-source/testdata/medium.rooted.tree
View it on GitLab:
https://salsa.debian.org/med-team/pll-modules/-/compare/1053d9e420dba57e97634c0e89fd5c3d4f633c96...abcdf479561c32c3460dbbcb47322687b0e9cce9
--
View it on GitLab:
https://salsa.debian.org/med-team/pll-modules/-/compare/1053d9e420dba57e97634c0e89fd5c3d4f633c96...abcdf479561c32c3460dbbcb47322687b0e9cce9
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
