Re: [X2Go-Dev] [PATCH 6/8] drop debian/patches/001_add-main-makefile.full+lite.patch

-1 from me!!! This will break the tarball generation. Note that we provide nx-libs to several other distros that have no clue about what the /debian folder is for. Such a patch is only ok, if you fix the tarball creator in nx-buildscripts (branch in nx-libs.git). Greets, Mike On Mi 12 Dez 2012 13:13:16 CET Reinhard Tartler wrote:

Instead, place the makefile into debian/Makefile.nx-libs. This makes the makefile easier to edit.

debian/Makefile.nx-libs | 51 +++++++++++ .../patches/001_add-main-makefile.full+lite.patch | 93

debian/patches/series | 1 - debian/rules | 2 + 4 files changed, 53 insertions(+), 94 deletions(-) create mode 100644 debian/Makefile.nx-libs delete mode 100644 debian/patches/001_add-main-makefile.full+lite.patch

diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs new file mode 100644 index 0000000..3151be2 --- /dev/null +++ b/debian/Makefile.nx-libs @@ -0,0 +1,51 @@ +#!/usr/bin/make -f + +PREFIX ?= /usr/local +CONFIGURE=./configure + +%:

• if test -f bin/Makefile; then ${MAKE} -C bin $@; fi
• if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi
• if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi
• if test -d nx-X11; then \

•   if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \

•   if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \

•   if test -f nx-X11/Makefile; then ${MAKE} -C nx-X11 $@; fi; \

• fi
• +all: build
• +test:
• echo "No testing for NX (redistributed)"
• +build-lite:
• cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE}
• cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE}
• +build-full: +# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
• cd nxcomp && autoconf
• cd nxcompext && autoconf
• cd nxcompshad && autoconf
• cd nx-X11 && ${MAKE} World
• cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE}
• +build:
• if ! test -d nx-X11; then \

•   ${MAKE} build-lite; \

• else \

•   ${MAKE} build-full; \

• fi
• +uninstall:
• if test -f bin/Makefile; then ${MAKE} -C bin $@; fi
• if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi
• if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi
• if test -d nx-X11; then \

•   if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \

•   if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \

•   if test -f nx-X11/Makefile; then \

•       if test -d $(PREFIX)/lib/nx; then rm -rf $(PREFIX)/lib/nx; fi; \

•       if test -d $(PREFIX)/include/nx; then rm -rf  

  $(PREFIX)/include/nx; fi; \

•   fi; \

• fi diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch deleted file mode 100644 index 6bbf70b..0000000 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ /dev/null @@ -1,93 +0,0 @@ -Description: Provide main Makefile for whole source tree

• By design this patch is not needed to be sent upstream. -Forwarded: not-needed -Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- /dev/null -+++ b/Makefile -@@ -0,0 +1,51 @@ -+#!/usr/bin/make -f -+ -+PREFIX ?= /usr/local -+CONFIGURE=./configure -+ -+%: -+ if test -f bin/Makefile; then ${MAKE} -C bin $@; fi -+ if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi -+ if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi -+ if test -d nx-X11; then \ -+ if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ -+ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ -+ if test -f nx-X11/Makefile; then ${MAKE} -C nx-X11 $@; fi; \ -+ fi -+ -+all: build -+ -+test: -+ echo "No testing for NX (redistributed)" -+ -+build-lite: -+ cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE} -+ cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} -+ -+build-full: -+# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles... -+ cd nxcomp && autoconf -+ cd nxcompext && autoconf -+ cd nxcompshad && autoconf -+ cd nx-X11 && ${MAKE} World -+ cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE} -+ -+build: -+ if ! test -d nx-X11; then \ -+ ${MAKE} build-lite; \ -+ else \ -+ ${MAKE} build-full; \ -+ fi -+ -+uninstall: -+ if test -f bin/Makefile; then ${MAKE} -C bin $@; fi -+ if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi -+ if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi -+ if test -d nx-X11; then \ -+ if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ -+ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ -+ if test -f nx-X11/Makefile; then \ -+ if test -d $(PREFIX)/lib/nx; then rm -rf $(PREFIX)/lib/nx; fi; \ -+ if test -d $(PREFIX)/include/nx; then rm -rf $(PREFIX)/include/nx; fi; \ -+ fi; \ -+ fi ---- /dev/null -+++ b/bin/Makefile -@@ -0,0 +1,31 @@ -+#!/usr/bin/make -f -+ -+INSTALL_DIR=install -d -o root -g root -m 755 -+INSTALL_FILE=install -o root -g root -m 644 -+INSTALL_PROGRAM=install -o root -g root -m 755 -+ -+RM_FILE=rm -f -+RM_DIR=rmdir -p --ignore-fail-on-non-empty -+ -+DESTDIR= -+PREFIX ?= /usr/local -+BINDIR=$(PREFIX)/bin -+NXLIBDIR=$(PREFIX)/lib/nx -+X2GOLIBDIR=$(PREFIX)/lib/x2go -+ -+%: -+ echo "Nothing to do for $@..." -+ -+install: -+ mkdir -p $(DESTDIR)$(X2GOLIBDIR)/bin -+ $(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ -+ ln -sf $(NXLIBDIR)/bin/nxagent $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent -+ mkdir -p $(DESTDIR)$(BINDIR) -+ find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(DESTDIR)$(BINDIR)/; done -+ find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(DESTDIR)$(BINDIR)/; done -+ -+uninstall: -+ find nx* | while read file; do rm -f $(DESTDIR)$(BINDIR)/$$file; done -+ find x2go* | while read file; do rm -f $(DESTDIR)$(BINDIR)/$$file; done -+ $(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent -+ $(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ diff --git a/debian/patches/series b/debian/patches/series index fb63124..573312b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 000_add-NX-redistribution-README.full+lite.patch -001_add-main-makefile.full+lite.patch 002_nxcompshad_build-against-nx-x11-only.full.patch 003_nxcompshad_gcc43.full.patch 004_nx-X11_fix-nxcompshad-build.full.patch diff --git a/debian/rules b/debian/rules index 79ca44f..7114b24 100755 --- a/debian/rules +++ b/debian/rules @@ -23,6 +23,7 @@ override_dh_clean: rm -f nx-X11/programs/Xserver/hw/nxagent/changelog rm -f nx-X11/programs/nxauth/changelog rm -f nxproxy/changelog

• rm -f Makefile dh_clean

override_dh_auto_build: @@ -34,6 +35,7 @@ override_dh_auto_build: cp -a nx-X11/programs/Xserver/hw/nxagent/CHANGELOG nx-X11/programs/Xserver/hw/nxagent/changelog cp -a nx-X11/programs/nxauth/CHANGELOG nx-X11/programs/nxauth/changelog cp -a nxproxy/CHANGELOG nxproxy/changelog

• ln -s debian/Makefile.nx-libs Makefile

LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt debian/post-build-nx.sh

-- 1.7.10.4

---

X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev

-- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...