The following commit has been merged in the master branch:
commit c803ca1e721a201201c4c5ec9b63e6c3fcd5a6b4
Author: Robin Cornelius <[EMAIL PROTECTED]>
Date: Thu May 29 12:50:21 2008 +0100
Sync with my svn changes for trademark removal, sync patches and set all
dpatch files to not have exectuable set
diff --git a/debian/control b/debian/control
index 25c49a8..5fae8f8 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ XS-Vcs-Browser: http://slupdate.byteme.org.uk/
Package: omvviewer
Architecture: i386 amd64 powerpc
-Depends: ${misc:Depends}, ${shlibs:Depends}, omvviewer-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}), omvviewer-artwork (>= 1.20.8.0), ttf-kochi-mincho,
ttf-dejavu, libc-ares1
Recommends: libgstreamer0.10-0, libgstreamer-plugins-base0.10-0
Replaces: slviewer
Description: Open Metaverse Viewer
diff --git a/debian/patches/0000_keep_statbars_from_overshooting.patch.dpatch
b/debian/patches/0000_keep_statbars_from_overshooting.patch.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/0000_valgrind_wild_vars.dpatch
b/debian/patches/0000_valgrind_wild_vars.dpatch
old mode 100755
new mode 100644
diff --git
a/debian/patches/0001_possible_crash_and_leak_llassetstorage.patch.dpatch
b/debian/patches/0001_possible_crash_and_leak_llassetstorage.patch.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/0001_possible_crash_in_llviewerpartssim.dpatch
b/debian/patches/0001_possible_crash_in_llviewerpartssim.dpatch
old mode 100755
new mode 100644
diff --git
a/debian/patches/1294_llworkerthread_when_terminating_program.patch.dpatch
b/debian/patches/1294_llworkerthread_when_terminating_program.patch.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/1857_apr_thread_mutex_nested.patch.dpatch
b/debian/patches/1857_apr_thread_mutex_nested.patch.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/2003_possible_crash_draganddrop.patch.dpatch
b/debian/patches/2003_possible_crash_draganddrop.patch.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/21_VWR_2488_Standalone_build_fixes.dpatch
b/debian/patches/21_VWR_2488_Standalone_build_fixes.dpatch
old mode 100755
new mode 100644
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
diff --git a/debian/patches/22_build_more_approprate_binary_name.dpatch~
b/debian/patches/22_build_more_approprate_binary_name.dpatch~
deleted file mode 100644
index 91eb19b..0000000
--- a/debian/patches/22_build_more_approprate_binary_name.dpatch~
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## name the binary slviewer.dpatch by <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
[EMAIL PROTECTED]@
-
-Index: ./indra/SConstruct
-===================================================================
---- ./indra/SConstruct (revision 344)
-+++ ./indra/SConstruct (working copy)
-@@ -643,7 +643,7 @@
- ##################
- # BUILD NEWVIEW #
- ##################
-- output_bin = 'newview/secondlife-' + arch + '-bin'
-+ output_bin = 'newview/slviewer'
-
- external_libs = client_external_libs + common_external_libs
-
diff --git a/debian/patches/24_always_test_vectorize.dpatch
b/debian/patches/24_always_test_vectorize.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/24_fix_64bit_times.dpatch
b/debian/patches/24_fix_64bit_times.dpatch
old mode 100755
new mode 100644
diff --git
a/debian/patches/2543_possible_crash_in_group_voting_propsals.patch.dpatch
b/debian/patches/2543_possible_crash_in_group_voting_propsals.patch.dpatch
old mode 100755
new mode 100644
diff --git
a/debian/patches/2683_possible_crash_update_speaker_list.patch.dpatch
b/debian/patches/2683_possible_crash_update_speaker_list.patch.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/34_dont_hide_symbols.dpatch
b/debian/patches/34_dont_hide_symbols.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/38_build_opensource_without_crashlogger.dpatch
b/debian/patches/38_build_opensource_without_crashlogger.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/4022_jpeg_error_gracefully.dpatch
b/debian/patches/4022_jpeg_error_gracefully.dpatch
old mode 100755
new mode 100644
diff --git
a/debian/patches/50_get_cpu_clock_count_for_more_than_just_i386.dpatch
b/debian/patches/50_get_cpu_clock_count_for_more_than_just_i386.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/51_fix_vectorize.dpatch
b/debian/patches/51_fix_vectorize.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/52_standalone_expat_headers.dpatch
b/debian/patches/52_standalone_expat_headers.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/55_fix_the_locales.dpatch
b/debian/patches/55_fix_the_locales.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/55_use_system_locale.dpatch
b/debian/patches/55_use_system_locale.dpatch
old mode 100755
new mode 100644
diff --git
a/debian/patches/59_need_llpreprocessor_to_access_endian_macros.dpatch
b/debian/patches/59_need_llpreprocessor_to_access_endian_macros.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/60_use_system_headers_for_apr-1.dpatch
b/debian/patches/60_use_system_headers_for_apr-1.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/60_use_system_xulrunner.dpatch
b/debian/patches/60_use_system_xulrunner.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/61_use_debain_cares_1.5.1.dpatch
b/debian/patches/61_use_debain_cares_1.5.1.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/68_use_system_headers_for_openjpeg.dpatch
b/debian/patches/68_use_system_headers_for_openjpeg.dpatch
old mode 100755
new mode 100644
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
diff --git a/debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch~
b/debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch~
deleted file mode 100644
index 9661b52..0000000
--- a/debian/patches/70_put_AppROData_in_usr_share_secondlife.dpatch~
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_put_AppROData_in_usr_share_secondlife.dpatch by Paul "TBBle" Hampson
<[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Move AppROData to /usr/share/secondlife
-
[EMAIL PROTECTED]@
-diff -urNad linden~/indra/llvfs/lldir_linux.cpp
linden/indra/llvfs/lldir_linux.cpp
---- linden~/indra/llvfs/lldir_linux.cpp 2007-07-14 16:25:21.000000000
+1000
-+++ linden/indra/llvfs/lldir_linux.cpp 2007-07-14 16:36:51.000000000 +1000
-@@ -90,7 +90,7 @@
- mExecutablePathAndName = "";
- mExecutableDir = tmp_str;
- mWorkingDir = tmp_str;
-- mAppRODataDir = tmp_str;
-+ mAppRODataDir = "/usr/share/secondlife";
- mOSUserDir = getCurrentUserHome(tmp_str);
- mOSUserAppDir = "";
- mLindenUserDir = tmp_str;
diff --git a/debian/patches/71_use_debian_alternatives_for_www_browser.dpatch
b/debian/patches/71_use_debian_alternatives_for_www_browser.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/75_use_debian-included_fonts.dpatch
b/debian/patches/75_use_debian-included_fonts.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/79_use_debian_channel.dpatch
b/debian/patches/79_use_debian_channel.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/79_use_debian_channel.dpatch~
b/debian/patches/79_use_debian_channel.dpatch~
deleted file mode 100644
index 8edfbae..0000000
--- a/debian/patches/79_use_debian_channel.dpatch~
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## change channel version.dpatch by <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
[EMAIL PROTECTED]@
-
- #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/VWR-1815_top_corner_fix.dpatch
b/debian/patches/VWR-1815_top_corner_fix.dpatch
old mode 100755
new mode 100644
diff --git
a/debian/patches/VWR-3766_llGetInventoryNumber_tooltip_missing_INVENTORY_ANIMATION.dpatch
b/debian/patches/VWR-3766_llGetInventoryNumber_tooltip_missing_INVENTORY_ANIMATION.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/VWR-5697_fix_startup_paths.dpatch
b/debian/patches/VWR-5697_fix_startup_paths.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/VWR-7271_fix_mutlist_for_amd64.dpatch
b/debian/patches/VWR-7271_fix_mutlist_for_amd64.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/VWR1320_buggy_ati_driver_workaround.dpatch
b/debian/patches/VWR1320_buggy_ati_driver_workaround.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/VWR1352_fix_strange_llstyle_copy_operation.dpatch
b/debian/patches/VWR1352_fix_strange_llstyle_copy_operation.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/VWR4070-openjpeg_check_number_of_components.dpatch
b/debian/patches/VWR4070-openjpeg_check_number_of_components.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/VWR5636_use_stop_menthod_for_llevent_timer.dpatch
b/debian/patches/VWR5636_use_stop_menthod_for_llevent_timer.dpatch
old mode 100755
new mode 100644
diff --git
a/debian/patches/VWR5715_text_not_replaced_by_input_with_japanses_im.dpatch
b/debian/patches/VWR5715_text_not_replaced_by_input_with_japanses_im.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/VWR6800_motioncontroller_leak.dpatch
b/debian/patches/VWR6800_motioncontroller_leak.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/dam_flex_2.5.34.dpatch
b/debian/patches/dam_flex_2.5.34.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/gstreamer_audio_1.19.1.2.patch
b/debian/patches/gstreamer_audio_1.19.1.2.patch
old mode 100755
new mode 100644
diff --git a/debian/patches/openal_1.20.0.dpatch
b/debian/patches/openal_1.20.0.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/trademark_compliance.dpatch
b/debian/patches/trademark_compliance.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/trademark_compliance.dpatch~
b/debian/patches/trademark_compliance.dpatch~
deleted file mode 100644
index eebb859..0000000
--- a/debian/patches/trademark_compliance.dpatch~
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## trademark compliance.dpatch by <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
[EMAIL PROTECTED]@
-
-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 f2b99f5..7537675 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,14 +16,14 @@ else
endif
DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-OMVVIEWER_ARCH=$(subst amd64,x86_64,$(subst i386,i686,$(DEB_BUILD_ARCH)))
+SLVIEWER_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=$(OMVVIEWER_ARCH) BTARGET=client
DISTCC=no MOZLIB=yes ELFIO=no FMOD=no STANDALONE=yes
+ scons -C indra BUILD=$(BUILDTYPE) ARCH=$(SLVIEWER_ARCH) BTARGET=client
DISTCC=no MOZLIB=yes ELFIO=no FMOD=no STANDALONE=yes
touch $@
build-indep: build-indep-stamp
@@ -79,7 +79,7 @@ binary-arch: build-arch install-arch
dh_installdocs -s
dh_installmenu -s
dh_installman -s
- dh_strip -s --dbg-package=omvviewer-dbg
+ dh_strip -s --dbg-package=slviewer-dbg
dh_compress -s
dh_fixperms -s
dh_installdeb -s
--
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and
OpenSim grids
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
