This is an automated email from the git hooks/post-receive script. nicobou-guest pushed a commit to branch master in repository oolite.
commit 1d3ebad2f1844eb3121a3ce81bed26c081d561c7 Author: Nicolas Boulenguez <[email protected]> Date: Mon Aug 24 16:58:03 2015 +0200 Update to 1.82: changelog, copyright, patches. Document: README.source, TODO. --- debian/README.source | 6 +++-- debian/changelog | 6 ++--- debian/copyright | 10 ++++---- debian/oolite-doc.TODO | 6 +++++ debian/patches/debian_version_of_libmozjs.diff | 34 +++++++++++++------------- debian/patches/generate_planet_data.diff | 24 +----------------- 6 files changed, 36 insertions(+), 50 deletions(-) diff --git a/debian/README.source b/debian/README.source index f82d899..f2c452e 100644 --- a/debian/README.source +++ b/debian/README.source @@ -11,6 +11,8 @@ This documentation will assume that the downloaded version is Images and sounds are distributed in a separate git submodule, for which diffs do not mean much. Unfortunately, this submodule has no tags and we need to manually do uscan's job. +The submodules are listed at https://github.com/OoliteProject/, +and you will need to find the revision corresponding to $tag. # binrev=22d5bdb097ef50840f0c6a72dcbbdbd761aff643 # wget https://github.com/OoliteProject/oolite-binary-resources/archive/$binrev.tar.gz # mv $binrev.tar.gz oolite_$tag.orig-binary-resources.tar.gz @@ -42,7 +44,7 @@ cd oolite # Extract images and sounds. Git knows nothing about this directory. mkdir binary-resources -tar -xf ../oolite_1.80b.orig-binary-resources.tar.gz -C binary-resources --strip-components=1 +tar -xf ../oolite_$tag.orig-binary-resources.tar.gz -C binary-resources --strip-components=1 # Apply Debian patches, build, unapply Debian patches. debuild -us -uc @@ -52,4 +54,4 @@ debuild clean Launching "gitk --all &" may help a lot. - -- Nicolas Boulenguez <[email protected]>, Sat, 11 Oct 2014 20:53:32 +0200 + -- Nicolas Boulenguez <[email protected]>, Mon, 24 Aug 2015 16:51:47 +0200 diff --git a/debian/changelog b/debian/changelog index a25b2b7..5c8f624 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -oolite (1.80b-1) UNRELEASED; urgency=medium +oolite (1.82-1) UNRELEASED; urgency=medium * New upstream release, splitting sound and images. License update. * Drop unneeded build dependency on gnustep-core-devel. Closes: #749453. * gnustep >= 2.6.6-1 does not need let_gnustep_handle_cflags.diff anymore. - * watch: upstream migrated to github. + * watch: upstream migrated to github. Closes: #755994. * Repackage with Files-Excluded instead of cleaner script and git branch. * Reactivate libespeak support, see #591717. * Standards-Version: 3.9.6 (no changes). @@ -11,7 +11,7 @@ oolite (1.80b-1) UNRELEASED; urgency=medium * Provide a writable XDG_CONFIG_HOME to libreoffice when converting .odt to PDF, lowering the severity of #730893. - -- Nicolas Boulenguez <[email protected]> Thu, 29 May 2014 10:30:54 +0200 + -- Nicolas Boulenguez <[email protected]> Mon, 24 Aug 2015 15:44:03 +0200 oolite (1.77.1-3) unstable; urgency=medium diff --git a/debian/copyright b/debian/copyright index 91d2d01..48b18fb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -44,14 +44,14 @@ Comment: Doc/LICENSE file. Files: * -Copyright: 2004-2014 Giles C Williams and contributors - 2007-2014 the Oolite project +Copyright: 2004-2015 Giles C Williams and contributors + 2007-2015 the Oolite project License: GPL-2+ Files: binary-resources/* installers/FreeDesktop/oolite-icon.png -Copyright: 2004-2014 Giles C Williams and contributors - 2007-2014 the Oolite project +Copyright: 2004-2015 Giles C Williams and contributors + 2007-2015 the Oolite project License: GPL-2+ or CC-BY-NC-SA-3.0 Files: debian/* @@ -59,7 +59,7 @@ Copyright: 2006-2009 Eddy Petrişor <[email protected]> 2009 Darren Salt <[email protected]> 2009 Michael Werle <[email protected]> 2007-2009 Chris Crowther <[email protected]> - 2010-2014 Nicolas Boulenguez <[email protected]> + 2010-2015 Nicolas Boulenguez <[email protected]> License: GPL-3+ License: GPL-2+ diff --git a/debian/oolite-doc.TODO b/debian/oolite-doc.TODO new file mode 100644 index 0000000..0e9851c --- /dev/null +++ b/debian/oolite-doc.TODO @@ -0,0 +1,6 @@ +Forward patches/* (done for 1.77.1-3). + +Check if patches/gnustep_app_builder.diff is stil needed. + +Generate planetinfo at build time, and remove 7Mb from orig.tar.gz, +see http://aegidian.org/bb/viewtopic.php?f=3&t=17678 diff --git a/debian/patches/debian_version_of_libmozjs.diff b/debian/patches/debian_version_of_libmozjs.diff index 92c82e7..496f3bd 100644 --- a/debian/patches/debian_version_of_libmozjs.diff +++ b/debian/patches/debian_version_of_libmozjs.diff @@ -22,7 +22,7 @@ Forwarded: Michael Werle <[email protected]> --- a/src/Core/Scripting/OOJSScript.m +++ b/src/Core/Scripting/OOJSScript.m -@@ -61,11 +61,11 @@ +@@ -62,11 +62,11 @@ static void AddStackToArrayReversed(NSMutableArray *array, RunningStack *stack); @@ -37,7 +37,7 @@ Forwarded: Michael Werle <[email protected]> #endif static NSString *StrippedName(NSString *string); -@@ -118,8 +118,7 @@ +@@ -119,8 +119,7 @@ { JSContext *context = NULL; NSString *problem = nil; // Acts as error flag. @@ -47,7 +47,7 @@ Forwarded: Michael Werle <[email protected]> jsval returnValue = JSVAL_VOID; NSEnumerator *keyEnum = nil; NSString *key = nil; -@@ -149,7 +148,7 @@ +@@ -150,7 +149,7 @@ problem = @"could not add JavaScript root object"; } @@ -56,7 +56,7 @@ Forwarded: Michael Werle <[email protected]> { problem = @"could not add JavaScript root object"; } -@@ -175,7 +174,7 @@ +@@ -176,7 +175,7 @@ if (!problem) { OOLog(@"script.javaScript.willLoad", @"About to load JavaScript %@", path); @@ -65,7 +65,7 @@ Forwarded: Michael Werle <[email protected]> } OOLogIndentIf(@"script.javaScript.willLoad"); -@@ -224,10 +223,9 @@ +@@ -233,10 +232,9 @@ OOJSStopTimeLimiter(); // We don't need the script any more - the event handlers hang around as long as the JS object exists. @@ -77,7 +77,7 @@ Forwarded: Michael Werle <[email protected]> sRunningStack = stackElement.back; -@@ -679,16 +677,16 @@ +@@ -695,16 +693,16 @@ } @@ -97,7 +97,7 @@ Forwarded: Michael Werle <[email protected]> *outErrorMessage = nil; #if OO_CACHE_JS_SCRIPTS -@@ -709,8 +707,7 @@ +@@ -745,8 +743,7 @@ else { script = JS_CompileUCScript(context, object, [data bytes], [data length] / sizeof(unichar), [path UTF8String], 1); @@ -107,7 +107,7 @@ Forwarded: Michael Werle <[email protected]> } #if OO_CACHE_JS_SCRIPTS -@@ -728,7 +725,7 @@ +@@ -764,7 +761,7 @@ #if OO_CACHE_JS_SCRIPTS @@ -116,7 +116,7 @@ Forwarded: Michael Werle <[email protected]> { JSXDRState *xdr = NULL; NSData *result = nil; -@@ -738,7 +735,7 @@ +@@ -774,7 +771,7 @@ xdr = JS_XDRNewMem(context, JSXDR_ENCODE); if (xdr != NULL) { @@ -125,7 +125,7 @@ Forwarded: Michael Werle <[email protected]> { bytes = JS_XDRMemGetData(xdr, &length); if (bytes != NULL) -@@ -753,10 +750,10 @@ +@@ -789,10 +786,10 @@ } @@ -138,7 +138,7 @@ Forwarded: Michael Werle <[email protected]> if (data == nil) return NULL; -@@ -767,7 +764,7 @@ +@@ -803,7 +800,7 @@ if (EXPECT_NOT(length > UINT32_MAX)) return NULL; JS_XDRMemSetData(xdr, (void *)[data bytes], (uint32_t)length); @@ -180,7 +180,7 @@ Forwarded: Michael Werle <[email protected]> ADDITIONAL_OBJC_LIBS = -lglu32 -lopengl32 -lopenal32.dll -lpng14.dll -lmingw32 -lSDLmain -lSDL -lvorbisfile.dll -lvorbis.dll -lz -lgnustep-base -l$(JS_IMPORT_LIBRARY) -lwinmm -mwindows ADDITIONAL_CFLAGS = -DWIN32 -DNEED_STRLCPY `sdl-config --cflags` -mtune=generic # note the vpath stuff above isn't working for me, so adding src/SDL and src/Core explicitly -@@ -40,27 +40,17 @@ +@@ -40,27 +40,18 @@ GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME).spk endif else @@ -196,14 +196,14 @@ Forwarded: Michael Werle <[email protected]> - ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_INC_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug -Isrc/Core/Tables -Isrc/Core/MiniZip - ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lX11 -lSDL -lgnustep-base -l$(LIBJS) `nspr-config --libs` -lstdc++ -lopenal -lz -lvorbisfile - ADDITIONAL_CFLAGS = -Wall -DLINUX -DNEED_STRLCPY `sdl-config --cflags` `nspr-config --cflags` -- ADDITIONAL_OBJCFLAGS = -Wall -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX -Wno-import `sdl-config --cflags` `nspr-config --cflags` +- ADDITIONAL_OBJCFLAGS = -Wall -std=gnu99 -DLOADSAVEGUI -DLINUX -DXP_UNIX -Wno-import `sdl-config --cflags` `nspr-config --cflags` - oolite_LIB_DIRS += -L$(LIBJS_LIB_DIR) -L/usr/X11R6/lib/ -- + ADDITIONAL_INCLUDE_DIRS = -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug -Isrc/Core/Tables + ADDITIONAL_OBJC_LIBS = -lgnustep-base -lstdc++ + ADDITIONAL_CFLAGS = -Wall -DLINUX -DNEED_STRLCPY -+ ADDITIONAL_OBJCFLAGS = -Wall -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX -Wno-import ++ ADDITIONAL_OBJCFLAGS = -Wall -std=gnu99 -DLOADSAVEGUI -DLINUX -DXP_UNIX -Wno-import + oolite_LIB_DIRS += -L/usr/X11R6/lib/ + ifeq ($(use_deps),yes) oolite_LIB_DIRS += -Ldeps/Linux-deps/$(HOST_ARCH)/lib_linker ADDITIONAL_OBJC_LIBS += -lpng14 @@ -214,7 +214,7 @@ Forwarded: Michael Werle <[email protected]> endif ifeq ($(ESPEAK),yes) ADDITIONAL_OBJC_LIBS += -lespeak -@@ -70,6 +60,12 @@ +@@ -70,6 +61,12 @@ ifeq ($(OO_JAVASCRIPT_TRACE),yes) ADDITIONAL_OBJCFLAGS += -DMOZ_TRACE_JSCALLS=1 endif @@ -227,7 +227,7 @@ Forwarded: Michael Werle <[email protected]> endif ifeq ($(profile),yes) -@@ -147,10 +143,7 @@ +@@ -153,10 +150,7 @@ legacy_random.c \ strlcpy.c \ OOTCPStreamDecoder.c \ diff --git a/debian/patches/generate_planet_data.diff b/debian/patches/generate_planet_data.diff index a068f2d..3b77735 100644 --- a/debian/patches/generate_planet_data.diff +++ b/debian/patches/generate_planet_data.diff @@ -1,31 +1,9 @@ Description: GNUmakefile compiling tools/icosmesh - GNUstep Makefile building icosmesh executable. - . Whatever the locale, use a dot as decimal separator in the produced C code. Author: Nicolas Boulenguez <[email protected]> Forwarded: Michael Werle <[email protected]> ---- /dev/null -+++ b/tools/icosmesh/GNUmakefile -@@ -0,0 +1,17 @@ -+# Build the icosmesh executable. -+ -+# Icosmesh generates two C sources named COOPlanetData.[ch], -+# containing roughly 14Mo of precomputed data, -+# and intended to be installed into src/Core/ among Oolite sources. -+ -+include $(GNUSTEP_MAKEFILES)/common.make -+ -+TOOL_NAME := icosmesh -+ -+icosmesh_OBJC_FILES := \ -+ JAIcosMesh.m \ -+ JAIcosTriangle.m \ -+ JAVertexSet.m \ -+ main.m \ -+ -+include $(GNUSTEP_MAKEFILES)/tool.make --- a/tools/icosmesh/main.m +++ b/tools/icosmesh/main.m @@ -3,6 +3,7 @@ @@ -36,7 +14,7 @@ Forwarded: Michael Werle <[email protected]> #import <stdio.h> #import "icosmesh.h" #import "JAIcosTriangle.h" -@@ -79,6 +80,14 @@ +@@ -131,6 +132,14 @@ */ (void)[NSAutoreleasePool new]; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/oolite.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
