diff options
6 files changed, 116 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 836abc901..b6bb7c158 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@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 000000000..edebac8eb --- /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@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 000000000..0d5f22011 --- /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@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 000000000..15e94bc68 --- /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@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 000000000..0b1891288 --- /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@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 522b398bc..af1173630 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 |