[X2Go-Commits] [nx-libs] 01/03: nx{comp{, ext, shad}, proxy}: use path discovery for finding makedepend. Remove old cruft. Adds:

git-admin at x2go.org git-admin at x2go.org
Sun Mar 15 17:32:28 CET 2015 

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.5.0.x
in repository nx-libs.

commit 10f7318a9e6aaf63602d2c2e8b5803c3d39c9ceb
Author: Clemens Lang <cal at macports.org>
Date:   Sun Mar 15 07:18:14 2015 +0100

    nx{comp{,ext,shad},proxy}: use path discovery for finding makedepend. Remove old cruft. Adds:
    
      - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch
      - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch
      - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch
      - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch
---
 debian/changelog                                   |    8 ++++--
 ...0_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch |   27 ++++++++++++++++++++
 ...xcompext_use-MAKEDEPEND-in-path.full+lite.patch |   27 ++++++++++++++++++++
 ...compshad_use-MAKEDEPEND-in-path.full+lite.patch |   26 +++++++++++++++++++
 ..._nxproxy_use-MAKEDEPEND-in-path.full+lite.patch |   26 +++++++++++++++++++
 debian/patches/series                              |    4 +++
 6 files changed, 116 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 836abc9..b6bb7c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low
 
-  [ X2Go Release Manager ]
-  * Continue development
+  [ Clemens Lang ]
+  * Use path discovery for finding makedepend. Remove old cruft. Adds:
+    - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch
+    - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch
+    - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch
+    - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch
 
  -- X2Go Release Manager <git-admin at x2go.org>  Sun, 15 Mar 2015 00:48:06 +0100
 
diff --git a/debian/patches/0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch
new file mode 100644
index 0000000..edebac8
--- /dev/null
+++ b/debian/patches/0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch
@@ -0,0 +1,27 @@
+Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.)
+Author: Clemens Lang <cal at macports.org>
+
+--- a/nxcomp/configure.in
++++ b/nxcomp/configure.in
+@@ -362,20 +362,7 @@ fi
+ dnl Find makedepend somewhere.
+ 
+ AC_SUBST(MAKEDEPEND)
+-
+-if test -x "../nx-X11/config/makedepend/makedepend" ; then
+-  MAKEDEPEND=../nx-X11/config/makedepend/makedepend
+-else
+-  if test -x "/usr/X11R6/bin/makedepend" ; then
+-    MAKEDEPEND=/usr/X11R6/bin/makedepend
+-  else
+-    if test -x "/usr/openwin/bin/makedepend" ; then
+-      MAKEDEPEND=/usr/openwin/bin/makedepend
+-    else
+-      MAKEDEPEND=/usr/bin/makedepend
+-    fi
+-  fi
+-fi
++MAKEDEPEND="$(which makedepend)"
+ 
+ dnl Determine what to build based on the platform.
+ dnl Override the LIBS settings on Cygwin32 so that
diff --git a/debian/patches/0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch
new file mode 100644
index 0000000..0d5f220
--- /dev/null
+++ b/debian/patches/0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch
@@ -0,0 +1,27 @@
+Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.)
+Author: Clemens Lang <cal at macports.org>
+
+--- a/nxcompext/configure.in
++++ b/nxcompext/configure.in
+@@ -219,20 +219,7 @@ CFLAGS="$CFLAGS -DVERSION=\\\"${VERSION}
+ dnl Find makedepend somewhere.
+ 
+ AC_SUBST(MAKEDEPEND)
+-
+-if test -x "../nx-X11/config/makedepend/makedepend" ; then
+-  MAKEDEPEND=../nx-X11/config/makedepend/makedepend
+-else
+-  if test -x "/usr/X11R6/bin/makedepend" ; then
+-    MAKEDEPEND=/usr/X11R6/bin/makedepend
+-  else
+-    if test -x "/usr/openwin/bin/makedepend" ; then
+-      MAKEDEPEND=/usr/openwin/bin/makedepend
+-    else
+-      MAKEDEPEND=/usr/bin/makedepend
+-    fi
+-  fi
+-fi
++MAKEDEPEND="$(which makedepend)"
+ 
+ dnl Determine what to build based on the platform.
+ dnl Override the LIBS settings on Cygwin32 so that
diff --git a/debian/patches/0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch
new file mode 100644
index 0000000..15e94bc
--- /dev/null
+++ b/debian/patches/0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch
@@ -0,0 +1,26 @@
+Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.)
+Author: Clemens Lang <cal at macports.org>
+
+--- a/nxcompshad/configure.in
++++ b/nxcompshad/configure.in
+@@ -269,19 +269,6 @@ fi
+ dnl Find makedepend somewhere.
+ 
+ AC_SUBST(MAKEDEPEND)
+-
+-if test -x "../nx-X11/config/makedepend/makedepend" ; then
+-  MAKEDEPEND=../nx-X11/config/makedepend/makedepend
+-else
+-  if test -x "/usr/X11R6/bin/makedepend" ; then
+-    MAKEDEPEND=/usr/X11R6/bin/makedepend
+-  else
+-    if test -x "/usr/openwin/bin/makedepend" ; then
+-      MAKEDEPEND=/usr/openwin/bin/makedepend
+-    else
+-      MAKEDEPEND=makedepend
+-    fi
+-  fi
+-fi
++MAKEDEPEND="$(which makedepend)"
+ 
+ AC_OUTPUT(Makefile)
diff --git a/debian/patches/0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch
new file mode 100644
index 0000000..0b18912
--- /dev/null
+++ b/debian/patches/0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch
@@ -0,0 +1,26 @@
+Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.)
+Author: Clemens Lang <cal at macports.org>
+
+--- a/nxproxy/configure.in
++++ b/nxproxy/configure.in
+@@ -167,19 +167,6 @@ fi
+ dnl Find makedepend somewhere.
+ 
+ AC_SUBST(MAKEDEPEND)
+-
+-if test -x "../nx-X11/config/makedepend/makedepend" ; then
+-  MAKEDEPEND=../nx-X11/config/makedepend/makedepend
+-else
+-  if test -x "/usr/X11R6/bin/makedepend" ; then
+-    MAKEDEPEND=/usr/X11R6/bin/makedepend
+-  else
+-    if test -x "/usr/openwin/bin/makedepend" ; then
+-      MAKEDEPEND=/usr/openwin/bin/makedepend
+-    else
+-      MAKEDEPEND=makedepend
+-    fi
+-  fi
+-fi
++MAKEDEPEND="$(which makedepend)"
+ 
+ AC_OUTPUT(Makefile)
diff --git a/debian/patches/series b/debian/patches/series
index 522b398..af11736 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,6 +32,10 @@
 0055_nx-X11_imake-Werror-format-security.full.patch
 0056_nx-X11_Werror-format-security.full.patch
 0057_nx-X11_sanitize-eventmasks.full.patch
+0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch
+0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch
+0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch
+0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch
 0101_nxagent_set-rgb-path.full.patch
 0102_xserver-xext_set-securitypolicy-path.full.patch
 0103_nxagent_set-X0-config-path.full.patch

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

More information about the x2go-commits mailing list