[med-svn] [Git][med-team/lamarc][master] 4 commits: rebuild against wxWidgets GTK 3 package

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / lamarc


Commits:
6a859cc7 by Andreas Tille at 2019-07-31T10:04:19Z
rebuild against wxWidgets GTK 3 package

- - - - -
04bf1d0e by Andreas Tille at 2019-07-31T10:04:44Z
debhelper-compat 12

- - - - -
53c6733b by Andreas Tille at 2019-07-31T10:04:49Z
Standards-Version: 4.4.0

- - - - -
86a3e582 by Andreas Tille at 2019-07-31T11:00:31Z
Switch build system from gtk2 to gtk3

- - - - -


6 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/patches/enable_build_on_hurd.patch
- + debian/patches/gtk3.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+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 at 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


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -3,11 +3,11 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Andreas Tille <tille at 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/


=====================================
debian/patches/enable_build_on_hurd.patch
=====================================
@@ -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
          ;;


=====================================
debian/patches/gtk3.patch
=====================================
@@ -0,0 +1,24 @@
+Author: Andreas Tille <tille at 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)
+             ;;


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ use_debian_packaged_boost.patch
 limits.patch
 fix_install_target.patch
 enable_build_on_hurd.patch
+gtk3.patch



View it on GitLab: https://salsa.debian.org/med-team/lamarc/compare/c2ce7b8aec6bedba3582b4b603d689b456df1591...86a3e582454a91030f15c1c7168e35095c6dc57d

-- 
View it on GitLab: https://salsa.debian.org/med-team/lamarc/compare/c2ce7b8aec6bedba3582b4b603d689b456df1591...86a3e582454a91030f15c1c7168e35095c6dc57d
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/20190731/0c7d1e52/attachment-0001.html>