[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.8-31-g8f9aa30

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 3edfe5c6922b651d2654f0c93d721eb30cd2002e
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Thu Jun 26 10:25:29 2008 +0100

    Start to tidy patches and introduce build fix patch

diff --git a/debian/patches/0000_explicit_cast_for_gcc_4_1_2.dpatch b/debian/patches/0000_explicit_cast_for_gcc_4_1_2.dpatch
new file mode 100644
index 0000000..4e3b3f0
--- /dev/null
+++ b/debian/patches/0000_explicit_cast_for_gcc_4_1_2.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Explicit cast for gcc 4.1.2 compatibility.dpatch by  <robin.cornelius at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: gcc 4.1.2 does not seem to handle the implicit cast on its own and as 
+## DP: we use 4.1.2 in the etch pbuilder we need to fix this
+
+ at DPATCH@
+
+diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
+index f745aca..104ea61 100644
+--- a/indra/newview/llviewerregion.cpp
++++ b/indra/newview/llviewerregion.cpp
+@@ -108,7 +108,7 @@ public:
+ 
+     void result(const LLSD& content)
+     {
+-		if(!mRegion || this != mRegion->getHttpResponderPtr())//region is removed or responder is not created.
++		if(!mRegion || this != (boost::intrusive_ptr<LLCurl::Responder>)mRegion->getHttpResponderPtr())//region is removed or responder is not created.
+ 		{
+ 			return ;
+ 		}
diff --git a/debian/patches/00list b/debian/patches/00list
index a0a9136..c50e444 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -96,3 +96,4 @@ VWR-1815_top_corner_fix.dpatch
 VWR-5697_fix_startup_paths.dpatch
 VWR-7271_fix_mutlist_for_amd64.dpatch
 0000_valgrind_wild_vars.dpatch
+0000_explicit_cast_for_gcc_4_1_2.dpatch
diff --git a/debian/patches/0000_dont_use_java_prototypes.dpatch b/debian/patches/oldpatch/0000_dont_use_java_prototypes.dpatch
similarity index 90%
rename from debian/patches/0000_dont_use_java_prototypes.dpatch
rename to debian/patches/oldpatch/0000_dont_use_java_prototypes.dpatch
index 82c0331..b0541bc 100644
--- a/debian/patches/0000_dont_use_java_prototypes.dpatch
+++ b/debian/patches/oldpatch/0000_dont_use_java_prototypes.dpatch
@@ -1,8 +1,8 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## don't use java prototypes.dpatch by  <root at debian>
+## don't use java prototypes.dpatch by  <robin.cornelius at gmail.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Some java style prototypes have appeared upstream
 
 @DPATCH@
 
diff --git a/debian/patches/0001_minor_leak_slulr_menu_in_llviewertexteditor.patch.dpatch b/debian/patches/oldpatch/0001_minor_leak_slulr_menu_in_llviewertexteditor.patch.dpatch
similarity index 100%
rename from debian/patches/0001_minor_leak_slulr_menu_in_llviewertexteditor.patch.dpatch
rename to debian/patches/oldpatch/0001_minor_leak_slulr_menu_in_llviewertexteditor.patch.dpatch
diff --git a/debian/patches/0001_no_more_asstachments.patch.dpatch b/debian/patches/oldpatch/0001_no_more_asstachments.patch.dpatch
similarity index 100%
rename from debian/patches/0001_no_more_asstachments.patch.dpatch
rename to debian/patches/oldpatch/0001_no_more_asstachments.patch.dpatch
diff --git a/debian/patches/0001_texture_cache_hiccups.v2.patch.dpatch b/debian/patches/oldpatch/0001_texture_cache_hiccups.v2.patch.dpatch
similarity index 100%
rename from debian/patches/0001_texture_cache_hiccups.v2.patch.dpatch
rename to debian/patches/oldpatch/0001_texture_cache_hiccups.v2.patch.dpatch
diff --git a/debian/patches/26_gtk_api_change.dpatch b/debian/patches/oldpatch/26_gtk_api_change.dpatch
similarity index 100%
rename from debian/patches/26_gtk_api_change.dpatch
rename to debian/patches/oldpatch/26_gtk_api_change.dpatch
diff --git a/debian/patches/3737_fix_gstreamer.dpatch b/debian/patches/oldpatch/3737_fix_gstreamer.dpatch
similarity index 100%
rename from debian/patches/3737_fix_gstreamer.dpatch
rename to debian/patches/oldpatch/3737_fix_gstreamer.dpatch
diff --git a/debian/patches/VWR2142_parcel_voice_icon_doesnt_reflect_status_if_voice_is_not_used.dpatch b/debian/patches/oldpatch/VWR2142_parcel_voice_icon_doesnt_reflect_status_if_voice_is_not_used.dpatch
similarity index 100%
rename from debian/patches/VWR2142_parcel_voice_icon_doesnt_reflect_status_if_voice_is_not_used.dpatch
rename to debian/patches/oldpatch/VWR2142_parcel_voice_icon_doesnt_reflect_status_if_voice_is_not_used.dpatch
diff --git a/debian/patches/VWR3605_Object_group_display_not_properly_set_for_no-group_objects.dpatch b/debian/patches/oldpatch/VWR3605_Object_group_display_not_properly_set_for_no-group_objects.dpatch
similarity index 100%
rename from debian/patches/VWR3605_Object_group_display_not_properly_set_for_no-group_objects.dpatch
rename to debian/patches/oldpatch/VWR3605_Object_group_display_not_properly_set_for_no-group_objects.dpatch
diff --git a/debian/patches/VWR3857_show_non_latin1_characters_in_lsl_editor.dpatch b/debian/patches/oldpatch/VWR3857_show_non_latin1_characters_in_lsl_editor.dpatch
similarity index 100%
rename from debian/patches/VWR3857_show_non_latin1_characters_in_lsl_editor.dpatch
rename to debian/patches/oldpatch/VWR3857_show_non_latin1_characters_in_lsl_editor.dpatch
diff --git a/debian/patches/VWR6154_audiodecodemgr.patch b/debian/patches/oldpatch/VWR6154_audiodecodemgr.patch
similarity index 100%
rename from debian/patches/VWR6154_audiodecodemgr.patch
rename to debian/patches/oldpatch/VWR6154_audiodecodemgr.patch
diff --git a/debian/patches/VWR747_texture_resozes_only_proportionately_tp_recieved_dimensions.dpatch b/debian/patches/oldpatch/VWR747_texture_resozes_only_proportionately_tp_recieved_dimensions.dpatch
similarity index 100%
rename from debian/patches/VWR747_texture_resozes_only_proportionately_tp_recieved_dimensions.dpatch
rename to debian/patches/oldpatch/VWR747_texture_resozes_only_proportionately_tp_recieved_dimensions.dpatch
diff --git a/debian/patches/slviewer-1.18.6.1-openal.patch b/debian/patches/oldpatch/slviewer-1.18.6.1-openal.patch
similarity index 100%
rename from debian/patches/slviewer-1.18.6.1-openal.patch
rename to debian/patches/oldpatch/slviewer-1.18.6.1-openal.patch
diff --git a/debian/patches/stop_spamming_my_logs_with_unknown_havok4_stats.dpatch b/debian/patches/oldpatch/stop_spamming_my_logs_with_unknown_havok4_stats.dpatch
similarity index 100%
rename from debian/patches/stop_spamming_my_logs_with_unknown_havok4_stats.dpatch
rename to debian/patches/oldpatch/stop_spamming_my_logs_with_unknown_havok4_stats.dpatch

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids