This is an automated email from the git hooks/post-receive script. henrich pushed a commit to branch master in repository nailgun.
commit 7cb66d45e0ec5e2127f13bd450452348cce3ee49 Author: Hideki Yamane <henr...@debian.org> Date: Thu Feb 1 21:20:13 2018 +0900 refresh patches --- debian/changelog | 1 + debian/patches/disable_install_target.patch | 17 +++++++++++------ debian/patches/name_define_as_ng-nailgun_ng.c.patch | 10 ++++------ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index cb89781..cc35e44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ nailgun (0.9.3-1) UNRELEASED; urgency=medium * New upstream release * debian/patches - drop Makefile_enable_hardening.patch: merged upstream + - refresh other patches -- Hideki Yamane <henr...@debian.org> Thu, 01 Feb 2018 21:13:51 +0900 diff --git a/debian/patches/disable_install_target.patch b/debian/patches/disable_install_target.patch index 1ba836b..b7ea6ed 100644 --- a/debian/patches/disable_install_target.patch +++ b/debian/patches/disable_install_target.patch @@ -8,17 +8,22 @@ Origin: vendor Forwarded: not-needed Last-Update: 2013-06-11 -Index: nailgun/Makefile -=================================================================== ---- nailgun.orig/Makefile 2013-06-11 18:03:31.741051396 +0900 -+++ nailgun/Makefile 2013-06-11 18:05:00.617323560 +0900 -@@ -13,9 +13,6 @@ +--- a/Makefile ++++ b/Makefile +@@ -15,10 +15,6 @@ @echo "Building ng client. To build a Windows binary, type 'make ng.exe'" ${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ng ${SRCDIR}/ng.c -install: ng -- install ng /usr/local/bin +- install -d ${PREFIX}/bin +- install ng ${PREFIX}/bin - ng.exe: ${SRCDIR}/ng.c ${WIN32_CC} -o ng.exe ${SRCDIR}/ng.c -lwsock32 -O3 ${CFLAGS} # any idea why the command line is so sensitive to the order of +@@ -30,5 +26,4 @@ + @echo "You must remove this manually. Most users won't have MinGW" + @echo "installed - so I'd rather not delete something you can't rebuild." + @echo "" +- rm -f ng + # rm -f ng.exe diff --git a/debian/patches/name_define_as_ng-nailgun_ng.c.patch b/debian/patches/name_define_as_ng-nailgun_ng.c.patch index 784db32..175774c 100644 --- a/debian/patches/name_define_as_ng-nailgun_ng.c.patch +++ b/debian/patches/name_define_as_ng-nailgun_ng.c.patch @@ -10,11 +10,9 @@ Bug-Ubuntu: https://launchpad.net/bugs/793859 Forwarded: no Last-Update: 2013-06-11 -Index: nailgun/nailgun-client/ng.c -=================================================================== ---- nailgun.orig/nailgun-client/ng.c 2013-06-11 17:34:55.019861721 +0900 -+++ nailgun/nailgun-client/ng.c 2013-06-11 18:01:41.052712855 +0900 -@@ -74,7 +74,7 @@ +--- a/nailgun-client/ng.c ++++ b/nailgun-client/ng.c +@@ -81,7 +81,7 @@ #define NAILGUN_CLIENT_NAME_EXE "ng.exe" #define NAILGUN_PORT_DEFAULT "2113" @@ -23,7 +21,7 @@ Index: nailgun/nailgun-client/ng.c #define CHUNK_HEADER_LEN (5) #define NAILGUN_SOCKET_FAILED (231) -@@ -511,9 +511,9 @@ +@@ -622,9 +622,9 @@ */ void usage(int exitcode) { fprintf(stderr, "NailGun v%s\n\n", NAILGUN_VERSION); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/nailgun.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits