diff options
| -rw-r--r-- | installer_macx/MumbleInstaller.pmdoc/01mumble-contents.xml | 1 | ||||
| -rw-r--r-- | installer_macx/MumbleInstaller.pmdoc/01mumble.xml | 24 | ||||
| -rw-r--r-- | installer_macx/MumbleInstaller.pmdoc/index.xml | 32 | ||||
| -rw-r--r-- | installer_macx/en/complete.html | 25 | ||||
| -rw-r--r-- | installer_macx/en/welcome.html | 13 | ||||
| -rw-r--r-- | installer_macx/license.html | 72 | ||||
| -rw-r--r-- | installer_macx/license.py | 8 | ||||
| -rw-r--r-- | installer_macx/license.tmpl | 38 | ||||
| -rwxr-xr-x | installer_macx/scripts/postflight | 20 | ||||
| -rw-r--r-- | installer_macx/tidy-xml.sh | 3 | ||||
| -rw-r--r-- | macx/DS_Store (renamed from installer_macx/DS_Store) | bin | 8196 -> 8196 bytes | |||
| -rwxr-xr-x | macx/gendmg.pl (renamed from installer_macx/gendmg.pl) | 0 |
12 files changed, 0 insertions, 236 deletions
diff --git a/installer_macx/MumbleInstaller.pmdoc/01mumble-contents.xml b/installer_macx/MumbleInstaller.pmdoc/01mumble-contents.xml deleted file mode 100644 index 69b34eadc..000000000 --- a/installer_macx/MumbleInstaller.pmdoc/01mumble-contents.xml +++ /dev/null @@ -1 +0,0 @@ -<pkg-contents spec="1.12" /> diff --git a/installer_macx/MumbleInstaller.pmdoc/01mumble.xml b/installer_macx/MumbleInstaller.pmdoc/01mumble.xml deleted file mode 100644 index 00a0470ce..000000000 --- a/installer_macx/MumbleInstaller.pmdoc/01mumble.xml +++ /dev/null @@ -1,24 +0,0 @@ -<pkgref spec="1.12" uuid="6AB1E063-9961-4D61-A451-60139AFE7955"> - <config> - <identifier>net.sourceforge.mumble.base</identifier> - <version>1.2.3</version> - <description></description> - <post-install type="none" /> - <requireAuthorization /> - <installTo>/</installTo> - <flags> - <followSymbolicLinks /> - </flags> - <packageStore type="internal"></packageStore> - <mod>parent</mod> - <mod>version</mod> - <mod>postInstall</mod> - <mod>identifier</mod> - <mod>installTo</mod> - </config> - <extra> - <packagePath relative="true" mod="true">../release/Mumble-Base.pkg</packagePath> - <title>Mumble Base</title> - <file-prefix></file-prefix> - </extra> -</pkgref> diff --git a/installer_macx/MumbleInstaller.pmdoc/index.xml b/installer_macx/MumbleInstaller.pmdoc/index.xml deleted file mode 100644 index f38403f50..000000000 --- a/installer_macx/MumbleInstaller.pmdoc/index.xml +++ /dev/null @@ -1,32 +0,0 @@ -<pkmkdoc spec="1.12"> - <properties> - <title>Mumble</title> - <build>release/Install Mumble.pkg</build> - <organization>net.sourceforge.mumble</organization> - <userSees ui="easy" /> - <min-target os="2" /> - <domain system="true" /> - </properties> - <distribution> - <versions min-spec="1.000000" /> - <scripts></scripts> - </distribution> - <contents> - <choice title="Mumble Base" id="base" starts_selected="true" starts_enabled="true" starts_hidden="false"> - <pkgref id="net.sourceforge.mumble.base" /> - </choice> - </contents> - <resources bg-scale="none" bg-align="left"> - <locale lang="en"> - <resource relative="true" mod="true" type="background">../icons/mumble.osx.installer.png</resource> - <resource relative="true" mod="true" type="license">license.html</resource> - <resource relative="true" mod="true" type="welcome">en/welcome.html</resource> - <resource relative="true" mod="true" type="conclusion">en/complete.html</resource> - </locale> - </resources> - <flags /> - <item type="flat-pkgref">01mumble.xml</item> - <mod>properties.title</mod> - <mod>properties.systemDomain</mod> - <mod>properties.anywhereDomain</mod> -</pkmkdoc> diff --git a/installer_macx/en/complete.html b/installer_macx/en/complete.html deleted file mode 100644 index b34c7ec36..000000000 --- a/installer_macx/en/complete.html +++ /dev/null @@ -1,25 +0,0 @@ -<html> - <head> - <style> - body { font-family: Helvetica; font-size: 13px; } - </style> - </head> - <body> - - Congratulations, the Mumble installation completed successfully.<br /><br /> - For more Mumble information, please check out the links below: <br /><br /> - - <ul> - <li><a href="http://mumble.sourceforge.net/">Visit the Mumble website</a></li> - <li><a href="http://sourceforge.net/forum/?group_id=147372">Visit the Mumble forums</a></li> - <li><a href="http://sourceforge.net/tracker/?group_id=147372&atid=768005">Report Mumble bugs</a></li> - <li><a href="http://sourceforge.net/tracker/?group_id=147372&atid=768008">Request new Mumble features</a></li> - <li><a href="https://sourceforge.net/project/project_donations.php?group_id=147372">Donate to the Mumble project</a></li> - </ul> - - <br /><br /> - Enjoy using Mumble! - - </body> -</html> - diff --git a/installer_macx/en/welcome.html b/installer_macx/en/welcome.html deleted file mode 100644 index 9ed7b5f44..000000000 --- a/installer_macx/en/welcome.html +++ /dev/null @@ -1,13 +0,0 @@ -<html> - <head> - <style> - body { font-family: Helvetica; font-size: 13px; } - </style> - </head> - <body> - <p>Mumble is a low-latency, high-quality voice communication for gamers. - It includes game linking, so voice from other players comes from the direction - of their in-game characters, and has echo cancellation so the sound from your - loudspeakers won't be audible to other players.</p> - </body> -</html> diff --git a/installer_macx/license.html b/installer_macx/license.html deleted file mode 100644 index f8da6b867..000000000 --- a/installer_macx/license.html +++ /dev/null @@ -1,72 +0,0 @@ -<html> - <head> - <style> - pre { - font-size: 10px; - } - </style> - </head> - <body> - <pre>Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com> -Copyright (C) 2007, Stefan Gehn <mETz AT gehn DOT net> -Copyright (C) 2007, Sebastian Schlingmann <mit_service@users.sourceforge.net> -Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> -Copyright (C) 2008, Andreas Messer <andi@bupfen.de> -Copyright (C) 2007, Trenton Schulz -Copyright (C) 2008-2009, Stefan Hacker <dd0t@users.sourceforge.net> - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -- Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -- Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -- Neither the name of the Mumble Developers nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -`AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ---- - -Mumble uses the Qt 4 library (http://www.qtsoftware.com), which is -licensed under the LGPL 2.1 license. The Qt 4 license can be found -in the Licenses folder on the disk image containing the Mumble installer - -Mumble uses the Speex library (http://www.speex.org), which is licensed -under the BSD license. The Speex license can be found in the Licenses -folder on the disk image containing the Mumble installer. - -Mumble uses the PortAudio library (http://www.portaudio.com), which is -licensed under the PortAudio license. The PortAudio license is simmilar -to the MIT license, but with an extra non-binding request. The PortAudio -license can be found in the Licenses folder on the disk image containing -the Mumble installer. - -The Mumble OpenGL overlay on Mac OS X uses mach_star -(http://github.com/rentzsch/mach_star/), which is licensed under the MIT -license. The mach_star license can be found on the disk image containing -the Mumble installer. - -Murmur (the server component of Mumble) makes use of ZeroC Ice. -(http://www.zeroc.com/). Ice is licensed under the terms of the GPL v2. -The ZeroC Ice license can be found in the Licenses folder on the disk image -containing the Mumble installer.</pre> - </body> -</html> - diff --git a/installer_macx/license.py b/installer_macx/license.py deleted file mode 100644 index ab71a0704..000000000 --- a/installer_macx/license.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python -# update license.html from the template - -l = open('../LICENSE').read() -l = l.replace('<', '<').replace('>', '>') -tmpl = open('license.tmpl').read() -s = tmpl.replace('{{LICENSE}}', l) -out = open('license.html', 'w').write(s) diff --git a/installer_macx/license.tmpl b/installer_macx/license.tmpl deleted file mode 100644 index 8b37b4489..000000000 --- a/installer_macx/license.tmpl +++ /dev/null @@ -1,38 +0,0 @@ -<html> - <head> - <style> - pre { - font-size: 10px; - } - </style> - </head> - <body> - <pre>{{LICENSE}} ---- - -Mumble uses the Qt 4 library (http://www.qtsoftware.com), which is -licensed under the LGPL 2.1 license. The Qt 4 license can be found -in the Licenses folder on the disk image containing the Mumble installer - -Mumble uses the Speex library (http://www.speex.org), which is licensed -under the BSD license. The Speex license can be found in the Licenses -folder on the disk image containing the Mumble installer. - -Mumble uses the PortAudio library (http://www.portaudio.com), which is -licensed under the PortAudio license. The PortAudio license is simmilar -to the MIT license, but with an extra non-binding request. The PortAudio -license can be found in the Licenses folder on the disk image containing -the Mumble installer. - -The Mumble OpenGL overlay on Mac OS X uses mach_star -(http://github.com/rentzsch/mach_star/), which is licensed under the MIT -license. The mach_star license can be found on the disk image containing -the Mumble installer. - -Murmur (the server component of Mumble) makes use of ZeroC Ice. -(http://www.zeroc.com/). Ice is licensed under the terms of the GPL v2. -The ZeroC Ice license can be found in the Licenses folder on the disk image -containing the Mumble installer.</pre> - </body> -</html> - diff --git a/installer_macx/scripts/postflight b/installer_macx/scripts/postflight deleted file mode 100755 index a9847e9f2..000000000 --- a/installer_macx/scripts/postflight +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -INSTALL_PKG=$1 -INSTALL_DEST=$2 -INSTALL_VOL=$3 -INSTALL_ROOT=$4 - -# Change owner/group of app bundle -chown -R root:admin ${INSTALL_DEST}/Applications/Mumble.app/ -chown -R root:admin ${INSTALL_DEST}/Applications/Mumble11x.app/ - -# If we installed with an input manager, change the perms accordingly. -OVERLAY_PATH=${INSTALL_DEST}/Library/InputManagers/MumbleOverlayEnabler/ -if [ -d $OVERLAY_PATH ]; then - chown -vR root:admin ${OVERLAY_PATH} - chmod -vR 755 ${OVERLAY_PATH} - chmod 444 ${OVERLAY_PATH}/Info - chmod 444 ${OVERLAY_PATH}/MumbleOverlayEnabler.bundle/Contents/Info.plist - chmod 444 ${OVERLAY_PATH}/MumbleOverlay.bundle/Contents/Info.plist -fi diff --git a/installer_macx/tidy-xml.sh b/installer_macx/tidy-xml.sh deleted file mode 100644 index adca201d5..000000000 --- a/installer_macx/tidy-xml.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -# Tidy up the xml that PackageMaker spits out. -tidy -mi -xml -utf8 MumbleInstaller.pmdoc/*.xml diff --git a/installer_macx/DS_Store b/macx/DS_Store Binary files differindex 9baa5d1e6..9baa5d1e6 100644 --- a/installer_macx/DS_Store +++ b/macx/DS_Store diff --git a/installer_macx/gendmg.pl b/macx/gendmg.pl index 475295d56..475295d56 100755 --- a/installer_macx/gendmg.pl +++ b/macx/gendmg.pl |