Andreas Tille pushed to branch master at Debian Med / ctsim
Commits: cc7c1b29 by Andreas Tille at 2019-07-31T08:00:46Z rebuild against wxWidgets GTK 3 package - - - - - a85666c4 by Andreas Tille at 2019-07-31T08:01:23Z debhelper-compat 12 - - - - - 5107bc14 by Andreas Tille at 2019-07-31T08:01:30Z Standards-Version: 4.4.0 - - - - - d2e91c67 by Andreas Tille at 2019-07-31T08:01:30Z Remove trailing whitespace in debian/copyright - - - - - 904aec35 by Andreas Tille at 2019-07-31T08:50:25Z include dir provided by wx3.0-headers - - - - - d8129cc2 by Andreas Tille at 2019-07-31T09:47:12Z Forcing call of wx-config --cflags - - - - - 42c947d1 by Andreas Tille at 2019-07-31T09:48:13Z Closing bug regarding wx-3.0 gtk-3 migration - but there are remaining build issues - - - - - 7 changed files: - debian/changelog - − debian/compat - debian/control - debian/copyright - + debian/patches/fix_includes.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,8 +1,17 @@ ctsim (6.0.2-3) UNRELEASED; urgency=medium + [ Jelmer Vernooij ] * Trim trailing whitespace. - -- Jelmer Vernooij <[email protected]> Sat, 20 Oct 2018 14:03:53 +0000 + [ Andreas Tille ] + * rebuild against wxWidgets GTK 3 package + Closes: #933471 + * include dir provided by wx3.0-headers + * debhelper-compat 12 + * Standards-Version: 4.4.0 + * Remove trailing whitespace in debian/copyright + + -- Andreas Tille <[email protected]> Wed, 31 Jul 2019 10:39:38 +0200 ctsim (6.0.2-2) unstable; urgency=medium ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -10 ===================================== debian/control ===================================== @@ -4,15 +4,15 @@ Uploaders: Kevin M. Rosenberg <[email protected]>, Andreas Tille <[email protected]> Section: science Priority: optional -Build-Depends: debhelper (>= 10), +Build-Depends: debhelper-compat (= 12), libfftw3-dev, libreadline-dev, libgl1-mesa-dev, libglu1-mesa-dev, - libwxgtk3.0-dev, + libwxgtk3.0-gtk3-dev, ctn-dev, libpng-dev -Standards-Version: 4.1.4 +Standards-Version: 4.4.0 Vcs-Browser: https://salsa.debian.org/med-team/ctsim Vcs-Git: https://salsa.debian.org/med-team/ctsim.git Homepage: http://www.ctsim.org ===================================== debian/copyright ===================================== @@ -13,7 +13,7 @@ License: GPL . CTSim is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Files: debian/* Copyright: 2002-2018 Kevin M. Rosenberg <[email protected]> ===================================== debian/patches/fix_includes.patch ===================================== @@ -0,0 +1,16 @@ +Author: Andreas Tille <[email protected]> +Last-Update: Wed, 31 Jul 2019 10:39:38 +0200 +Description: Forcing call of wx-config --cflags + FIXME: This patch should not be needed if wx-3.0 configuration would work properly + +--- a/configure.ac ++++ b/configure.ac +@@ -363,7 +363,7 @@ dnl Our Makefile.am files test the autom + dnl whether X should be supported. + AM_CONDITIONAL(NO_X, test "x$with_x" = "xno") + +-my_includes="$my_includes -I../include -I.. -I/usr/local/include" ++my_includes="$my_includes -I../include -I.. `wx-config --cflags`" + + LDFLAGS="$LDFLAGS -L/usr/local/lib" + ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ drop_incorrect_cppflags.patch +fix_includes.patch ===================================== debian/rules ===================================== @@ -3,7 +3,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with autoreconf + dh $@ override_dh_auto_clean: dh_auto_clean View it on GitLab: https://salsa.debian.org/med-team/ctsim/compare/3088812d1f2d4790cf8ab96d5be698a74bf1b6f8...42c947d1270325b386e689009f7b4c7b19d7980b -- View it on GitLab: https://salsa.debian.org/med-team/ctsim/compare/3088812d1f2d4790cf8ab96d5be698a74bf1b6f8...42c947d1270325b386e689009f7b4c7b19d7980b 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
