This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch 3.5.0.x in repository nx-libs. from 44cbbb9 nxcomp{,ext,shad}: use the correct library naming scheme on OS X. It differs from other UNIX-based systems. new 106327e nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail if it is not available. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 23 ++++++++++ ...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 ----------- ...0_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch | 47 ++++++++++++++++++++ ...-library-naming-scheme-on-OS-X.full+lite.patch} | 0 ...xcompext_use-MAKEDEPEND-in-path.full+lite.patch | 47 ++++++++++++++++++++ ...compshad_use-MAKEDEPEND-in-path.full+lite.patch | 47 ++++++++++++++++++++ ..._nxproxy_use-MAKEDEPEND-in-path.full+lite.patch | 47 ++++++++++++++++++++ ...mp_use-dynamiclib-flag-on-OS-X.full+lite.patch} | 0 ...ad_use-dynamiclib-flag-on-OS-X.full+lite.patch} | 0 ...-library-naming-scheme-on-OS-X.full+lite.patch} | 0 ...-library-naming-scheme-on-OS-X.full+lite.patch} | 0 debian/patches/series | 18 ++++---- 15 files changed, 220 insertions(+), 115 deletions(-) delete mode 100644 debian/patches/0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch delete mode 100644 debian/patches/0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch delete mode 100644 debian/patches/0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch delete mode 100644 debian/patches/0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch create mode 100644 debian/patches/0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch rename debian/patches/{0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch => 0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch} (100%) create mode 100644 debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch create mode 100644 debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch create mode 100644 debian/patches/0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch rename debian/patches/{0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch => 0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch} (100%) rename debian/patches/{0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch => 0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch} (100%) rename debian/patches/{0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch => 0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch} (100%) rename debian/patches/{0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch => 0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch} (100%) -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
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 106327e4ecb4ede090e5b2b8f10782479f0fda4e Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Mar 16 03:04:21 2015 +0100 nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail if it is not available. Also rename to account for dependency changes: - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch => 0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch => 0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch => 0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch => 0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch => 0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch => 0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch => 0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch => 0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch --- debian/changelog | 23 ++++++++++ ...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 ----------- ...0_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch | 47 ++++++++++++++++++++ ...-library-naming-scheme-on-OS-X.full+lite.patch} | 0 ...xcompext_use-MAKEDEPEND-in-path.full+lite.patch | 47 ++++++++++++++++++++ ...compshad_use-MAKEDEPEND-in-path.full+lite.patch | 47 ++++++++++++++++++++ ..._nxproxy_use-MAKEDEPEND-in-path.full+lite.patch | 47 ++++++++++++++++++++ ...mp_use-dynamiclib-flag-on-OS-X.full+lite.patch} | 0 ...ad_use-dynamiclib-flag-on-OS-X.full+lite.patch} | 0 ...-library-naming-scheme-on-OS-X.full+lite.patch} | 0 ...-library-naming-scheme-on-OS-X.full+lite.patch} | 0 debian/patches/series | 18 ++++---- 15 files changed, 220 insertions(+), 115 deletions(-) diff --git a/debian/changelog b/debian/changelog index 98f67b6..42a2a8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,29 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + [ Mihai Moldovan ] + * nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail + if it is not available. + * Rename: + - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch => + 0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch + - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch => + 0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch + - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch => + 0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch + - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch => + 0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch + - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch => + 0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch + - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch => + 0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch + - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + => + 0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + => + 0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + -- X2Go Release Manager <git-admin@x2go.org> Sun, 15 Mar 2015 00:48:06 +0100 nx-libs (2:3.5.0.30-0x2go1) unstable; urgency=low 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 deleted file mode 100644 index edebac8..0000000 --- a/debian/patches/0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 0d5f220..0000000 --- a/debian/patches/0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 15e94bc..0000000 --- a/debian/patches/0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 0b18912..0000000 --- a/debian/patches/0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch new file mode 100644 index 0000000..a8d8366 --- /dev/null +++ b/debian/patches/0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch @@ -0,0 +1,47 @@ +Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.) +Author: Clemens Lang <cal@macports.org> + v2: Mihai Moldovan <ionic@ionic.de> + +--- a/nxcomp/configure.in ++++ b/nxcomp/configure.in +@@ -362,18 +362,15 @@ fi + dnl Find makedepend somewhere. + + AC_SUBST(MAKEDEPEND) ++MAKEDEPEND="$(which 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 ++# Try to desperately find makedepend. ++# Set MAKEDEPEND to the shipped makedepend binary. This will not ++# exist in nx-libs-lite, though, in which case MAKEDEPEND ++# will stay empty. ++if test -z "${MAKEDEPEND}"; then ++ if test -x "../nx-X11/config/makedepend/makedepend"; then ++ MAKEDEPEND="../nx-X11/config/makedepend/makedepend" + fi + fi + +--- a/nxcomp/Makefile.in ++++ b/nxcomp/Makefile.in +@@ -263,9 +263,9 @@ depends: depend.status + depend: depend.status + + depend.status: +- if [ -x $(MAKEDEPEND) ] ; then \ ++ if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \ + $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ +- $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ ++ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ + $(CXXSRC) 2>/dev/null; \ + fi + touch depend.status diff --git a/debian/patches/0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch b/debian/patches/0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch similarity index 100% rename from debian/patches/0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch rename to debian/patches/0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch diff --git a/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch new file mode 100644 index 0000000..da7924f --- /dev/null +++ b/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch @@ -0,0 +1,47 @@ +Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.) +Author: Clemens Lang <cal@macports.org> + v2: Mihai Moldovan <ionic@ionic.de> + +--- a/nxcompext/configure.in ++++ b/nxcompext/configure.in +@@ -219,18 +219,15 @@ CFLAGS="$CFLAGS -DVERSION=\\\"${VERSION} + dnl Find makedepend somewhere. + + AC_SUBST(MAKEDEPEND) ++MAKEDEPEND="$(which 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 ++# Try to desperately find makedepend. ++# Set MAKEDEPEND to the shipped makedepend binary. This will not ++# exist in nx-libs-lite, though, in which case MAKEDEPEND ++# will stay empty. ++if test -z "${MAKEDEPEND}"; then ++ if test -x "../nx-X11/config/makedepend/makedepend"; then ++ MAKEDEPEND="../nx-X11/config/makedepend/makedepend" + fi + fi + +--- a/nxcompext/Makefile.in ++++ b/nxcompext/Makefile.in +@@ -144,9 +144,9 @@ depends: depend.status + depend: depend.status + + depend.status: +- if [ -x $(MAKEDEPEND) ] ; then \ ++ if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \ + $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ +- $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ ++ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ + $(CXXSRC) 2>/dev/null; \ + fi + touch depend.status diff --git a/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch new file mode 100644 index 0000000..329a489 --- /dev/null +++ b/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch @@ -0,0 +1,47 @@ +Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.) +Author: Clemens Lang <cal@macports.org> + v2: Mihai Moldovan <ionic@ionic.de> + +--- a/nxcompshad/configure.in ++++ b/nxcompshad/configure.in +@@ -269,18 +269,15 @@ fi + dnl Find makedepend somewhere. + + AC_SUBST(MAKEDEPEND) ++MAKEDEPEND="$(which 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 ++# Try to desperately find makedepend. ++# Set MAKEDEPEND to the shipped makedepend binary. This will not ++# exist in nx-libs-lite, though, in which case MAKEDEPEND ++# will stay empty. ++if test -z "${MAKEDEPEND}"; then ++ if test -x "../nx-X11/config/makedepend/makedepend"; then ++ MAKEDEPEND="../nx-X11/config/makedepend/makedepend" + fi + fi + +--- a/nxcompshad/Makefile.in ++++ b/nxcompshad/Makefile.in +@@ -179,9 +179,9 @@ depends: depend.status + depend: depend.status + + depend.status: +- if [ -x $(MAKEDEPEND) ] ; then \ ++ if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \ + $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ +- $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ ++ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ + fi + touch depend.status + diff --git a/debian/patches/0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch new file mode 100644 index 0000000..c43788c --- /dev/null +++ b/debian/patches/0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch @@ -0,0 +1,47 @@ +Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.) +Author: Clemens Lang <cal@macports.org> + v2: Mihai Moldovan <ionic@ionic.de> + +--- a/nxproxy/configure.in ++++ b/nxproxy/configure.in +@@ -167,18 +167,15 @@ fi + dnl Find makedepend somewhere. + + AC_SUBST(MAKEDEPEND) ++MAKEDEPEND="$(which 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 ++# Try to desperately find makedepend. ++# Set MAKEDEPEND to the shipped makedepend binary. This will not ++# exist in nx-libs-lite, though, in which case MAKEDEPEND ++# will stay empty. ++if test -z "${MAKEDEPEND}"; then ++ if test -x "../nx-X11/config/makedepend/makedepend"; then ++ MAKEDEPEND="../nx-X11/config/makedepend/makedepend" + fi + fi + +--- a/nxproxy/Makefile.in ++++ b/nxproxy/Makefile.in +@@ -80,9 +80,9 @@ depends: depend.status + depend: depend.status + + depend.status: +- if [ -x $(MAKEDEPEND) ] ; then \ ++ if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \ + $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ +- $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ ++ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ + fi + touch depend.status + diff --git a/debian/patches/0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch b/debian/patches/0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch similarity index 100% rename from debian/patches/0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch rename to debian/patches/0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch diff --git a/debian/patches/0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch b/debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch similarity index 100% rename from debian/patches/0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch rename to debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch diff --git a/debian/patches/0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch b/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch similarity index 100% rename from debian/patches/0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch rename to debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch diff --git a/debian/patches/0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch b/debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch similarity index 100% rename from debian/patches/0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch rename to debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch diff --git a/debian/patches/series b/debian/patches/series index f327ed1..69fca5b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -32,12 +32,6 @@ 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 -0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch -0075_nxcompshad_use-dynamiclib-flag-on-OS-X.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 @@ -67,7 +61,8 @@ 0321_nxagent_x2go-specific-keystroke-config.full.patch 0400_nxcomp-version.full+lite.patch #0401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch +0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch +0420_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch 0600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch 0601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch 0602_nx-X11_initgroups.full.patch @@ -75,8 +70,13 @@ 0605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch 0606_nx-X11_build-on-aarch64.full.patch 0607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch -0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch -0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch +0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch +0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch +0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch +0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch +0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch +0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch +0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch 0990_fix-DEBUG-and-TEST-builds.full.patch 0991_fix-hr-typos.full+lite.patch 0991_fix-hr-typos.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
-
git-admin＠x2go.org