[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. byteme/1.20.7-1-10-g91941d4
Robin Cornelius
robin.cornelius at gmail.com
Thu May 29 16:59:05 UTC 2008
The following commit has been merged in the master branch:
commit 0daa831af103cf4305dd61636b9e80cc7c946dd9
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date: Thu May 29 12:43:27 2008 +0100
Commence the big package name change to comply with trademarks
diff --git a/debian/changelog b/debian/changelog
index 0d958c8..666e472 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+slviewer (1.20.8-1) experimental; urgency=low
+
+ * New Upstream Version
+
+ -- Robin Cornelius <robin at debian.example.org> Thu, 29 May 2008 12:36:33 +0100
+
slviewer (1.20.7-1) experimental; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index f46509b..25c49a8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: slviewer
+Source: omvviewer
Section: games
Priority: extra
Maintainer: Secondlife Debian Team <secondlife-debian-maintainers at slupdate.byteme.org.uk>
@@ -8,25 +8,31 @@ Standards-Version: 3.7.2
XS-Vcs-Svn: svn://slupdate.byteme.org.uk/slviewer/slviewer/trunk
XS-Vcs-Browser: http://slupdate.byteme.org.uk/
-Package: slviewer
+Package: omvviewer
Architecture: i386 amd64 powerpc
-Depends: ${misc:Depends}, ${shlibs:Depends}, slviewer-data (= ${binary:Version}), slviewer-artwork (>= 1.20.4.0), ttf-kochi-mincho, ttf-dejavu, libc-ares1
+Depends: ${misc:Depends}, ${shlibs:Depends}, omvviewer-data (= ${binary:Version}), slviewer-artwork (>= 1.20.4.0), ttf-kochi-mincho, ttf-dejavu, libc-ares1
Recommends: libgstreamer0.10-0, libgstreamer-plugins-base0.10-0
-Conflicts: libcares2
-Description: Second Life grid client
- This package contains the Second Life client for connecting to
- Second Life server grids
+Replaces: slviewer
+Description: Open Metaverse Viewer
+ A client for conecting to 3D virtual worlds such as SecondLife(tm)
+ or servers operating the OpenSim package. This client is based on
+ the offical version from Linden Labs, with the addition of patches
+ to enable cleaner integration with Debian and stability and bug fixes
+ .
+ The package is renamed to avoid use of Linden Lab's trademarks
-Package: slviewer-dbg
+Package: omvviewer-dbg
Architecture: i386 amd64 powerpc
-Depends: slviewer (= ${binary:Version})
+Depends: omvviewer (= ${binary:Version})
+Replaces: slviewer-dbg
Description: Second Life grid client
- This package contains the debug symbols for the slviewer binary
- of the Second Life client for connecting to Second Life server grids
-
-Package: slviewer-data
+ This package contains the debug symbols for the omvviewer and should
+ be installed to enabled debugging of the application
+
+Package: omvviewer-data
Architecture: all
-Recommends: slviewer
-Description: Datafiles for slviewer
- This package contains the static datafiles needed by a Second Life
- client to connect to a Second Life server grid
+Recommends: omvviewer
+Replaces: slviewer-data
+Description: Datafiles for Open Metaverse viewer
+ This package contains the static datafiles needed by a Open
+ Metaverse client to connect to a grid service such as Secondlife(tm)
diff --git a/debian/omvviewer-data.dirs b/debian/omvviewer-data.dirs
new file mode 100644
index 0000000..ba8aad9
--- /dev/null
+++ b/debian/omvviewer-data.dirs
@@ -0,0 +1 @@
+usr/share/omvviewer
\ No newline at end of file
diff --git a/debian/slviewer-data.install b/debian/omvviewer-data.install
similarity index 100%
rename from debian/slviewer-data.install
rename to debian/omvviewer-data.install
diff --git a/debian/slviewer.6 b/debian/omvviewer.6
similarity index 100%
rename from debian/slviewer.6
rename to debian/omvviewer.6
diff --git a/debian/omvviewer.README.Debian b/debian/omvviewer.README.Debian
new file mode 100644
index 0000000..6069fdc
--- /dev/null
+++ b/debian/omvviewer.README.Debian
@@ -0,0 +1,42 @@
+
+------ Fonts ------
+
+As the fonts used in the upstream viewer cannot be distributed with
+Debian, the default fonts have been changed as follows:
+FontMonospace: /usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
+FontSansSerif: /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
+FontSansSerifFallback: /usr/share/fonts/truetype/kochi/kochi-mincho.ttf
+FontSansSerifBold: /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
+
+These can be overridden in your settings.xml (see ~/.secondlife) as per usual.
+Multiple fallback fonts (i.e. for when FontSansSerif doesn't have the requested
+character set) can be listed, separated by ;.
+
+At the moment, fonts must be listed by full pathname.
+
+Suggestions for other default fallback fonts, or just a better font selection,
+are very welcome in the Debian Bugtracking System.
+
+------ External www-browser ------
+
+The default behaviour of Secondlife is to call launch.sh to run an external web
+browser. The behaviour is modified in the Debian package so that the viewer will
+first look for the environmental variable BROSWER and run that if found. If not
+found it will directly call the symbolic link /etc/alternatives/x-www-browser.
+This is the Debian system default browser.
+
+------ Read only data ------
+
+The default behaviour for Secondlife is to exist in a self contained tree with
+all binaries/artwork and data to exist with in a structure of this tree. This
+Debian package is modified so that the read-only (non arch specific) data is
+moved to a FSH compliant location of /usr/share/secondlife. The main executable
+is placed in /usr/bin/ and named slviewer. User data is stored under the users
+home directory ~/.secondlife/
+
+
+
+
+
+
+
diff --git a/debian/omvviewer.desktop b/debian/omvviewer.desktop
new file mode 100644
index 0000000..fbcf613
--- /dev/null
+++ b/debian/omvviewer.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Open Metaverse viewer
+Comment=A client for connecting to 3D metaverses such as Second Life(tm)
+Exec=omvviewer
+Icon=viewericon
+Terminal=false
+Type=Application
+Categories=Games;Simulation;
+StartupNotify=true
diff --git a/debian/slviewer.dirs b/debian/omvviewer.dirs
similarity index 100%
rename from debian/slviewer.dirs
rename to debian/omvviewer.dirs
diff --git a/debian/omvviewer.gconf-defaults b/debian/omvviewer.gconf-defaults
new file mode 100644
index 0000000..8d1a69e
--- /dev/null
+++ b/debian/omvviewer.gconf-defaults
@@ -0,0 +1 @@
+desktop/gnome/url-handlers/secondlife/command omvviewer -url %s
diff --git a/debian/omvviewer.install b/debian/omvviewer.install
new file mode 100644
index 0000000..b559967
--- /dev/null
+++ b/debian/omvviewer.install
@@ -0,0 +1,6 @@
+indra/newview/omvviewer usr/bin/
+indra/newview/res/viewericon.xpm usr/share/pixmaps/
+debian/omvviewer.desktop usr/share/applications/
+
+
+
diff --git a/debian/slviewer.manpages b/debian/omvviewer.manpages
similarity index 100%
rename from debian/slviewer.manpages
rename to debian/omvviewer.manpages
diff --git a/debian/omvviewer.menu b/debian/omvviewer.menu
new file mode 100644
index 0000000..5b5dcc7
--- /dev/null
+++ b/debian/omvviewer.menu
@@ -0,0 +1,3 @@
+?package(slviewer):needs="x11" section="Games/Simulation"\
+ title="Open Metaverse Viewer" command="/usr/bin/slviewer" \
+ icon="/usr/share/pixmaps/viewericon.xpm"
diff --git a/debian/patches/0000_valgrind_wild_vars.dpatch b/debian/patches/0000_valgrind_wild_vars.dpatch
new file mode 100755
index 0000000..738a613
--- /dev/null
+++ b/debian/patches/0000_valgrind_wild_vars.dpatch
@@ -0,0 +1,164 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Fix valgrid errors.dpatch by <root at debian>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: valgrinding
+
+ at DPATCH@
+
+Index: ./indra/newview/lltexturefetch.cpp
+===================================================================
+--- ./indra/newview/lltexturefetch.cpp (revision 376)
++++ ./indra/newview/lltexturefetch.cpp (working copy)
+@@ -420,7 +420,8 @@
+ mFirstPacket(0),
+ mLastPacket(-1),
+ mTotalPackets(0),
+- mImageCodec(IMG_CODEC_INVALID)
++ mImageCodec(IMG_CODEC_INVALID),
++ mAccelerateDownloadStuckTexture(FALSE)
+ {
+ calcWorkPriority();
+ mType = host.isOk() ? LLImageBase::TYPE_AVATAR_BAKE : LLImageBase::TYPE_NORMAL;
+Index: ./indra/newview/llvoavatar.cpp
+===================================================================
+--- ./indra/newview/llvoavatar.cpp (revision 376)
++++ ./indra/newview/llvoavatar.cpp (working copy)
+@@ -680,7 +680,10 @@
+ mTexEyeColor( NULL ),
+ mNeedsSkin(FALSE),
+ mUpdatePeriod(1),
+- mFullyLoadedInitialized(FALSE)
++ mPreviousFullyLoaded(FALSE),
++ mVisibleChat( FALSE ),
++ mFullyLoadedInitialized(FALSE),
++ mFullyLoaded(FALSE)
+ {
+ LLMemType mt(LLMemType::MTYPE_AVATAR);
+
+Index: ./indra/newview/llfloaterfriends.cpp
+===================================================================
+--- ./indra/newview/llfloaterfriends.cpp (revision 376)
++++ ./indra/newview/llfloaterfriends.cpp (working copy)
+@@ -70,6 +70,7 @@
+ public:
+ LLLocalFriendsObserver(LLPanelFriends* floater) : mFloater(floater), LLEventTimer(OBSERVER_TIMEOUT)
+ {
++ mMask = 0; // Valgrinding alerts this as used wild
+ mEventTimer.stop();
+ }
+ virtual ~LLLocalFriendsObserver()
+Index: ./indra/newview/llviewerparcelmediaautoplay.cpp
+===================================================================
+--- ./indra/newview/llviewerparcelmediaautoplay.cpp (revision 376)
++++ ./indra/newview/llviewerparcelmediaautoplay.cpp (working copy)
+@@ -48,7 +48,8 @@
+ LLViewerParcelMediaAutoPlay::LLViewerParcelMediaAutoPlay() :
+ LLEventTimer(1),
+ mPlayed(FALSE),
+- mTimeInParcel(0)
++ mTimeInParcel(0),
++ mLastParcelID(0)
+ {
+ }
+
+Index: ./indra/llcharacter/lljoint.cpp
+===================================================================
+--- ./indra/llcharacter/lljoint.cpp (revision 376)
++++ ./indra/llcharacter/lljoint.cpp (working copy)
+@@ -70,6 +70,7 @@
+ mXform.setScale(LLVector3(1.0f, 1.0f, 1.0f));
+ mDirtyFlags = MATRIX_DIRTY | ROTATION_DIRTY | POSITION_DIRTY;
+ mJointNum = 0;
++ mUpdateXform = TRUE; // Valgrind catch, Check this is the correct init here for this state
+
+ setName(name);
+ if (parent)
+Index: ./indra/llcharacter/llkeyframemotion.cpp
+===================================================================
+--- ./indra/llcharacter/llkeyframemotion.cpp (revision 376)
++++ ./indra/llcharacter/llkeyframemotion.cpp (working copy)
+@@ -72,6 +72,11 @@
+ //-----------------------------------------------------------------------------
+ LLKeyframeMotion::JointMotionList::JointMotionList()
+ {
++ // mMaxPriority IS being used wild in some comparisions,
++ // it needs defaulting, but this might not be the
++ // best deafult MichelleZ
++
++ mMaxPriority=LLJoint::MEDIUM_PRIORITY;
+ }
+
+ LLKeyframeMotion::JointMotionList::~JointMotionList()
+Index: ./indra/llui/lltextbox.cpp
+===================================================================
+--- ./indra/llui/lltextbox.cpp (revision 376)
++++ ./indra/llui/lltextbox.cpp (working copy)
+@@ -102,6 +102,8 @@
+ mBorderVisible(FALSE),
+ mFontStyle(LLFontGL::DROP_SHADOW_SOFT),
+ mBorderDropShadowVisible(FALSE),
++ mUseEllipses( FALSE ),
++ mHasHover( FALSE ),
+ mHPad(0),
+ mVPad(0),
+ mHAlign(LLFontGL::LEFT),
+@@ -124,6 +126,8 @@
+ mBorderVisible(FALSE),
+ mFontStyle(LLFontGL::DROP_SHADOW_SOFT),
+ mBorderDropShadowVisible(FALSE),
++ mUseEllipses( FALSE ),
++ mHasHover( FALSE ),
+ mHPad(0),
+ mVPad(0),
+ mHAlign(LLFontGL::LEFT),
+Index: ./indra/llui/lltexteditor.cpp
+===================================================================
+--- ./indra/llui/lltexteditor.cpp (revision 376)
++++ ./indra/llui/lltexteditor.cpp (working copy)
+@@ -282,7 +282,9 @@
+ mMouseDownX(0),
+ mMouseDownY(0),
+ mLastSelectionX(-1),
+- mLastSelectionY(-1)
++ mLastSelectionY(-1),
++ mScrolledToBottom( FALSE ),
++ mHoverSegment( NULL )
+ {
+ mSourceID.generate();
+
+Index: ./indra/llimage/llimagetga.cpp
+===================================================================
+--- ./indra/llimage/llimagetga.cpp (revision 376)
++++ ./indra/llimage/llimagetga.cpp (working copy)
+@@ -35,7 +35,7 @@
+ #include "llmath.h"
+
+ // For expanding 5-bit pixel values to 8-bit with best rounding
+-// static
++// staticn
+ const U8 LLImageTGA::s5to8bits[32] =
+ {
+ 0, 8, 16, 25, 33, 41, 49, 58,
+@@ -80,7 +80,7 @@
+
+ LLImageTGA::~LLImageTGA()
+ {
+- delete mColorMap;
++ delete[] mColorMap;
+ }
+
+ BOOL LLImageTGA::updateData()
+Index: ./indra/llmessage/llcurl.cpp
+===================================================================
+--- ./indra/llmessage/llcurl.cpp (revision 376)
++++ ./indra/llmessage/llcurl.cpp (working copy)
+@@ -281,7 +281,7 @@
+ curl_easy_cleanup(mCurlEasyHandle);
+ --gCurlEasyCount;
+ curl_slist_free_all(mHeaders);
+- for_each(mStrings.begin(), mStrings.end(), DeletePointer());
++ for_each(mStrings.begin(), mStrings.end(), DeletePointerArray());
+ }
+
+ void LLCurl::Easy::resetState()
diff --git a/debian/patches/00list b/debian/patches/00list
index 2b34479..a0a9136 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -95,3 +95,4 @@ VWR-1815_top_corner_fix.dpatch
0001_possible_crash_in_llviewerpartssim.dpatch
VWR-5697_fix_startup_paths.dpatch
VWR-7271_fix_mutlist_for_amd64.dpatch
+0000_valgrind_wild_vars.dpatch
diff --git a/debian/patches/22_build_more_approprate_binary_name.dpatch b/debian/patches/22_build_more_approprate_binary_name.dpatch
index 91eb19b..f66f22e 100755
--- a/debian/patches/22_build_more_approprate_binary_name.dpatch
+++ b/debian/patches/22_build_more_approprate_binary_name.dpatch
@@ -15,7 +15,7 @@ Index: ./indra/SConstruct
# BUILD NEWVIEW #
##################
- output_bin = 'newview/secondlife-' + arch + '-bin'
-+ output_bin = 'newview/slviewer'
++ output_bin = 'newview/omvviewer'
external_libs = client_external_libs + common_external_libs
diff --git a/debian/patches/22_build_more_approprate_binary_name.dpatch b/debian/patches/22_build_more_approprate_binary_name.dpatch~
old mode 100755
new mode 100644
similarity index 100%
copy from debian/patches/22_build_more_approprate_binary_name.dpatch
copy to debian/patches/22_build_more_approprate_binary_name.dpatch~
diff --git a/debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch b/debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch
index 9661b52..d3b1a5e 100755
--- a/debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch
+++ b/debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch
@@ -13,7 +13,7 @@ diff -urNad linden~/indra/llvfs/lldir_linux.cpp linden/indra/llvfs/lldir_linux.c
mExecutableDir = tmp_str;
mWorkingDir = tmp_str;
- mAppRODataDir = tmp_str;
-+ mAppRODataDir = "/usr/share/secondlife";
++ mAppRODataDir = "/usr/share/omvviewer";
mOSUserDir = getCurrentUserHome(tmp_str);
mOSUserAppDir = "";
mLindenUserDir = tmp_str;
diff --git a/debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch b/debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch~
old mode 100755
new mode 100644
similarity index 100%
copy from debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch
copy to debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch~
diff --git a/debian/patches/79_use_debian_channel.dpatch b/debian/patches/79_use_debian_channel.dpatch
index 38e6136..8edfbae 100755
--- a/debian/patches/79_use_debian_channel.dpatch
+++ b/debian/patches/79_use_debian_channel.dpatch
@@ -14,5 +14,5 @@ Index: ./indra/llcommon/llversionviewer.h
@@ -39,3 +39,3 @@
-const char * const LL_CHANNEL = "Second Life Release";
-+const char * const LL_CHANNEL = "Second Life Debian OSS Release";
++const char * const LL_CHANNEL = "Open Metaverse Viewer";
diff --git a/debian/patches/79_use_debian_channel.dpatch~ b/debian/patches/79_use_debian_channel.dpatch~
new file mode 100644
index 0000000..8edfbae
--- /dev/null
+++ b/debian/patches/79_use_debian_channel.dpatch~
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## change channel version.dpatch by <robin at debian>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+
+ #endif
+Index: ./indra/llcommon/llversionviewer.h
+===================================================================
+--- ./indra/llcommon/llversionviewer.h (revision 217)
++++ ./indra/llcommon/llversionviewer.h (working copy)
+@@ -39,3 +39,3 @@
+
+-const char * const LL_CHANNEL = "Second Life Release";
++const char * const LL_CHANNEL = "Open Metaverse Viewer";
+
diff --git a/debian/patches/trademark_compliance.dpatch b/debian/patches/trademark_compliance.dpatch
index c226696..ae3e79c 100755
--- a/debian/patches/trademark_compliance.dpatch
+++ b/debian/patches/trademark_compliance.dpatch
@@ -19,3 +19,42 @@ Index: ./indra/llwindow/llwindowsdl.cpp
if (bmpsurface)
{
// This attempts to give a black-keyed mask to the icon.
+Index: indra/newview/llappviewer.cpp
+===================================================================
+--- ./indra/newview/llappviewer.cpp (revision 382)
++++ ./indra/newview/llappviewer.cpp (working copy)
+@@ -1756,7 +1756,7 @@
+ mYieldTime = gSavedSettings.getS32("YieldTime");
+
+ // XUI:translate
+- gSecondLife = "Second Life";
++ gSecondLife = "Open Metaverse Viewer";
+
+ // Read skin/branding settings if specified.
+ if (! gDirUtilp->getSkinDir().empty() )
+@@ -2006,7 +2006,7 @@
+
+ // always start windowed
+ BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");
+- gViewerWindow = new LLViewerWindow(window_title_str, "Second Life",
++ gViewerWindow = new LLViewerWindow(window_title_str, "Open Metaverse Viewer",
+ gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"),
+ gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"),
+ FALSE, ignorePixelDepth);
+Index: indra/newview/skins/xui/en-us/floater_about.xml
+===================================================================
+--- ./indra/newview/skins/xui/en-us/floater_about.xml (revision 378)
++++ ./indra/newview/skins/xui/en-us/floater_about.xml (working copy)
+@@ -7,6 +7,12 @@
+ follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
+ max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
+ word_wrap="true">
++ Open Metaverse Viewer is a derived work of Linden Lab's "Secondlife Viewer", it is optimised for Debian GNU/Linux systems and includes some additional patches not included in the offical Linden Labs offering.
++
++Please note that not all copyrights listed in this unmodifed form applied to this release as this version does not ship with a voice client, does not use FMOD and does not use the KDU Jpeg2000 library.
++
++Details of the original "upstream" software are provided unmodifed below:-
++
+ Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks, Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.
+
+ Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf
diff --git a/debian/patches/trademark_compliance.dpatch~ b/debian/patches/trademark_compliance.dpatch~
new file mode 100644
index 0000000..eebb859
--- /dev/null
+++ b/debian/patches/trademark_compliance.dpatch~
@@ -0,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## trademark compliance.dpatch by <root at debian.example.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+
+Index: ./indra/llwindow/llwindowsdl.cpp
+===================================================================
+--- ./indra/llwindow/llwindowsdl.cpp (revision 353)
++++ ./indra/llwindow/llwindowsdl.cpp (working copy)
+@@ -484,7 +484,7 @@
+
+ // Set the application icon.
+ SDL_Surface *bmpsurface;
+- bmpsurface = Load_BMP_Resource("ll_icon.BMP");
++ bmpsurface = Load_BMP_Resource("viewericon.bmp");
+ if (bmpsurface)
+ {
+ // This attempts to give a black-keyed mask to the icon.
+Index: indra/newview/llappviewer.cpp
+===================================================================
+--- ./indra/newview/llappviewer.cpp (revision 382)
++++ ./indra/newview/llappviewer.cpp (working copy)
+@@ -1756,7 +1756,7 @@
+ mYieldTime = gSavedSettings.getS32("YieldTime");
+
+ // XUI:translate
+- gSecondLife = "Second Life";
++ gSecondLife = "Open Metaverse Viewer";
+
+ // Read skin/branding settings if specified.
+ if (! gDirUtilp->getSkinDir().empty() )
+@@ -2006,7 +2006,7 @@
+
+ // always start windowed
+ BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");
+- gViewerWindow = new LLViewerWindow(window_title_str, "Second Life",
++ gViewerWindow = new LLViewerWindow(window_title_str, "Open Metaverse Viewer",
+ gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"),
+ gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"),
+ FALSE, ignorePixelDepth);
+Index: indra/newview/skins/xui/en-us/floater_about.xml
+===================================================================
+--- indra/newview/skins/xui/en-us/floater_about.xml (revision 378)
++++ indra/newview/skins/xui/en-us/floater_about.xml (working copy)
+@@ -7,6 +7,12 @@
+ follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
+ max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
+ word_wrap="true">
++ Open Metaverse Viewer is a derived work of Linden Lab's "Secondlife Viewer", it is optimised for Debian GNU/Linux systems and includes some additional patches not included in the offical Linden Labs offering.
++
++Please note that not all copyrights listed in this unmodifed form applied to this release as this version does not ship with a voice client, does not use FMOD and does not use the KDU Jpeg2000 library.
++
++Details of the original "upstream" software are provided unmodifed below:-
++
+ Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks, Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.
+
+ Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf
diff --git a/debian/rules b/debian/rules
index a7e6ff7..f2b99f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,14 +16,14 @@ else
endif
DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-SLVIEWER_ARCH=$(subst amd64,x86_64,$(subst i386,i686,$(DEB_BUILD_ARCH)))
+OMVVIEWER_ARCH=$(subst amd64,x86_64,$(subst i386,i686,$(DEB_BUILD_ARCH)))
#Architecture
build: build-arch build-indep
build-arch: build-arch-stamp
build-arch-stamp: patch
- scons -C indra BUILD=$(BUILDTYPE) ARCH=$(SLVIEWER_ARCH) BTARGET=client DISTCC=no MOZLIB=yes ELFIO=no FMOD=no STANDALONE=yes
+ scons -C indra BUILD=$(BUILDTYPE) ARCH=$(OMVVIEWER_ARCH) BTARGET=client DISTCC=no MOZLIB=yes ELFIO=no FMOD=no STANDALONE=yes
touch $@
build-indep: build-indep-stamp
@@ -40,7 +40,7 @@ realclean:
rm -f indra/.sconsign.dblite
rm -f indra/lib/python/indra/*.pyc indra/lib/python/indra/ipc/*.pyc
- dh_clean indra/newview/slviewer indra/newview/slviewer-globalsyms
+ dh_clean indra/newview/omvviewer indra/newview/omvviewer-globalsyms
install: install-indep install-arch
install-indep:
@@ -79,7 +79,7 @@ binary-arch: build-arch install-arch
dh_installdocs -s
dh_installmenu -s
dh_installman -s
- dh_strip -s --dbg-package=slviewer-dbg
+ dh_strip -s --dbg-package=omvviewer-dbg
dh_compress -s
dh_fixperms -s
dh_installdeb -s
diff --git a/debian/slviewer-data.dirs b/debian/slviewer-data.dirs
deleted file mode 100644
index afe9cfb..0000000
--- a/debian/slviewer-data.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/secondlife
\ No newline at end of file
diff --git a/debian/slviewer.README.Debian b/debian/slviewer.README.Debian
deleted file mode 100644
index 21f034e..0000000
--- a/debian/slviewer.README.Debian
+++ /dev/null
@@ -1,42 +0,0 @@
-
------- Fonts ------
-
-As the fonts used in the upstream slviewer cannot be distributed with
-Debian, the default fonts have been changed as follows:
-FontMonospace: /usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
-FontSansSerif: /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
-FontSansSerifFallback: /usr/share/fonts/truetype/kochi/kochi-mincho.ttf
-FontSansSerifBold: /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
-
-These can be overridden in your settings.xml (see ~/.secondlife) as per usual.
-Multiple fallback fonts (i.e. for when FontSansSerif doesn't have the requested
-character set) can be listed, separated by ;.
-
-At the moment, fonts must be listed by full pathname.
-
-Suggestions for other default fallback fonts, or just a better font selection,
-are very welcome in the Debian Bugtracking System.
-
------- External www-browser ------
-
-The default behaviour of Secondlife is to call launch.sh to run an external web
-browser. The behaviour is modified in the Debian package so that the viewer will
-first look for the environmental variable BROSWER and run that if found. If not
-found it will directly call the symbolic link /etc/alternatives/x-www-browser.
-This is the Debian system default browser.
-
------- Read only data ------
-
-The default behaviour for Secondlife is to exist in a self contained tree with
-all binaries/artwork and data to exist with in a structure of this tree. This
-Debian package is modified so that the read-only (non arch specific) data is
-moved to a FSH compliant location of /usr/share/secondlife. The main executable
-is placed in /usr/bin/ and named slviewer. User data is stored under the users
-home directory ~/.secondlife/
-
-
-
-
-
-
-
diff --git a/debian/slviewer.desktop b/debian/slviewer.desktop
deleted file mode 100644
index fea8959..0000000
--- a/debian/slviewer.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=slviewer
-Comment=A viewer for connecting to 3D metaverses such as Second Life(tm)
-Exec=slviewer
-Icon=viewericon
-Terminal=false
-Type=Application
-Categories=Games;Simulation;
-StartupNotify=true
diff --git a/debian/slviewer.gconf-defaults b/debian/slviewer.gconf-defaults
deleted file mode 100644
index 4a37801..0000000
--- a/debian/slviewer.gconf-defaults
+++ /dev/null
@@ -1 +0,0 @@
-desktop/gnome/url-handlers/secondlife/command slviewer -url %s
diff --git a/debian/slviewer.install b/debian/slviewer.install
deleted file mode 100644
index aa11f01..0000000
--- a/debian/slviewer.install
+++ /dev/null
@@ -1,6 +0,0 @@
-indra/newview/slviewer usr/bin/
-indra/newview/res/viewericon.xpm usr/share/pixmaps/
-debian/slviewer.desktop usr/share/applications/
-
-
-
diff --git a/debian/slviewer.menu b/debian/slviewer.menu
deleted file mode 100644
index de2d1ac..0000000
--- a/debian/slviewer.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?package(slviewer):needs="x11" section="Games/Simulation"\
- title="Debian SL Viewer" command="/usr/bin/slviewer" \
- icon="/usr/share/pixmaps/viewericon.xpm"
--
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids
More information about the Pkg-games-commits
mailing list