[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lyx-devel
Subject:    Re: [LyX/master] CMake deb: support "python2 | python3" dependency
From:       Scott Kostyshak <skostysh () lyx ! org>
Date:       2020-10-24 19:31:17
Message-ID: 20201024193117.2a6kwbdi6hjuyebc () tallinn
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


On Wed, Oct 21, 2020 at 01:00:54AM -0400, Scott Kostyshak wrote:
> On Tue, Oct 20, 2020 at 06:40:22PM +0200, Scott Kostyshak wrote:
> > commit fe1cbc06c320677bf5930d3e3e943f7d9a75bdcf
> > Author: Scott Kostyshak <skostysh@lyx.org>
> > Date:   Mon Oct 19 14:59:17 2020 -0400
> > 
> >     CMake deb: support "python2 | python3" dependency
> >     
> >     The latest debian-based distributions have moved away from
> >     the "python" package dependency to "python2" and "python3".
> > ---
> >  development/cmake/LyxPackaging.cmake |    4 +++-
> >  1 files changed, 3 insertions(+), 1 deletions(-)
> > 
> > diff --git a/development/cmake/LyxPackaging.cmake b/development/cmake/LyxPackaging.cmake
> > index 8dd7fa4..5d7acd1 100644
> > --- a/development/cmake/LyxPackaging.cmake
> > +++ b/development/cmake/LyxPackaging.cmake
> > @@ -151,7 +151,9 @@ set(CPACK_PACKAGE_CONTACT "${PACKAGE_BUGREPORT}")
> >  set(CPACK_SOURCE_PACKAGE_FILE_NAME "${LYX_PROJECT}-${LYX_INSTALL_SUFFIX}")
> >  
> >  # We depend on python scripting
> > -set(CPACK_DEBIAN_PACKAGE_DEPENDS "python (>= 2.7)")
> > +# Currently no need to specify versions for pythonx since they are only
> > +# available in newest distributions.
> > +set(CPACK_DEBIAN_PACKAGE_DEPENDS "python (>= 2.7) | python3 | python2")
> >  
> >  # use dpkg-shlibdeps to generate additional info for package dependency list.
> >  set(CPACK_DEBIAN_PACKAGE_RELEASE ${LYX_PACKAGE_RELEASE})
> 
> Riki, can I push this and 334552ad to 2.3.x? I think that Kornel and I
> are the only ones who use this cpack deb feature.

Is this OK, Riki?

Scott

["signature.asc" (application/pgp-signature)]

-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


[prev in list] [next in list] [prev in thread] [next in thread]