[SCM] client, protocol, and server for running Java programs from CLI branch, master, updated. debian/0.9.0+trunk95-3-18-gbcb445c

Hideki Yamane henrich at debian.org
Tue Jun 11 09:52:25 UTC 2013


The following commit has been merged in the master branch:
commit 2dd90b2cfae2b2a8540086a9ccce82eaabad2069
Author: Hideki Yamane <henrich at debian.org>
Date:   Tue Jun 11 18:06:20 2013 +0900

    refresh Makefile_enable_hardening.patch

diff --git a/debian/patches/Makefile_enable_hardening.patch b/debian/patches/Makefile_enable_hardening.patch
index c8ff636..019dd5b 100644
--- a/debian/patches/Makefile_enable_hardening.patch
+++ b/debian/patches/Makefile_enable_hardening.patch
@@ -7,24 +7,22 @@ Origin: vendor
 Forwarded: no
 Last-Update: 2012-07-18
 
-Index: nailgun-0.7.1+trunk95/Makefile
+Index: nailgun/Makefile
 ===================================================================
---- nailgun-0.7.1+trunk95.orig/Makefile	2012-07-19 07:35:11.000000000 +0900
-+++ nailgun-0.7.1+trunk95/Makefile	2012-07-19 07:47:44.933349906 +0900
-@@ -7,14 +7,11 @@
+--- nailgun.orig/Makefile	2013-06-11 18:02:29.576861209 +0900
++++ nailgun/Makefile	2013-06-11 18:03:31.741051396 +0900
+@@ -7,13 +7,11 @@
  # Your compiler location may vary.
  WIN32_CC=/usr/bin/i586-mingw32msvc-gcc
  
 -CC=gcc
 -CFLAGS=-Wall -pedantic -s -O3
--
- ng: src/c/ng.c
+ SRCDIR=nailgun-client
+ 
+ ng: ${SRCDIR}/ng.c
  	@echo "Building ng client.  To build a Windows binary, type 'make ng.exe'"
--	${CC} ${CFLAGS} -o ng src/c/ng.c
-+	${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ng src/c/ng.c
+-	${CC} ${CFLAGS} -o ng ${SRCDIR}/ng.c
++	${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ng ${SRCDIR}/ng.c
  
--ng.exe: src/c/ng.c
-+ng.exe: src/c/ng.c,/usr/bin/i586-mingw32msvc-gcc
- 	${WIN32_CC} -o ng.exe src/c/ng.c -lwsock32 -O3 ${CFLAGS}
- # any idea why the command line is so sensitive to the order of
- # the arguments?  If CFLAGS is at the beginning, it won't link.
+ install: ng
+ 	install ng /usr/local/bin

-- 
client, protocol, and server for running Java programs from CLI



More information about the pkg-java-commits mailing list