From 893c8dbe922b5ee6ac14c3df3b5020817b6797b3 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 15 Jan 2010 19:14:02 +0000 Subject: Fix GNUstep info panel. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1816 --- pkg/Makefile.am | 2 +- pkg/osx/GNUmakefile | 4 ++-- pkg/osx/Info-GNUstep.plist.in | 32 -------------------------------- pkg/osx/Info-gnustep.plist.in | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 pkg/osx/Info-GNUstep.plist.in create mode 100644 pkg/osx/Info-gnustep.plist.in (limited to 'pkg') diff --git a/pkg/Makefile.am b/pkg/Makefile.am index 75520fbd..9775fa77 100644 --- a/pkg/Makefile.am +++ b/pkg/Makefile.am @@ -9,7 +9,7 @@ osx/Resources/launcher.nib/classes.nib \ osx/Resources/launcher.nib/info.nib \ osx/Resources/launcher.nib/keyedobjects.nib \ osx/GNUmakefile \ -osx/Info.plist.in osx/Info-GNUstep.plist.in \ +osx/Info.plist.in osx/Info-gnustep.plist.in \ osx/PkgInfo \ osx/cp-with-libs \ osx/main.m \ diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index d1894bef..d119efa1 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -35,7 +35,7 @@ APP_DIR=$(STAGING_DIR)/$(PACKAGE_NAME).app ifdef GNUSTEP_MAKEFILES APP_TOP_DIR=$(APP_DIR) APP_BIN_DIR=$(APP_DIR) -SRC_INFO_PLIST=Info-GNUstep.plist +SRC_INFO_PLIST=Info-gnustep.plist else APP_TOP_DIR=$(APP_DIR)/Contents APP_BIN_DIR=$(APP_DIR)/Contents/MacOS @@ -51,7 +51,7 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) mkdir -p "$(APP_TOP_DIR)" cp -R Resources "$(APP_TOP_DIR)" cp PkgInfo "$(APP_TOP_DIR)" - cp $(SRC_INFO_PLIST) "$(APP_TOP_DIR)/Info.plist" + cp $(SRC_INFO_PLIST) "$(APP_TOP_DIR)" mkdir -p "$(APP_BIN_DIR)" diff --git a/pkg/osx/Info-GNUstep.plist.in b/pkg/osx/Info-GNUstep.plist.in deleted file mode 100644 index 743816ef..00000000 --- a/pkg/osx/Info-GNUstep.plist.in +++ /dev/null @@ -1,32 +0,0 @@ -{ - ApplicationDescription = "@PACKAGE_NAME@"; - ApplicationIcon = app.png; - ApplicationName = "@PACKAGE_NAME@"; - ApplicationRelease = @PACKAGE_VERSION@; - Copyright = "Copyright (C) 2009-2010"; - CopyrightDescription = "GNU General Public License, version 2"; - FullVersionID = @PACKAGE_VERSION@; - GSMainMarkupFile = ""; - NSExecutable = "launcher"; - NSIcon = app.png; - NSMainNibFile = launcher.nib; - NSPrincipalClass = NSApplication; - NSRole = Application; - NSTypes = ( - { - NSHumanReadableName = "Doom WAD file"; - NSUnixExtensions = ( wad ); - NSRole = Viewer; - NSMimeTypes = ( - "application/x-doom" - ); - NSIcon = "wadfile.png"; - }, - { - NSHumanReadableName = "Dehacked patch"; - NSUnixExtensions = ( deh ); - NSRole = Viewer; - NSIcon = "wadfile.png"; - } - ); -} diff --git a/pkg/osx/Info-gnustep.plist.in b/pkg/osx/Info-gnustep.plist.in new file mode 100644 index 00000000..e7436df2 --- /dev/null +++ b/pkg/osx/Info-gnustep.plist.in @@ -0,0 +1,32 @@ +{ + ApplicationName = "@PACKAGE_NAME@"; + ApplicationDescription = "Doom source port"; + ApplicationIcon = app.png; + ApplicationRelease = @PACKAGE_VERSION@; + Copyright = "Copyright (C) 2009-2010"; + CopyrightDescription = "GNU General Public License, version 2"; + FullVersionID = @PACKAGE_VERSION@; + GSMainMarkupFile = ""; + NSExecutable = "launcher"; + NSIcon = app.png; + NSMainNibFile = launcher.nib; + NSPrincipalClass = NSApplication; + NSRole = Application; + NSTypes = ( + { + NSHumanReadableName = "Doom WAD file"; + NSUnixExtensions = ( wad ); + NSRole = Viewer; + NSMimeTypes = ( + "application/x-doom" + ); + NSIcon = "wadfile.png"; + }, + { + NSHumanReadableName = "Dehacked patch"; + NSUnixExtensions = ( deh ); + NSRole = Viewer; + NSIcon = "wadfile.png"; + } + ); +} -- cgit v1.2.3