[med-svn] [Git][med-team/dssp][master] 2 commits: fix dependencies

[Maarten L. Hekkelman]

Maarten L. Hekkelman pushed to branch master at Debian Med / dssp


Commits:
c71d009d by Maarten L. Hekkelman at 2020-11-25T09:02:23+01:00
fix dependencies

- - - - -
e87f53bb by Maarten L. Hekkelman at 2020-11-25T09:05:13+01:00
Merge branch 'master' of salsa.debian.org:med-team/dssp

- - - - -


3 changed files:

- debian/control
- debian/patches/configure-patch
- debian/patches/makefile


Changes:

=====================================
debian/control
=====================================
@@ -3,13 +3,13 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Maarten L. Hekkelman <maarten at hekkelman.com>
 Section: science
 Priority: optional
-Build-Depends: autoconf-archive,
-               debhelper-compat (= 13),
+Build-Depends: debhelper-compat (= 13),
+               autoconf-archive,
+               pkg-config,
                libboost-iostreams-dev,
                libboost-program-options-dev,
                libboost-system-dev,
-               libcifpp-dev,
-               pkg-config
+               libcifpp-dev
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/med-team/dssp


=====================================
debian/patches/configure-patch
=====================================
@@ -36,3 +36,11 @@ Forwarded: yes
  dnl revision numbering is something used internally at the NKI
  AC_ARG_ENABLE(
  	revision,
+@@ -69,7 +82,6 @@
+ AX_BOOST_BASE([1.65.1], [], [AC_MSG_ERROR([Could not find a recent version of boost])])
+ AX_BOOST_IOSTREAMS
+ AX_BOOST_PROGRAM_OPTIONS
+-AX_BOOST_DATE_TIME
+ 
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"


=====================================
debian/patches/makefile
=====================================
@@ -5,9 +5,13 @@ Forwarded: yes
 
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -35,7 +35,7 @@
- 					  @BOOST_PROGRAM_OPTIONS_LIB@ \
- 					  @BOOST_DATE_TIME_LIB@
+@@ -32,10 +32,9 @@
+ LIBS				= @LIBS@ \
+ 					  @CIFPP_LIBS@ \
+ 					  @BOOST_IOSTREAMS_LIB@ \
+-					  @BOOST_PROGRAM_OPTIONS_LIB@ \
+-					  @BOOST_DATE_TIME_LIB@
++					  @BOOST_PROGRAM_OPTIONS_LIB@
  
 -prefix				= @prefix@
 +prefix				= $(DESTDIR)@prefix@



View it on GitLab: https://salsa.debian.org/med-team/dssp/-/compare/252e56d029fee9c582fbd528535ced2e23362d4b...e87f53bbe6766c9105b782a580e9c3d8171ad943

-- 
View it on GitLab: https://salsa.debian.org/med-team/dssp/-/compare/252e56d029fee9c582fbd528535ced2e23362d4b...e87f53bbe6766c9105b782a580e9c3d8171ad943
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/20201125/d2387194/attachment-0001.html>