From 290e855b0bc7f5b6b5f614f77ead509958535a48 Mon Sep 17 00:00:00 2001 From: Michael Werle Date: Tue, 15 Mar 2011 11:22:08 +0000 Subject: [PATCH] Fixes to deb-package builds. git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4475 127b21dd-08f5-0310-b4b7-95ae10353056 --- GNUmakefile.postamble | 4 ++++ debian/control | 2 +- debian/oolite-data.docs | 2 -- debian/oolite-data.install | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/GNUmakefile.postamble b/GNUmakefile.postamble index ca283195..78b4fa87 100644 --- a/GNUmakefile.postamble +++ b/GNUmakefile.postamble @@ -29,7 +29,11 @@ after-all:: $(CP) $(CP_FLAGS) Resources $(PROGDIR) $(CP) $(CP_FLAGS) Schemata $(PROGDIR)/Resources ifeq ($(ESPEAK),yes) +ifeq ($(GNUSTEP_HOST_OS),mingw32) $(CP) $(CP_FLAGS) deps/Cross-platform-deps/espeak-data $(PROGDIR)/Resources +else ifeq ($(use_deps),yes) + $(CP) $(CP_FLAGS) deps/Cross-platform-deps/espeak-data $(PROGDIR)/Resources +endif endif $(CP) $(CP_FLAGS) src/Cocoa/Info-Oolite.plist $(PROGDIR)/Resources/Info-gnustep.plist $(CP) $(CP_FLAGS) $(GNUSTEP_OBJ_DIR_NAME)/$(SRC_BIN) $(PROGDIR)/$(DEST_BIN) diff --git a/debian/control b/debian/control index e369c165..51ef4531 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5), libsdl1.2-dev, libsdl-mixer1.2-dev, libespeak-dev, libgnustep-base-dev, gnustep-core-devel, libpng-dev, mesa-common-dev, libnspr4-dev, - curl, zip + curl, zip, python Homepage: http://oolite.org/ Vcs-Svn: svn://svn.berlios.de/oolite-linux Vcs-Browser: http://svn.berlios.de/wsvn/oolite-linux diff --git a/debian/oolite-data.docs b/debian/oolite-data.docs index 73efff71..43fcc224 100644 --- a/debian/oolite-data.docs +++ b/debian/oolite-data.docs @@ -7,6 +7,4 @@ Doc/OoliteReadMe.pdf Doc/OoliteRS.pdf Doc/PORTING.TXT Doc/README_LINUX.TXT -Doc/ReadMe.rtfd/TXT.rtf oolite.*/Resources/README.TXT -Doc/AdviceForNewCommanders.pdf diff --git a/debian/oolite-data.install b/debian/oolite-data.install index 1ab959e6..c98c819d 100644 --- a/debian/oolite-data.install +++ b/debian/oolite-data.install @@ -10,6 +10,7 @@ oolite.app/Resources/oolite-expansion-document.icns usr/lib/GNUstep/Applications oolite.app/Resources/oolite-icon.icns usr/lib/GNUstep/Applications/oolite.app/Resources oolite.app/Resources/Scripts usr/lib/GNUstep/Applications/oolite.app/Resources oolite.app/Resources/Shaders usr/lib/GNUstep/Applications/oolite.app/Resources +oolite.app/Resources/Sounds usr/lib/GNUstep/Applications/oolite.app/Resources oolite.app/Resources/Textures usr/lib/GNUstep/Applications/oolite.app/Resources oolite.app/Resources/Schemata usr/lib/GNUstep/Applications/oolite.app/Resources