[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.32-1-655-gb15233c

[Ove Kaaven]

The following commit has been merged in the master branch:
commit a6a8c4d9083ed322186f7bd3d8876a5105f700ca
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Sat Nov 14 21:28:27 2009 +0100

    Clean up leftover file debian/noexec.diff.

diff --git a/debian/noexec.diff b/debian/noexec.diff
deleted file mode 100644
index 12b9d74..0000000
--- a/debian/noexec.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 37cc2ae..ee52fe1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -941,6 +941,18 @@ int main(void) {
-   fi
- fi
- 
-+AC_SUBST(EXECSTACK,"")
-+saved_LDFLAGS="$LDFLAGS"
-+LDFLAGS="$LDFLAGS -z execstack"
-+AC_CACHE_CHECK([for -z execstack], ac_cv_z_execstack,
-+   AC_TRY_LINK([],[int main(void) {return 0;}],
-+               ac_cv_z_execstack=yes,ac_cv_z_execstack=no))
-+if test $ac_cv_z_execstack
-+then
-+  EXECSTACK="-z execstack"
-+fi
-+LDFLAGS="$saved_LDFLAGS"
-+
- dnl **** Check how to define a function in assembly code ****
- 
- AC_CACHE_CHECK([how to define a function in assembly code], ac_cv_asm_func_def,
-diff --git a/loader/Makefile.in b/loader/Makefile.in
-index 47a8629..2ef5dfe 100644
---- a/loader/Makefile.in
-+++ b/loader/Makefile.in
-@@ -28,18 +28,19 @@ all: $(WINE_BINARIES) $(MODULE) $(MANPAG
- 
- LIBPTHREAD  = @LIBPTHREAD@
- LDEXECFLAGS = @LDEXECFLAGS@
-+EXECSTACK = @EXECSTACK@
- 
- wine-glibc: glibc.o Makefile.in
- 	$(CC) -o $@ glibc.o $(LIBWINE_LDFLAGS) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS)
- 
- wine-preloader: preloader.o Makefile.in
--	$(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS)
-+	$(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS) $(EXECSTACK)
- 
- wine-kthread: $(KTHREAD_OBJS) Makefile.in
--	$(CC) -o $@ $(LDEXECFLAGS) $(KTHREAD_OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS)
-+	$(CC) -o $@ $(LDEXECFLAGS) $(KTHREAD_OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(EXECSTACK)
- 
- wine-pthread: $(PTHREAD_OBJS) Makefile.in
--	$(CC) -o $@ $(LDEXECFLAGS) $(PTHREAD_OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS)
-+	$(CC) -o $@ $(LDEXECFLAGS) $(PTHREAD_OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(EXECSTACK)
- 
- $(MODULE): $(MAIN_BINARY)
- 	$(RM) $(MODULE) && $(LN_S) $(MAIN_BINARY) $(MODULE)
-

-- 
Debian Wine packaging