Skip to content
Commits on Source (4)
lamarc (2.1.10.1+dfsg-4) unstable; urgency=medium
* rebuild against wxWidgets GTK 3 package
Closes: #933446
* debhelper-compat 12
* Standards-Version: 4.4.0
-- Andreas Tille <tille@debian.org> Wed, 31 Jul 2019 12:04:50 +0200
lamarc (2.1.10.1+dfsg-3) unstable; urgency=medium
* Point Vcs fields to salsa.debian.org
......
......@@ -3,11 +3,11 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.
Uploaders: Andreas Tille <tille@debian.org>
Section: science
Priority: optional
Build-Depends: debhelper (>= 11~),
Build-Depends: debhelper-compat (= 12),
libboost-dev,
libtinyxml-dev,
libwxgtk3.0-dev
Standards-Version: 4.3.0
libwxgtk3.0-gtk3-dev
Standards-Version: 4.4.0
Vcs-Browser: https://salsa.debian.org/med-team/lamarc
Vcs-Git: https://salsa.debian.org/med-team/lamarc.git
Homepage: http://evolution.gs.washington.edu/lamarc/
......
......@@ -20,13 +20,13 @@ Last-Update: Wed, 24 Jan 2018 08:35:01 +0100
if test "X${LAMARC_CODE_OSTYPE}" = "X" ; then
- GUI_TOOLKIT=osx_cocoa
- LAMARC_CODE_OSTYPE=LAMARC_COMPILE_MACOSX
+ GUI_TOOLKIT=gtk2
+ GUI_TOOLKIT=gtk3
+ LAMARC_CODE_OSTYPE=LAMARC_COMPILE_LINUX
echo "*************************************************************"
- echo "DO NOT CHECK THIS config.ac in, it has GUI_TOOLKIT and"
- echo "LAMARC_CODE_OSTYPE hardwired for 10.7 mac"
+ echo "No known OSTYPE"
+ echo "Use toolkit gtk2 and Linux settings"
+ echo "Use toolkit gtk3 and Linux settings"
echo "*************************************************************"
fi
;;
Author: Andreas Tille <tille@debian.org>
Last-Update: Wed, 31 Jul 2019 12:04:50 +0200
Description: Wxgtk was switched from version gtk2 to gtk3
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,7 @@ case "$target_os" in
if test "X${lamCONV}" = "Xyes" ; then
if test "X${lamGUI}" = "Xyes" ; then
if test "X${GUI_TOOLKIT}" = "X" ; then
- GUI_TOOLKIT=gtk2
+ GUI_TOOLKIT=gtk3
fi
fi
fi
@@ -476,7 +476,7 @@ esac
if test "X${lamCONV}" = "Xyes" ; then
case "${GUI_TOOLKIT}" in
- gtk2)
+ gtk3)
;;
mac)
;;
......@@ -3,3 +3,4 @@ use_debian_packaged_boost.patch
limits.patch
fix_install_target.patch
enable_build_on_hurd.patch
gtk3.patch