Andreas Tille pushed to branch master at Debian Med / libsbml
Commits: 645ffe75 by Andreas Tille at 2018-05-14T10:56:41+02:00 Fix Perl installdir - - - - - 387c771d by Andreas Tille at 2018-05-14T10:59:09+02:00 Point Vcs fields to salsa.debian.org - - - - - 8e1a6aae by Andreas Tille at 2018-05-14T10:59:09+02:00 Standards-Version: 4.1.4 - - - - - 3 changed files: - debian/changelog - debian/control - debian/patches/perl-installdirs.patch Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +libsbml (5.16.0+dfsg-3) UNRELEASED; urgency=medium + + [ gregor herrmann ] + * Fix Perl installdir + Closes: #896531 + + [ Andreas Tille ] + * Point Vcs fields to salsa.debian.org + * Standards-Version: 4.1.4 + + -- Andreas Tille <[email protected]> Mon, 14 May 2018 10:55:58 +0200 + libsbml (5.16.0+dfsg-2) unstable; urgency=medium * Work around javadoc issue with Java 9 ===================================== debian/control ===================================== --- a/debian/control +++ b/debian/control @@ -26,9 +26,9 @@ Build-Depends: autoconf, cli-common-dev, mono-runtime-common, texlive-latex-base -Standards-Version: 4.1.3 -Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libsbml.git -Vcs-Git: https://anonscm.debian.org/git/debian-med/libsbml.git +Standards-Version: 4.1.4 +Vcs-Browser: https://salsa.debian.org/med-team/libsbml +Vcs-Git: https://salsa.debian.org/med-team/libsbml.git Homepage: http://www.sbml.org/ Package: libsbml5-dev ===================================== debian/patches/perl-installdirs.patch ===================================== --- a/debian/patches/perl-installdirs.patch +++ b/debian/patches/perl-installdirs.patch @@ -1,5 +1,5 @@ Author: gregor herrmann <[email protected]> -Last-Update: Mon, 25 Aug 2014 14:16:04 +0200 +Last-Update: Tue, 01 May 2018 19:03:21 +0200 Description: Install Perl modules in correct dir --- a/src/bindings/perl/Makefile.PL.in @@ -14,11 +14,12 @@ Description: Install Perl modules in correct dir CC => "@CXX@", --- a/src/bindings/perl/CMakeLists.txt +++ b/src/bindings/perl/CMakeLists.txt -@@ -232,7 +232,13 @@ Could not determine Perl version, please +@@ -232,8 +232,14 @@ Could not determine Perl version, please string(REPLACE "'" "" PERL_PLATFORM ${PERL_PLATFORM}) string(REPLACE ";" "" PERL_PLATFORM ${PERL_PLATFORM}) string(REPLACE "archname=" "" PERL_PLATFORM ${PERL_PLATFORM}) - set(PERL_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/perl5/site_perl/${PERL_VERSION}/${PERL_PLATFORM}) +- set(PERL_PACKAGE_INSTALL_BIN_DIR ${PERL_PACKAGE_INSTALL_DIR}/auto/libSBML) + execute_process(COMMAND "${PERL_EXECUTABLE}" -V:vendorarch + OUTPUT_VARIABLE PERL_VENDORARCH OUTPUT_STRIP_TRAILING_WHITESPACE) + string(REPLACE " " "" PERL_VENDORARCH ${PERL_VENDORARCH}) @@ -26,6 +27,7 @@ Description: Install Perl modules in correct dir + string(REPLACE ";" "" PERL_VENDORARCH ${PERL_VENDORARCH}) + string(REPLACE "vendorarch=/usr/lib/" "" PERL_VENDORARCH ${PERL_VENDORARCH}) + set(PERL_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${PERL_VENDORARCH}) - set(PERL_PACKAGE_INSTALL_BIN_DIR ${PERL_PACKAGE_INSTALL_DIR}/auto/libSBML) ++ set(PERL_PACKAGE_INSTALL_BIN_DIR ${PERL_PACKAGE_INSTALL_DIR}/auto/LibSBML) else() set(PERL_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/perl) + set(PERL_PACKAGE_INSTALL_BIN_DIR ${PERL_PACKAGE_INSTALL_DIR}) View it on GitLab: https://salsa.debian.org/med-team/libsbml/compare/5cdf317e79882280eb998e5e66c52966d632107d...8e1a6aae94529bee2e125b41f17622e0f5f11563 --- View it on GitLab: https://salsa.debian.org/med-team/libsbml/compare/5cdf317e79882280eb998e5e66c52966d632107d...8e1a6aae94529bee2e125b41f17622e0f5f11563 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
