Andreas Tille pushed to branch master at Debian Med / pll-modules


Commits:
f9ac2e17 by Andreas Tille at 2020-06-04T22:05:05+02:00
Install static and shared libs

- - - - -
1053d9e4 by Andreas Tille at 2020-06-04T22:37:32+02:00
Do not install *.la files

- - - - -


6 changed files:

- debian/control
- + debian/libpll-modules-dev.examples
- + debian/libpll-modules-dev.install
- + debian/libpll-modules0.install
- − debian/pll-modules.install
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -4,6 +4,7 @@ Uploaders: Andreas Tille <[email protected]>
 Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
+               dh-exec,
                libpll-dev,
                zlib1g-dev,
                bison,
@@ -16,16 +17,26 @@ Homepage: https://github.com/ddarriba/pll-modules
 
 Package: libpll-modules-dev
 Architecture: any
-Depends: ${shlibs:Depends},
+Section: libdevel
+Depends: libpll-modules0 (= ${binary:Version}),
+         ${shlibs:Depends},
          ${misc: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.
 
-Package: libpll-modules-examples
+Package: libpll-modules0
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
+         ${misc: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.
+
+Package: libpll-modules-examples
+Architecture: all
+Depends: ${misc:Depends},
          libpll0,
          libpll-modules-dev
 Description: example binaries for libpll-modules-dev


=====================================
debian/libpll-modules-dev.examples
=====================================
@@ -0,0 +1 @@
+examples/*


=====================================
debian/libpll-modules-dev.install
=====================================
@@ -0,0 +1,4 @@
+#!/usr/bin/dh-exec
+usr/lib/*.a    usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*.so   usr/lib/${DEB_HOST_MULTIARCH}
+usr/include    usr


=====================================
debian/libpll-modules0.install
=====================================
@@ -0,0 +1,2 @@
+#!/usr/bin/dh-exec
+usr/lib/*.so.*     usr/lib/${DEB_HOST_MULTIARCH}


=====================================
debian/pll-modules.install deleted
=====================================
@@ -1 +0,0 @@
-examples/ usr/share/doc/pll-modules/


=====================================
debian/rules
=====================================
@@ -11,17 +11,11 @@ include /usr/share/dpkg/default.mk
 INSTALLATION_PREFIX = "/usr"
 
 %:
-       dh $@ --with autoreconf
+       dh $@
 
 override_dh_auto_configure:
        ./configure --prefix $(INSTALLATION_PREFIX) 
CPPFLAGS="-I/usr/include/libpll" LDFLAGS="-L/usr/include/libpll"
 
-override_dh_install:
-       dh_install
-       sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
-       d-shlibmove --commit \
-                   --multiarch \
-                   --devunversioned \
-                   --exclude-la \
-                   --movedev debian/tmp/usr/include/libpll usr/include \
-                   debian/tmp/usr/lib/*.so
+override_dh_missing:
+       find debian/tmp -name "*.la" -delete
+       dh_missing



View it on GitLab: 
https://salsa.debian.org/med-team/pll-modules/-/compare/2dc7b2262ff7b3a4d725104325e42ce44526a717...1053d9e420dba57e97634c0e89fd5c3d4f633c96

-- 
View it on GitLab: 
https://salsa.debian.org/med-team/pll-modules/-/compare/2dc7b2262ff7b3a4d725104325e42ce44526a717...1053d9e420dba57e97634c0e89fd5c3d4f633c96
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

Reply via email to