[med-svn] [Git][med-team/lamarc][master] 3 commits: Enable build on hurd

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / lamarc


Commits:
e438e195 by Andreas Tille at 2018-01-24T08:37:19+01:00
Enable build on hurd

- - - - -
490f0309 by Andreas Tille at 2018-01-24T08:37:57+01:00
debhelper 11

- - - - -
f3beea2b by Andreas Tille at 2018-03-16T21:29:52+01:00
Upload to unstable

- - - - -


5 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lamarc (2.1.10.1+dfsg-2) unstable; urgency=medium
+
+  * Enable build on hurd
+    Closes: #888225
+  * debhelper 11
+
+ -- Andreas Tille <tille at debian.org>  Wed, 24 Jan 2018 08:37:59 +0100
+
 lamarc (2.1.10.1+dfsg-1) unstable; urgency=medium
 
   * Initial release (Closes: #886357)


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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 (>= 10),
+Build-Depends: debhelper (>= 11~),
                libboost-dev,
                libtinyxml-dev,
                libwxgtk3.0-dev


=====================================
debian/patches/enable_build_on_hurd.patch
=====================================
--- /dev/null
+++ b/debian/patches/enable_build_on_hurd.patch
@@ -0,0 +1,32 @@
+Description: Enable build on hurd
+Bug-Debian: http://bugs.debian.org/888225
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 24 Jan 2018 08:35:01 +0100
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -66,7 +66,7 @@ case "$target_os" in
+             LAMARC_CODE_OSTYPE=LAMARC_COMPILE_MACOSX
+         fi
+         ;;
+-    freebsd*|linux*)
++    freebsd*|linux*|hurd*)
+         if test "X${lamCONV}" = "Xyes" ; then
+             if test "X${lamGUI}" = "Xyes" ; then
+                 if test "X${GUI_TOOLKIT}" = "X" ; then
+@@ -92,11 +92,11 @@ case "$target_os" in
+         ;;
+     *)
+         if test "X${LAMARC_CODE_OSTYPE}" = "X" ; then
+-	    GUI_TOOLKIT=osx_cocoa
+-            LAMARC_CODE_OSTYPE=LAMARC_COMPILE_MACOSX
++	    GUI_TOOLKIT=gtk2
++            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 "*************************************************************"
+         fi
+         ;;


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ use_debian_packaged_tinyxml.patch
 use_debian_packaged_boost.patch
 limits.patch
 fix_install_target.patch
+enable_build_on_hurd.patch



View it on GitLab: https://salsa.debian.org/med-team/lamarc/compare/7763886f4fa4e8c7cfdffb6dcedbe0b3a1298251...f3beea2b8b6c3de3cd204c01f4d809487cde05b2

---
View it on GitLab: https://salsa.debian.org/med-team/lamarc/compare/7763886f4fa4e8c7cfdffb6dcedbe0b3a1298251...f3beea2b8b6c3de3cd204c01f4d809487cde05b2
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180316/cdf09fa9/attachment-0001.html>