diff --git a/debian_unofficial/changelog b/debian_unofficial/changelog
index d38a27edf2..2d791a8b06 100644
--- a/debian_unofficial/changelog
+++ b/debian_unofficial/changelog
@@ -1,5 +1,6 @@
-pcsx2.snapshot (3208-1) unstable; urgency=low
+pcsx2.snapshot (3351-1) unstable; urgency=low
 
   * Initial release
 
  -- Gregory Hainaut <gregory.hainaut@gmail.com>  Thu, 13 May 2010 14:27:56 +0200
+
diff --git a/debian_unofficial/copyright b/debian_unofficial/copyright
index ce4dd05b5d..deec86cd65 100644
--- a/debian_unofficial/copyright
+++ b/debian_unofficial/copyright
@@ -4,17 +4,14 @@ This work was packaged for Debian by:
 
 It was downloaded from:
 
-    <http://pcsx2.googlecode.com/svn/>
+    http://pcsx2.googlecode.com/svn/
 
 Upstream Author(s):
 
-    <put author's name and email here>
-    <likewise for another author>
+    PCSX2 Dev Team
 
 Copyright:
-
-    <Copyright (C) YYYY Firstname Lastname>
-    <likewise for another author>
+    Copyright (C) 2002-2010  PCSX2 Dev Team
 
 License:
 
@@ -39,6 +36,3 @@ The Debian packaging is:
     Copyright (C) 2010 Gregory Hainaut <gregory.hainaut@gmail.com>
 
 and is licensed under the GPL version 3, see above.
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
diff --git a/debian_unofficial/patches/01_rename_binary_generated.patch b/debian_unofficial/patches/01_rename_binary_generated.patch
index f6df02e29f..8c315fc995 100644
--- a/debian_unofficial/patches/01_rename_binary_generated.patch
+++ b/debian_unofficial/patches/01_rename_binary_generated.patch
@@ -1,10 +1,10 @@
 Debian specific
 Always uses the same executable name for the build. Easier for the install script
-Index: pcsx2.snapshot-3208/pcsx2/CMakeLists.txt
+Index: pcsx2.snapshot-3343/pcsx2/CMakeLists.txt
 ===================================================================
---- pcsx2.snapshot-3208.orig/pcsx2/CMakeLists.txt	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/pcsx2/CMakeLists.txt	2010-06-15 13:12:59.655335900 +0200
-@@ -77,7 +77,7 @@
+--- pcsx2.snapshot-3343.orig/pcsx2/CMakeLists.txt	2010-06-29 13:26:25.000000000 +0200
++++ pcsx2.snapshot-3343/pcsx2/CMakeLists.txt	2010-06-29 13:28:38.334405496 +0200
+@@ -83,7 +83,7 @@
  if(CMAKE_BUILD_TYPE STREQUAL Debug)
  	
  	# executable name
@@ -13,7 +13,7 @@ Index: pcsx2.snapshot-3208/pcsx2/CMakeLists.txt
  	
  	# add defines
  	add_definitions(${CommonFlags} ${DebugFlags} -DPCSX2_DEVBUILD -DPCSX2_DEBUG -DWX_PRECOMP)
-@@ -87,7 +87,7 @@
+@@ -93,7 +93,7 @@
  if(CMAKE_BUILD_TYPE STREQUAL Devel)
  
  	# executable name
diff --git a/debian_unofficial/patches/02_update_default_path.patch b/debian_unofficial/patches/02_update_default_path.patch
index 168f09b0ad..9e4222236f 100644
--- a/debian_unofficial/patches/02_update_default_path.patch
+++ b/debian_unofficial/patches/02_update_default_path.patch
@@ -2,11 +2,11 @@ Debian policy.
 This patch updates default plugin path and config path.
 It also updates the pcsx2 game db path and shaders data path.
 AppInit.cpp:93 could be probably updated
-Index: pcsx2.snapshot-3208/pcsx2/gui/AppConfig.cpp
+Index: pcsx2.snapshot-3343/pcsx2/gui/AppConfig.cpp
 ===================================================================
---- pcsx2.snapshot-3208.orig/pcsx2/gui/AppConfig.cpp	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/pcsx2/gui/AppConfig.cpp	2010-06-15 13:12:59.894963081 +0200
-@@ -137,7 +137,8 @@
+--- pcsx2.snapshot-3343.orig/pcsx2/gui/AppConfig.cpp	2010-06-29 13:26:25.000000000 +0200
++++ pcsx2.snapshot-3343/pcsx2/gui/AppConfig.cpp	2010-06-29 13:28:38.859568437 +0200
+@@ -162,7 +162,8 @@
  
  	wxDirName GetPlugins()
  	{
@@ -16,10 +16,10 @@ Index: pcsx2.snapshot-3208/pcsx2/gui/AppConfig.cpp
  	}
  
  	wxDirName GetSettings()
-Index: pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
+Index: pcsx2.snapshot-3343/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
 ===================================================================
---- pcsx2.snapshot-3208.orig/plugins/zzogl-pg/opengl/ZZoglCreate.cpp	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/ZZoglCreate.cpp	2010-06-15 13:12:59.895962667 +0200
+--- pcsx2.snapshot-3343.orig/plugins/zzogl-pg/opengl/ZZoglCreate.cpp	2010-06-29 13:26:25.000000000 +0200
++++ pcsx2.snapshot-3343/plugins/zzogl-pg/opengl/ZZoglCreate.cpp	2010-06-29 13:28:38.859568437 +0200
 @@ -347,17 +347,12 @@
  	assert(hShaderGlob != NULL);
  	s_lpShaderResources = (u8*)LockResource(hShaderGlob);
@@ -41,25 +41,18 @@ Index: pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
  	}
  
  	fseek(fres, 0, SEEK_END);
-Index: pcsx2.snapshot-3208/pcsx2/DataBase_Loader.h
+Index: pcsx2.snapshot-3343/pcsx2/gui/AppGameDatabase.h
 ===================================================================
---- pcsx2.snapshot-3208.orig/pcsx2/DataBase_Loader.h	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/pcsx2/DataBase_Loader.h	2010-06-15 13:12:59.896962570 +0200
-@@ -89,7 +89,7 @@
- 	wxString		header;			// Header of the database
- 	wxString		baseKey;		// Key to separate games by ("Serial")
- 
--	DataBase_Loader(const wxString& file = L"GameIndex.dbf", const wxString& key = L"Serial", const wxString& value = wxEmptyString )
-+	DataBase_Loader(const wxString& file = L"/var/games/pcsx2/GameIndex.dbf", const wxString& key = L"Serial", const wxString& value = wxEmptyString )
- 		: baseKey( key )
- 	{
- 		curGame	= NULL;
-@@ -159,7 +159,7 @@
- 	}
- 
- 	// Saves changes to the database
--	void saveToFile(const wxString& file = L"GameIndex.dbf") {
-+	void saveToFile(const wxString& file = L"/var/games/pcsx2/GameIndex.dbf") {
- 		wxFFileOutputStream writer( file );
- 		pxWriteMultiline(writer, header);
- 		deque<Game_Data*>::iterator it = gList.begin();
+--- pcsx2.snapshot-3343.orig/pcsx2/gui/AppGameDatabase.h	2010-06-29 13:26:25.000000000 +0200
++++ pcsx2.snapshot-3343/pcsx2/gui/AppGameDatabase.h	2010-06-29 13:28:38.859568437 +0200
+@@ -51,8 +51,8 @@
+ 		Console.WriteLn( "(GameDB) Unloading..." );
+ 	}
+ 
+-	AppGameDatabase& LoadFromFile(const wxString& file = L"GameIndex.dbf", const wxString& key = L"Serial" );
+-	void SaveToFile(const wxString& file = L"GameIndex.dbf");
++	AppGameDatabase& LoadFromFile(const wxString& file = L"/var/games/pcsx2/GameIndex.dbf", const wxString& key = L"Serial" );
++	void SaveToFile(const wxString& file = L"/var/games/pcsx2/GameIndex.dbf");
+ };
+ 
+ static wxString compatToStringWX(int compat) {
diff --git a/debian_unofficial/patches/03_central_userconfig_function.patch b/debian_unofficial/patches/03_central_userconfig_function.patch
deleted file mode 100644
index b24dac50c2..0000000000
--- a/debian_unofficial/patches/03_central_userconfig_function.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: pcsx2.snapshot-3208/pcsx2/gui/AppConfig.cpp
-===================================================================
---- pcsx2.snapshot-3208.orig/pcsx2/gui/AppConfig.cpp	2010-06-15 13:12:59.894963081 +0200
-+++ pcsx2.snapshot-3208/pcsx2/gui/AppConfig.cpp	2010-06-15 13:13:00.230117552 +0200
-@@ -94,6 +94,12 @@
- 		return retval;
- 	}
- 
-+    // Specifies the main configuration folder.
-+    wxDirName GetUserLocalDataDir()
-+    {
-+        return wxDirName(wxStandardPaths::Get().GetUserLocalDataDir());
-+    }
-+
- 	// Fetches the path location for user-consumable documents -- stuff users are likely to want to
- 	// share with other programs: screenshots, memory cards, and savestates.
- 	wxDirName GetDocuments( DocsModeType mode )
-Index: pcsx2.snapshot-3208/pcsx2/gui/AppInit.cpp
-===================================================================
---- pcsx2.snapshot-3208.orig/pcsx2/gui/AppInit.cpp	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/pcsx2/gui/AppInit.cpp	2010-06-15 13:13:00.231095495 +0200
-@@ -60,7 +60,7 @@
- 
- void Pcsx2App::WipeUserModeSettings()
- {
--	wxDirName usrlocaldir( wxStandardPaths::Get().GetUserLocalDataDir() );
-+	wxDirName usrlocaldir = PathDefs::GetUserLocalDataDir();
- 	if( !usrlocaldir.Exists() ) return;
- 
- 	wxString cwd( Path::Normalize( wxGetCwd() ) );
-@@ -89,7 +89,7 @@
- //
- void Pcsx2App::ReadUserModeSettings()
- {
--	wxDirName usrlocaldir( wxStandardPaths::Get().GetUserLocalDataDir() );
-+	wxDirName usrlocaldir = PathDefs::GetUserLocalDataDir();
- 	if( !usrlocaldir.Exists() )
- 	{
- 		Console.WriteLn( L"Creating UserLocalData folder: " + usrlocaldir.ToString() );
-Index: pcsx2.snapshot-3208/pcsx2/gui/Panels/MiscPanelStuff.cpp
-===================================================================
---- pcsx2.snapshot-3208.orig/pcsx2/gui/Panels/MiscPanelStuff.cpp	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/pcsx2/gui/Panels/MiscPanelStuff.cpp	2010-06-15 13:13:00.231095495 +0200
-@@ -48,7 +48,7 @@
- 	{
- 		RadioPanelItem(
- 			_("User Documents (recommended)"),
--			_("Location: ") + wxStandardPaths::Get().GetDocumentsDir()
-+			_("Location: ") + PathDefs::GetUserLocalDataDir().GetFilename().GetFullPath()
- 		),
- 
- 		RadioPanelItem(
-Index: pcsx2.snapshot-3208/pcsx2/gui/AppConfig.h
-===================================================================
---- pcsx2.snapshot-3208.orig/pcsx2/gui/AppConfig.h	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/pcsx2/gui/AppConfig.h	2010-06-15 13:13:00.232095570 +0200
-@@ -36,6 +36,7 @@
- 	// complete pathnames are returned by these functions
- 	// For 99% of all code, you should use these.
- 
-+    extern wxDirName GetUserLocalDataDir();
- 	extern wxDirName GetDocuments();
- 	extern wxDirName GetDocuments( DocsModeType mode );
- 	extern wxDirName GetThemes();
diff --git a/debian_unofficial/patches/03_xdg_homedir_support.patch b/debian_unofficial/patches/03_xdg_homedir_support.patch
deleted file mode 100644
index 1b3ac7ac1e..0000000000
--- a/debian_unofficial/patches/03_xdg_homedir_support.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: pcsx2.snapshot-3204/pcsx2/gui/AppInit.cpp
-===================================================================
---- pcsx2.snapshot-3204.orig/pcsx2/gui/AppInit.cpp	2010-06-12 12:50:20.000000000 +0200
-+++ pcsx2.snapshot-3204/pcsx2/gui/AppInit.cpp	2010-06-12 12:52:36.481970859 +0200
-@@ -60,7 +60,7 @@
- 
- void Pcsx2App::WipeUserModeSettings()
- {
--	wxDirName usrlocaldir( wxStandardPaths::Get().GetUserLocalDataDir() );
-+    wxDirName usrlocaldir = PathDefs::GetDocuments(DocsFolder_User);
- 	if( !usrlocaldir.Exists() ) return;
- 
- 	wxString cwd( Path::Normalize( wxGetCwd() ) );
-@@ -89,7 +89,7 @@
- //
- void Pcsx2App::ReadUserModeSettings()
- {
--	wxDirName usrlocaldir( wxStandardPaths::Get().GetUserLocalDataDir() );
-+    wxDirName usrlocaldir = PathDefs::GetDocuments(DocsFolder_User);
- 	if( !usrlocaldir.Exists() )
- 	{
- 		Console.WriteLn( L"Creating UserLocalData folder: " + usrlocaldir.ToString() );
-Index: pcsx2.snapshot-3204/pcsx2/gui/Panels/MiscPanelStuff.cpp
-===================================================================
---- pcsx2.snapshot-3204.orig/pcsx2/gui/Panels/MiscPanelStuff.cpp	2010-06-12 12:50:20.000000000 +0200
-+++ pcsx2.snapshot-3204/pcsx2/gui/Panels/MiscPanelStuff.cpp	2010-06-12 12:52:36.483096204 +0200
-@@ -48,7 +48,7 @@
- 	{
- 		RadioPanelItem(
- 			_("User Documents (recommended)"),
--			_("Location: ") + wxStandardPaths::Get().GetDocumentsDir()
-+			_("Location: ") + PathDefs::GetDocuments(DocsFolder_User).GetFilename().GetFullPath()
- 		),
- 
- 		RadioPanelItem(
-Index: pcsx2.snapshot-3204/pcsx2/gui/AppConfig.cpp
-===================================================================
---- pcsx2.snapshot-3204.orig/pcsx2/gui/AppConfig.cpp	2010-06-12 12:52:36.196212791 +0200
-+++ pcsx2.snapshot-3204/pcsx2/gui/AppConfig.cpp	2010-06-13 14:25:54.838664713 +0200
-@@ -98,9 +98,27 @@
- 	// share with other programs: screenshots, memory cards, and savestates.
- 	wxDirName GetDocuments( DocsModeType mode )
- 	{
-+        wxDirName user_local_dir;
-+#ifdef __LINUX__
-+        wxString xdg_home_value;
-+        if( wxGetEnv(L"XDG_CONFIG_HOME", &xdg_home_value) ) {
-+            if ( xdg_home_value.IsEmpty() ) {
-+                // variable exist but it is empty. So use the default value
-+                user_local_dir = (wxDirName)Path::Combine( wxStandardPaths::Get().GetDocumentsDir() , wxDirName( L".config/pcsx2" ));
-+            } else {
-+                user_local_dir = (wxDirName)Path::Combine( xdg_home_value, wxGetApp().GetAppName());
-+            }
-+        } else {
-+            // variable do not exist
-+            user_local_dir = (wxDirName)Path::Combine( wxStandardPaths::Get().GetDocumentsDir() , wxDirName( L".config/pcsx2" ));
-+        }
-+#else
-+        user_local_dir = (wxDirName)Path::Combine( wxStandardPaths::Get().GetDocumentsDir() , wxGetApp().GetAppName() );
-+#endif
-+
- 		switch( mode )
- 		{
--			case DocsFolder_User:	return (wxDirName)Path::Combine( wxStandardPaths::Get().GetDocumentsDir(), wxGetApp().GetAppName() );
-+            case DocsFolder_User:	return user_local_dir;
- 			//case DocsFolder_CWD:	return (wxDirName)wxGetCwd();
- 			case DocsFolder_Custom: return CustomDocumentsFolder;
- 
diff --git a/debian_unofficial/patches/04_xdg_config_home.patch b/debian_unofficial/patches/04_xdg_config_home.patch
deleted file mode 100644
index 84a3d39730..0000000000
--- a/debian_unofficial/patches/04_xdg_config_home.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: pcsx2.snapshot-3208/pcsx2/gui/AppConfig.cpp
-===================================================================
---- pcsx2.snapshot-3208.orig/pcsx2/gui/AppConfig.cpp	2010-06-15 13:13:00.230117552 +0200
-+++ pcsx2.snapshot-3208/pcsx2/gui/AppConfig.cpp	2010-06-15 13:13:00.572085408 +0200
-@@ -97,7 +97,24 @@
-     // Specifies the main configuration folder.
-     wxDirName GetUserLocalDataDir()
-     {
--        return wxDirName(wxStandardPaths::Get().GetUserLocalDataDir());
-+        wxDirName user_local_dir;
-+#ifdef __LINUX__
-+        wxString xdg_home_value;
-+        if( wxGetEnv(L"XDG_CONFIG_HOME", &xdg_home_value) ) {
-+            if ( xdg_home_value.IsEmpty() ) {
-+                // variable exist but it is empty. So use the default value
-+                user_local_dir = (wxDirName)Path::Combine( wxStandardPaths::Get().GetUserConfigDir() , wxDirName( L".config/pcsx2" ));
-+            } else {
-+                user_local_dir = (wxDirName)Path::Combine( xdg_home_value, wxGetApp().GetAppName());
-+            }
-+        } else {
-+            // variable do not exist
-+            user_local_dir = (wxDirName)Path::Combine( wxStandardPaths::Get().GetUserConfigDir() , wxDirName( L".config/pcsx2" ));
-+        }
-+#else
-+        user_local_dir = wxDirName(wxStandardPaths::Get().GetUserLocalDataDir());
-+#endif
-+        return user_local_dir;
-     }
- 
- 	// Fetches the path location for user-consumable documents -- stuff users are likely to want to
diff --git a/debian_unofficial/patches/05_move_data_to_config.patch b/debian_unofficial/patches/05_move_data_to_config.patch
index 91a77091ef..dbc886606e 100644
--- a/debian_unofficial/patches/05_move_data_to_config.patch
+++ b/debian_unofficial/patches/05_move_data_to_config.patch
@@ -1,8 +1,8 @@
-Index: pcsx2.snapshot-3208/pcsx2/gui/AppConfig.cpp
+Index: pcsx2.snapshot-3343/pcsx2/gui/AppConfig.cpp
 ===================================================================
---- pcsx2.snapshot-3208.orig/pcsx2/gui/AppConfig.cpp	2010-06-15 13:13:00.572085408 +0200
-+++ pcsx2.snapshot-3208/pcsx2/gui/AppConfig.cpp	2010-06-15 13:13:00.797339595 +0200
-@@ -123,7 +123,12 @@
+--- pcsx2.snapshot-3343.orig/pcsx2/gui/AppConfig.cpp	2010-06-29 13:28:38.859568437 +0200
++++ pcsx2.snapshot-3343/pcsx2/gui/AppConfig.cpp	2010-06-29 13:28:39.100612322 +0200
+@@ -125,7 +125,12 @@
  	{
  		switch( mode )
  		{
@@ -10,7 +10,7 @@ Index: pcsx2.snapshot-3208/pcsx2/gui/AppConfig.cpp
 +            // By default on linux move all user data file into central configuration directory
 +			case DocsFolder_User:	return GetUserLocalDataDir();
 +#else
- 			case DocsFolder_User:	return (wxDirName)Path::Combine( wxStandardPaths::Get().GetDocumentsDir(), wxGetApp().GetAppName() );
+ 			case DocsFolder_User:	return (wxDirName)Path::Combine( wxStandardPaths::Get().GetDocumentsDir(), pxGetAppName() );
 +#endif
  			//case DocsFolder_CWD:	return (wxDirName)wxGetCwd();
  			case DocsFolder_Custom: return CustomDocumentsFolder;
diff --git a/debian_unofficial/patches/21_use_legacy_soundtouch_13.patch b/debian_unofficial/patches/21_use_legacy_soundtouch_13.patch
index d51f77fa6c..03ed69e5fe 100644
--- a/debian_unofficial/patches/21_use_legacy_soundtouch_13.patch
+++ b/debian_unofficial/patches/21_use_legacy_soundtouch_13.patch
@@ -2,10 +2,10 @@ This patch removes recording feature beacause it needs libsoundtouch > 1.4.
 Howerever only the version 1.3 is in debian. Unfortunately the package seems 
 to be not actively maintained.
 Note it also correct the inlude path.
-Index: pcsx2.snapshot-3208/plugins/spu2-x/src/Wavedump_wav.cpp
+Index: pcsx2.snapshot-3337/plugins/spu2-x/src/Wavedump_wav.cpp
 ===================================================================
---- pcsx2.snapshot-3208.orig/plugins/spu2-x/src/Wavedump_wav.cpp	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/plugins/spu2-x/src/Wavedump_wav.cpp	2010-06-15 13:13:01.045085909 +0200
+--- pcsx2.snapshot-3337.orig/plugins/spu2-x/src/Wavedump_wav.cpp	2010-06-28 22:39:30.000000000 +0200
++++ pcsx2.snapshot-3337/plugins/spu2-x/src/Wavedump_wav.cpp	2010-06-28 22:43:07.313797414 +0200
 @@ -16,16 +16,22 @@
   */
  
@@ -37,7 +37,7 @@ Index: pcsx2.snapshot-3208/plugins/spu2-x/src/Wavedump_wav.cpp
  		char wavfilename[256];
  
  		for( uint cidx=0; cidx<2; cidx++ )
-@@ -64,11 +71,13 @@
+@@ -68,11 +75,13 @@
  				}
  			}
  		}
@@ -51,7 +51,7 @@ Index: pcsx2.snapshot-3208/plugins/spu2-x/src/Wavedump_wav.cpp
  		for( uint cidx=0; cidx<2; cidx++ )
  		{
  			for( int srcidx=0; srcidx<CoreSrc_Count; srcidx++ )
-@@ -76,13 +85,16 @@
+@@ -80,13 +89,16 @@
  				safe_delete( m_CoreWav[cidx][srcidx]  );
  			}
  		}
@@ -68,7 +68,7 @@ Index: pcsx2.snapshot-3208/plugins/spu2-x/src/Wavedump_wav.cpp
  	}
  
  	void WriteCore( uint coreidx, CoreSourceType src, s16 left, s16 right )
-@@ -97,11 +109,14 @@
+@@ -101,11 +113,14 @@
  
  bool WavRecordEnabled = false;
  
@@ -83,7 +83,7 @@ Index: pcsx2.snapshot-3208/plugins/spu2-x/src/Wavedump_wav.cpp
  	WavRecordEnabled = false;
  
  	try
-@@ -116,18 +131,23 @@
+@@ -120,18 +135,23 @@
  		m_wavrecord = NULL;		// not needed, but what the heck. :)
  		SysMessage("SPU2-X couldn't open file for recording: %s.\nRecording to wavfile disabled.", "recording.wav");
  	}
@@ -107,10 +107,10 @@ Index: pcsx2.snapshot-3208/plugins/spu2-x/src/Wavedump_wav.cpp
  	m_wavrecord->write( (s16*)&sample, 2 );
 +#endif
  }
-Index: pcsx2.snapshot-3208/plugins/zerospu2/zerospu2.cpp
+Index: pcsx2.snapshot-3337/plugins/zerospu2/zerospu2.cpp
 ===================================================================
---- pcsx2.snapshot-3208.orig/plugins/zerospu2/zerospu2.cpp	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/plugins/zerospu2/zerospu2.cpp	2010-06-15 13:13:01.046085349 +0200
+--- pcsx2.snapshot-3337.orig/plugins/zerospu2/zerospu2.cpp	2010-06-28 22:39:30.000000000 +0200
++++ pcsx2.snapshot-3337/plugins/zerospu2/zerospu2.cpp	2010-06-28 22:43:07.313797414 +0200
 @@ -28,7 +28,9 @@
  #include <stdlib.h>
  
@@ -141,10 +141,10 @@ Index: pcsx2.snapshot-3208/plugins/zerospu2/zerospu2.cpp
  	delete pSoundTouch; pSoundTouch = NULL;
  
  	for (u32 i = 0; i < ArraySize(s_pAudioBuffers); ++i)
-Index: pcsx2.snapshot-3208/plugins/zerospu2/zeroworker.cpp
+Index: pcsx2.snapshot-3337/plugins/zerospu2/zeroworker.cpp
 ===================================================================
---- pcsx2.snapshot-3208.orig/plugins/zerospu2/zeroworker.cpp	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/plugins/zerospu2/zeroworker.cpp	2010-06-15 13:13:01.047198072 +0200
+--- pcsx2.snapshot-3337.orig/plugins/zerospu2/zeroworker.cpp	2010-06-28 22:39:30.000000000 +0200
++++ pcsx2.snapshot-3337/plugins/zerospu2/zeroworker.cpp	2010-06-28 22:43:07.313797414 +0200
 @@ -19,10 +19,14 @@
  #include "zerospu2.h"
  #include "zeroworker.h"
diff --git a/debian_unofficial/patches/33_clean_fpic.patch b/debian_unofficial/patches/33_clean_fpic.patch
deleted file mode 100644
index 2fc8bb118e..0000000000
--- a/debian_unofficial/patches/33_clean_fpic.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Already send upstream. Seem to cause some regression
-Index: pcsx2.snapshot-3113/plugins/zzogl-pg/opengl/CMakeLists.txt
-===================================================================
---- pcsx2.snapshot-3113.orig/plugins/zzogl-pg/opengl/CMakeLists.txt	2010-05-29 11:22:38.000000000 +0200
-+++ pcsx2.snapshot-3113/plugins/zzogl-pg/opengl/CMakeLists.txt	2010-05-29 11:43:58.554840575 +0200
-@@ -10,12 +10,6 @@
- set(CMAKE_C_FLAGS_RELEASE "")
- set(CMAKE_CXX_FLAGS_RELEASE "")
- 
--# Also clear shared library flag to remove fpic option
--# that broke some asm code. The better solution will be to remove
--# the asm or fix it.
--set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
--set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
--
- # plugin name
- set(zzoglName zzogl)
- 
-@@ -29,6 +23,7 @@
-     -msse2
-     -fno-regmove
-     -DZEROGS_SSE2
-+    -fPIC
-     )
- 
- 
diff --git a/debian_unofficial/patches/43_fix_snapshot_path.patch b/debian_unofficial/patches/43_fix_snapshot_path.patch
deleted file mode 100644
index 5cd79b1bd1..0000000000
--- a/debian_unofficial/patches/43_fix_snapshot_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/GSmain.cpp
-===================================================================
---- pcsx2.snapshot-3208.orig/plugins/zzogl-pg/opengl/GSmain.cpp	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/GSmain.cpp	2010-06-15 13:13:01.344197868 +0200
-@@ -940,7 +940,7 @@
- 	{
- 		snapshotnr++;
- 
--		sprintf(filename, "%ssnap%03ld.%s", path, snapshotnr, (conf.options&GSOPTION_TGASNAP) ? "bmp" : "jpg");
-+		sprintf(filename, "%s/snap%03ld.%s", path, snapshotnr, (conf.options&GSOPTION_TGASNAP) ? "bmp" : "jpg");
- 
- 		bmpfile = fopen(filename, "rb");
- 
diff --git a/debian_unofficial/patches/44_cpu_count.patch b/debian_unofficial/patches/44_cpu_count.patch
deleted file mode 100644
index 7a0197fc3b..0000000000
--- a/debian_unofficial/patches/44_cpu_count.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: pcsx2.snapshot-3208/common/src/x86emitter/LnxCpuDetect.cpp
-===================================================================
---- pcsx2.snapshot-3208.orig/common/src/x86emitter/LnxCpuDetect.cpp	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/common/src/x86emitter/LnxCpuDetect.cpp	2010-06-15 13:13:01.552197718 +0200
-@@ -16,17 +16,18 @@
- 
- #include "PrecompiledHeader.h"
- #include "cpudetect_internal.h"
-+#include <wx/thread.h>
- 
- // Note: Apparently this solution is Linux/Solaris only.
- // FreeBSD/OsX need something far more complicated (apparently)
- void x86capabilities::CountLogicalCores()
- {
--	const uint numCPU = sysconf( _SC_NPROCESSORS_ONLN );
-+	const uint numCPU = wxThread::GetCPUCount();
- 	if( numCPU > 0 )
- 	{
- 		//isMultiCore = numCPU > 1;
- 		LogicalCores = numCPU;
--		PhysicalCores = ( numCPU / LogicalCoresPerPhysicalCPU ) * PhysicalCoresPerPhysicalCPU;
-+		PhysicalCores = numCPU / LogicalCoresPerPhysicalCPU;
- 	}
- 	else
- 	{
diff --git a/debian_unofficial/patches/50_zzogl_play.patch b/debian_unofficial/patches/50_zzogl_play.patch
deleted file mode 100644
index 0c96aa50ab..0000000000
--- a/debian_unofficial/patches/50_zzogl_play.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Index: pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/GSmain.cpp
-===================================================================
---- pcsx2.snapshot-3208.orig/plugins/zzogl-pg/opengl/GSmain.cpp	2010-06-15 13:13:01.000000000 +0200
-+++ pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/GSmain.cpp	2010-06-15 13:14:07.480949224 +0200
-@@ -263,14 +263,11 @@
- 
- 	if (IsLogging())
- 	{
-+        fprintf(gsLog,"GS: ");
- 		vfprintf(gsLog, fmt, list);
- 		fprintf(gsLog, "\n");
- 	}
- 
--	printf("ZZogl-PG(GS): ");
--
--	vprintf(fmt, list);
--	printf("\n");
- 	va_end(list);
- #endif
- }
-@@ -284,15 +281,12 @@
- 
- 	if (IsLogging())
- 	{
-+        fprintf(gsLog,"WARNING: ");
- 		vfprintf(gsLog, fmt, list);
- 		fprintf(gsLog, "\n");
- 	}
- 
--	printf("ZZogl-PG(Warning): ");
--
--	vprintf(fmt, list);
- 	va_end(list);
--	printf("\n");
- #endif
- }
- 
-@@ -305,17 +299,12 @@
- 
- 	if (IsLogging())
- 	{
-+        fprintf(gsLog,"DEBUG: ");
- 		vfprintf(gsLog, fmt, list);
- 		fprintf(gsLog, "\n");
- 	}
- 
--	printf("ZZogl-PG(Debug): ");
--
--	vprintf(fmt, list);
--	printf("\n");
- 	va_end(list);
--
--
- #endif
- }
- 
-@@ -327,14 +316,10 @@
- 
- 	if (IsLogging())
- 	{
-+        fprintf(gsLog,"Error: ");
- 		vfprintf(gsLog, fmt, list);
- 		fprintf(gsLog, "\n");
- 	}
--
--	printf("ZZogl-PG(Error): ");
--
--	vprintf(fmt, list);
--	printf("\n");
- 	va_end(list);
- }
- };
-Index: pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/ZZoglVB.cpp
-===================================================================
---- pcsx2.snapshot-3208.orig/plugins/zzogl-pg/opengl/ZZoglVB.cpp	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/ZZoglVB.cpp	2010-06-15 13:14:24.079949227 +0200
-@@ -280,7 +280,7 @@
- 
- 	assert(pnewdepth != NULL && prndr != NULL);
- 	if (pnewdepth->fbh != prndr->fbh) ZZLog::Debug_Log("pnewdepth->fbh(0x%x) != prndr->fbh(0x%x)", pnewdepth->fbh, prndr->fbh);
--	assert(pnewdepth->fbh == prndr->fbh);
-+	// assert(pnewdepth->fbh == prndr->fbh);
- 
- 	if ((pprevdepth != pnewdepth) || (pprevdepth != NULL && (pprevdepth->status & CRenderTarget::TS_NeedUpdate)))
- 		result = 2;
-Index: pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/ZZoglFlush.cpp
-===================================================================
---- pcsx2.snapshot-3208.orig/plugins/zzogl-pg/opengl/ZZoglFlush.cpp	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/ZZoglFlush.cpp	2010-06-15 13:14:07.481948884 +0200
-@@ -645,7 +645,7 @@
- 	SET_STREAM();
- #ifdef _DEBUG
- 	GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
--	assert(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT) == GL_FRAMEBUFFER_COMPLETE_EXT);
-+	// assert(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT) == GL_FRAMEBUFFER_COMPLETE_EXT);
- #endif
- 
- }
-@@ -1867,7 +1867,7 @@
- 
- 	assert(curvb.prndr != NULL && curvb.pdepth != NULL);
- 
--	assert(curvb.pdepth->fbh == curvb.prndr->fbh);
-+	// assert(curvb.pdepth->fbh == curvb.prndr->fbh);
- 
- 	if (curvb.pdepth->status & CRenderTarget::TS_Virtual)
- 	{
diff --git a/debian_unofficial/patches/55_cmake_opt_clean.patch b/debian_unofficial/patches/55_cmake_opt_clean.patch
index 5ea564655d..5f135986cc 100644
--- a/debian_unofficial/patches/55_cmake_opt_clean.patch
+++ b/debian_unofficial/patches/55_cmake_opt_clean.patch
@@ -1,8 +1,8 @@
-Index: pcsx2.snapshot-3208/pcsx2/CMakeLists.txt
+Index: pcsx2.snapshot-3337/pcsx2/CMakeLists.txt
 ===================================================================
---- pcsx2.snapshot-3208.orig/pcsx2/CMakeLists.txt	2010-06-15 13:12:59.655335900 +0200
-+++ pcsx2.snapshot-3208/pcsx2/CMakeLists.txt	2010-06-15 13:14:33.597334089 +0200
-@@ -11,12 +11,8 @@
+--- pcsx2.snapshot-3337.orig/pcsx2/CMakeLists.txt	2010-06-28 22:43:06.223607055 +0200
++++ pcsx2.snapshot-3337/pcsx2/CMakeLists.txt	2010-06-28 22:43:08.082609942 +0200
+@@ -17,12 +17,8 @@
  set(CMAKE_CXX_FLAGS_RELEASE "")
  
  # set common flags
@@ -16,7 +16,7 @@ Index: pcsx2.snapshot-3208/pcsx2/CMakeLists.txt
  	-m32
  	-march=i486
  	-msse
-@@ -32,55 +28,51 @@
+@@ -38,55 +34,51 @@
  	-W
  	-g)
  
@@ -106,7 +106,7 @@ Index: pcsx2.snapshot-3208/pcsx2/CMakeLists.txt
  endif(CMAKE_BUILD_TYPE STREQUAL Debug)
  
  # Devel - Build
-@@ -88,9 +80,9 @@
+@@ -94,9 +86,9 @@
  
  	# executable name
  	set(pcsx2Name pcsx2)
@@ -118,7 +118,7 @@ Index: pcsx2.snapshot-3208/pcsx2/CMakeLists.txt
  endif(CMAKE_BUILD_TYPE STREQUAL Devel)
  
  # Release - Build
-@@ -98,9 +90,9 @@
+@@ -104,9 +96,9 @@
  
  	# executable name
  	set(pcsx2Name pcsx2)
@@ -130,7 +130,7 @@ Index: pcsx2.snapshot-3208/pcsx2/CMakeLists.txt
  endif(CMAKE_BUILD_TYPE STREQUAL Release)
  
  # you must have both svn client executable and a source that contains svn metadata
-@@ -598,7 +590,7 @@
+@@ -606,7 +598,7 @@
  	set(Platform
  		${pcsx2LinuxSources}
  		${pcsx2LinuxHeaders})
@@ -139,7 +139,7 @@ Index: pcsx2.snapshot-3208/pcsx2/CMakeLists.txt
  
  # Windows
  if(Windows)
-@@ -611,7 +603,7 @@
+@@ -619,7 +611,7 @@
  if(MacOSX)
  	set(PlatformSources
  		)
@@ -148,7 +148,7 @@ Index: pcsx2.snapshot-3208/pcsx2/CMakeLists.txt
  
  # additonal include directories
  include_directories(.
-@@ -632,7 +624,7 @@
+@@ -640,7 +632,7 @@
  
  # link target with project internal libraries
  target_link_libraries(${pcsx2Name} Utilities x86emitter)
@@ -157,11 +157,11 @@ Index: pcsx2.snapshot-3208/pcsx2/CMakeLists.txt
  # link target with wx
  target_link_libraries(${pcsx2Name} ${wxWidgets_LIBRARIES})
  
-Index: pcsx2.snapshot-3208/common/src/x86emitter/CMakeLists.txt
+Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt
 ===================================================================
---- pcsx2.snapshot-3208.orig/common/src/x86emitter/CMakeLists.txt	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/common/src/x86emitter/CMakeLists.txt	2010-06-15 13:14:33.597334089 +0200
-@@ -16,10 +16,6 @@
+--- pcsx2.snapshot-3337.orig/common/src/x86emitter/CMakeLists.txt	2010-06-28 22:39:30.000000000 +0200
++++ pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt	2010-06-28 22:43:08.084613185 +0200
+@@ -22,10 +22,6 @@
  # set common flags
  set(CommonFlags 
  	-pthread
@@ -172,7 +172,7 @@ Index: pcsx2.snapshot-3208/common/src/x86emitter/CMakeLists.txt
  	-m32
  	-march=i486
  	-msse
-@@ -35,66 +31,63 @@
+@@ -41,66 +37,63 @@
  	-W
  	-g)
  
@@ -274,131 +274,140 @@ Index: pcsx2.snapshot-3208/common/src/x86emitter/CMakeLists.txt
  endif(CMAKE_BUILD_TYPE STREQUAL Release)
  
  # variable with all sources of this library
-Index: pcsx2.snapshot-3208/common/src/Utilities/CMakeLists.txt
+Index: pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt
 ===================================================================
---- pcsx2.snapshot-3208.orig/common/src/Utilities/CMakeLists.txt	2010-06-15 13:10:41.000000000 +0200
-+++ pcsx2.snapshot-3208/common/src/Utilities/CMakeLists.txt	2010-06-15 13:14:33.598334111 +0200
-@@ -19,82 +19,76 @@
- 	-m32
- 	-march=i486
- 	-msse
--	-msse2
--	-fno-dse
+--- pcsx2.snapshot-3337.orig/common/src/Utilities/CMakeLists.txt	2010-06-28 22:39:30.000000000 +0200
++++ pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt	2010-06-28 22:43:08.084613185 +0200
+@@ -20,16 +20,12 @@
+ set(CMAKE_CXX_FLAGS_RELEASE "")
+ 
+ # set common flags
+-set(CommonFlags 
++set(CommonFlags
+ 	-pthread
+ 	-m32
+ 	-march=i486
+ 	-msse
+ 	-msse2
+-	-fno-dse
 -	-fno-guess-branch-probability
--	-fno-strict-aliasing
+-	-fno-strict-aliasing
 -	-fno-tree-dse
-+	-msse2
- 	-pipe
--	-Wno-format
--	-Wno-unused-parameter
--	-Wno-unused-value
--	-Wunused-variable)
-+	-Wno-format
-+	-Wno-unused-parameter
-+	-Wno-unused-value
-+	-Wunused-variable)
- 
- # set warning flags
- set(DebugFlags
- 	-g
- 	-W)
- 
-+# Remove optimization that can break the code. Must be retested
-+set(BadFlags_O0
-+    -fno-guess-branch-probability
-+    -fno-dse
-+    -fno-tree-dse
-+    )
-+
-+set(BadFlags_O1
-+    -fno-argument-alias
-+    -fno-branch-count-reg
-+    -fno-ipa-pure-const
-+    -fno-ipa-reference
-+    -fno-omit-frame-pointer
-+    -fno-split-wide-types
-+    -fno-tree-copy-prop
-+    -fno-tree-dse
-+    -fno-tree-sink
-+    )
-+
-+
-+set(BadFlags_O2
-+    -fno-expensive-optimizations
-+    -fno-forward-propagate
-+    -fno-inline-small-functions
-+    -fno-ipa-cp
-+    -fno-schedule-insns2
-+    -fno-strict-aliasing
-+    -fno-tree-builtin-call-dce
-+    )
-+
- # set optimization flags
- set(OptimizationFlags
--	-falign-functions
--	-falign-jumps
--	-falign-labels
--	-falign-loops
--	-fcaller-saves
--	-fcprop-registers
--	-fcrossjumping
--	-fcse-follow-jumps
- 	-fcse-skip-blocks
--	-fdefer-pop
--	-fdelete-null-pointer-checks
--	-fgcse
--	-fgcse-lm
--	-fif-conversion
--	-fif-conversion2
--	-fmerge-constants
--	-foptimize-sibling-calls
--	-fpeephole2
--	-fregmove
--	-freorder-blocks
--	-freorder-functions 
--	-frerun-cse-after-loop
--	-fsched-interblock
--	-fsched-spec
- 	-fstrict-overflow
--	-fthread-jumps
--	-ftree-ccp
--	-ftree-ch
--	-ftree-copyrename
--	-ftree-dce
--	-ftree-dominator-opts
--	-ftree-fre
- 	-ftree-lrs
--	-ftree-pre
--	-ftree-sra
--	-ftree-ter
--	-ftree-vrp
--	-funit-at-a-time)
-+    -O2
-+    )
-+
- 
- # Debug - Build
- if(CMAKE_BUILD_TYPE STREQUAL Debug)
- 	
- 	# add defines
--	add_definitions(${CommonFlags} ${DebugFlags} -DPCSX2_DEBUG -DPCSX2_DEVBUILD)
-+	add_definitions(${CommonFlags} ${DebugFlags} ${BadFlags_O0} -DPCSX2_DEBUG -DPCSX2_DEVBUILD)
- endif(CMAKE_BUILD_TYPE STREQUAL Debug)
- 
- # Devel - Build
- if(CMAKE_BUILD_TYPE STREQUAL Devel)
- 	
- 	# add defines
--	add_definitions(${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD)
-+	add_definitions(${CommonFlags} ${OptimizationFlags} ${BadFlags_O0} ${BadFlags_O1} ${BadFlags_O2} -DPCSX2_DEVBUILD)
- endif(CMAKE_BUILD_TYPE STREQUAL Devel)
- 
- # Release - Build
- if(CMAKE_BUILD_TYPE STREQUAL Release)
- 	
- 	# add defines
--	add_definitions(${CommonFlags} ${OptimizationFlags})
-+	add_definitions(${CommonFlags} ${OptimizationFlags} ${BadFlags_O0} ${BadFlags_O1} ${BadFlags_O2})
- endif(CMAKE_BUILD_TYPE STREQUAL Release)
- 
- # variable with all sources of this library
+ 	-pipe
+ 	-Wno-format
+ 	-Wno-unused-parameter
+@@ -41,66 +37,64 @@
+ 	-g
+ 	-W)
+ 
++# Remove optimization that can break the code. Must be retested
++set(BadFlags_O0
++    -fno-guess-branch-probability
++    -fno-dse
++    -fno-tree-dse
++    )
++
++set(BadFlags_O1
++    -fno-argument-alias
++    -fno-branch-count-reg
++    -fno-ipa-pure-const
++    -fno-ipa-reference
++    -fno-omit-frame-pointer
++    -fno-split-wide-types
++    -fno-tree-copy-prop
++    -fno-tree-dse
++    -fno-tree-sink
++    )
++
++
++set(BadFlags_O2
++    -fno-expensive-optimizations
++    -fno-forward-propagate
++    -fno-inline-small-functions
++    -fno-ipa-cp
++    -fno-schedule-insns2
++    -fno-strict-aliasing
++    -fno-tree-builtin-call-dce
++    )
++
++
+ # set optimization flags
+ set(OptimizationFlags
+-	-falign-functions
+-	-falign-jumps
+-	-falign-labels
+-	-falign-loops
+-	-fcaller-saves
+-	-fcprop-registers
+-	-fcrossjumping
+-	-fcse-follow-jumps
+ 	-fcse-skip-blocks
+-	-fdefer-pop
+-	-fdelete-null-pointer-checks
+-	-fgcse
+-	-fgcse-lm
+-	-fif-conversion
+-	-fif-conversion2
+-	-fmerge-constants
+-	-foptimize-sibling-calls
+-	-fpeephole2
+-	-fregmove
+-	-freorder-blocks
+-	-freorder-functions 
+-	-frerun-cse-after-loop
+-	-fsched-interblock
+-	-fsched-spec
+ 	-fstrict-overflow
+-	-fthread-jumps
+-	-ftree-ccp
+-	-ftree-ch
+-	-ftree-copyrename
+-	-ftree-dce
+-	-ftree-dominator-opts
+-	-ftree-fre
+ 	-ftree-lrs
+-	-ftree-pre
+-	-ftree-sra
+-	-ftree-ter
+-	-ftree-vrp
+-	-funit-at-a-time)
++    -O2
++	)
+ 
+ # Debug - Build
+ if(CMAKE_BUILD_TYPE STREQUAL Debug)
+-	
++
+ 	# add defines
+-	add_definitions(${CommonFlags} ${DebugFlags} -DPCSX2_DEBUG -DPCSX2_DEVBUILD)
++	add_definitions(${CommonFlags} ${DebugFlags} ${BadFlags_O0} -DPCSX2_DEBUG -DPCSX2_DEVBUILD)
+ endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+ 
+ # Devel - Build
+ if(CMAKE_BUILD_TYPE STREQUAL Devel)
+-	
++
+ 	# add defines
+-	add_definitions(${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD)
++	add_definitions(${CommonFlags} ${OptimizationFlags} ${BadFlags_O0} ${BadFlags_O1} ${BadFlags_O2} -DPCSX2_DEVBUILD)
+ endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+ 
+ # Release - Build
+ if(CMAKE_BUILD_TYPE STREQUAL Release)
+-	
++
+ 	# add defines
+-	add_definitions(${CommonFlags} ${OptimizationFlags})
++	add_definitions(${CommonFlags} ${OptimizationFlags} ${BadFlags_O0} ${BadFlags_O1} ${BadFlags_O2})
+ endif(CMAKE_BUILD_TYPE STREQUAL Release)
+ 
+ # variable with all sources of this library
+@@ -178,7 +172,7 @@
+ 
+ # link target with wx
+ target_link_libraries(${UtilitiesName} ${wxWidgets_LIBRARIES})
+- 
++
+ # Force the linker into 32 bits mode
+ target_link_libraries(${UtilitiesName} -m32)
+ 
diff --git a/debian_unofficial/patches/56_cmake_enable_opt1.patch b/debian_unofficial/patches/56_cmake_enable_opt1.patch
index 83ba2dc224..045771bb3a 100644
--- a/debian_unofficial/patches/56_cmake_enable_opt1.patch
+++ b/debian_unofficial/patches/56_cmake_enable_opt1.patch
@@ -1,8 +1,40 @@
-Index: pcsx2.snapshot-3208/common/src/Utilities/CMakeLists.txt
+Index: pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt
 ===================================================================
---- pcsx2.snapshot-3208.orig/common/src/Utilities/CMakeLists.txt	2010-06-15 13:14:33.598334111 +0200
-+++ pcsx2.snapshot-3208/common/src/Utilities/CMakeLists.txt	2010-06-15 13:14:33.901074350 +0200
-@@ -39,15 +39,6 @@
+--- pcsx2.snapshot-3337.orig/common/src/Utilities/CMakeLists.txt	2010-06-28 22:43:08.084613185 +0200
++++ pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt	2010-06-28 22:43:08.330002361 +0200
+@@ -39,21 +39,9 @@
+ 
+ # Remove optimization that can break the code. Must be retested
+ set(BadFlags_O0
+-    -fno-guess-branch-probability
+-    -fno-dse
+-    -fno-tree-dse
+     )
+ 
+ set(BadFlags_O1
+-    -fno-argument-alias
+-    -fno-branch-count-reg
+-    -fno-ipa-pure-const
+-    -fno-ipa-reference
+-    -fno-omit-frame-pointer
+-    -fno-split-wide-types
+-    -fno-tree-copy-prop
+-    -fno-tree-dse
+-    -fno-tree-sink
+     )
+ 
+ 
+Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt
+===================================================================
+--- pcsx2.snapshot-3337.orig/common/src/x86emitter/CMakeLists.txt	2010-06-28 22:43:08.084613185 +0200
++++ pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt	2010-06-28 22:43:08.330726425 +0200
+@@ -39,21 +39,9 @@
+ 
+ # Remove optimization that can break the code. Must be retested
+ set(BadFlags_O0
+-    -fno-guess-branch-probability
+-    -fno-dse
+-    -fno-tree-dse
      )
  
  set(BadFlags_O1
@@ -18,31 +50,17 @@ Index: pcsx2.snapshot-3208/common/src/Utilities/CMakeLists.txt
      )
  
  
-Index: pcsx2.snapshot-3208/common/src/x86emitter/CMakeLists.txt
+Index: pcsx2.snapshot-3337/pcsx2/CMakeLists.txt
 ===================================================================
---- pcsx2.snapshot-3208.orig/common/src/x86emitter/CMakeLists.txt	2010-06-15 13:14:33.597334089 +0200
-+++ pcsx2.snapshot-3208/common/src/x86emitter/CMakeLists.txt	2010-06-15 13:14:33.901074350 +0200
-@@ -39,15 +39,6 @@
-     )
+--- pcsx2.snapshot-3337.orig/pcsx2/CMakeLists.txt	2010-06-28 22:43:08.082609942 +0200
++++ pcsx2.snapshot-3337/pcsx2/CMakeLists.txt	2010-06-28 22:43:08.330726425 +0200
+@@ -36,21 +36,9 @@
  
- set(BadFlags_O1
--    -fno-argument-alias
--    -fno-branch-count-reg
--    -fno-ipa-pure-const
--    -fno-ipa-reference
--    -fno-omit-frame-pointer
--    -fno-split-wide-types
--    -fno-tree-copy-prop
+ # Remove optimization that can break the code. Must be retested
+ set(BadFlags_O0
+-    -fno-guess-branch-probability
+-    -fno-dse
 -    -fno-tree-dse
--    -fno-tree-sink
-     )
- 
- 
-Index: pcsx2.snapshot-3208/pcsx2/CMakeLists.txt
-===================================================================
---- pcsx2.snapshot-3208.orig/pcsx2/CMakeLists.txt	2010-06-15 13:14:33.597334089 +0200
-+++ pcsx2.snapshot-3208/pcsx2/CMakeLists.txt	2010-06-15 13:14:33.902074456 +0200
-@@ -36,15 +36,6 @@
      )
  
  set(BadFlags_O1
diff --git a/debian_unofficial/patches/57_cmake_enable_opt2.patch b/debian_unofficial/patches/57_cmake_enable_opt2.patch
new file mode 100644
index 0000000000..bb44a50a2c
--- /dev/null
+++ b/debian_unofficial/patches/57_cmake_enable_opt2.patch
@@ -0,0 +1,54 @@
+Index: pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt
+===================================================================
+--- pcsx2.snapshot-3337.orig/common/src/Utilities/CMakeLists.txt	2010-06-28 22:43:08.330002361 +0200
++++ pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt	2010-06-28 22:43:08.621848268 +0200
+@@ -46,13 +46,6 @@
+ 
+ 
+ set(BadFlags_O2
+-    -fno-expensive-optimizations
+-    -fno-forward-propagate
+-    -fno-inline-small-functions
+-    -fno-ipa-cp
+-    -fno-schedule-insns2
+-    -fno-strict-aliasing
+-    -fno-tree-builtin-call-dce
+     )
+ 
+ 
+Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt
+===================================================================
+--- pcsx2.snapshot-3337.orig/common/src/x86emitter/CMakeLists.txt	2010-06-28 22:43:08.330726425 +0200
++++ pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt	2010-06-28 22:43:08.621848268 +0200
+@@ -46,13 +46,6 @@
+ 
+ 
+ set(BadFlags_O2
+-    -fno-expensive-optimizations
+-    -fno-forward-propagate
+-    -fno-inline-small-functions
+-    -fno-ipa-cp
+-    -fno-schedule-insns2
+-    -fno-strict-aliasing
+-    -fno-tree-builtin-call-dce
+     )
+ 
+ # set optimization flags
+Index: pcsx2.snapshot-3337/pcsx2/CMakeLists.txt
+===================================================================
+--- pcsx2.snapshot-3337.orig/pcsx2/CMakeLists.txt	2010-06-28 22:43:08.330726425 +0200
++++ pcsx2.snapshot-3337/pcsx2/CMakeLists.txt	2010-06-28 22:43:08.622848331 +0200
+@@ -42,13 +42,6 @@
+     )
+ 
+ set(BadFlags_O2
+-    -fno-expensive-optimizations
+-    -fno-forward-propagate
+-    -fno-inline-small-functions
+-    -fno-ipa-cp
+-    -fno-schedule-insns2
+-    -fno-strict-aliasing
+-    -fno-tree-builtin-call-dce
+     )
+ 
+ # set optimization flags
diff --git a/debian_unofficial/patches/facility_for_my_personal_system.patch b/debian_unofficial/patches/facility_for_my_personal_system.patch
deleted file mode 100644
index 13aef2cdf8..0000000000
--- a/debian_unofficial/patches/facility_for_my_personal_system.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/GSmain.cpp
-===================================================================
---- pcsx2.snapshot-3208.orig/plugins/zzogl-pg/opengl/GSmain.cpp	2010-06-15 13:14:07.480949224 +0200
-+++ pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/GSmain.cpp	2010-06-15 13:14:34.157955576 +0200
-@@ -530,7 +530,7 @@
- 	SaveConfig();
- }
- 
--void OnKeyboardF6(int shift)
-+void OnKeyboardF7(int shift)
- {
- 	FUNCLOG
- 
-@@ -556,7 +556,7 @@
- 	SaveConfig();
- }
- 
--void OnKeyboardF7(int shift)
-+void OnKeyboardF6(int shift)
- {
- 	FUNCLOG
- 
-Index: pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/CMakeLists.txt
-===================================================================
---- pcsx2.snapshot-3208.orig/plugins/zzogl-pg/opengl/CMakeLists.txt	2010-06-15 13:15:07.402947013 +0200
-+++ pcsx2.snapshot-3208/plugins/zzogl-pg/opengl/CMakeLists.txt	2010-06-15 13:15:18.296948496 +0200
-@@ -39,7 +39,7 @@
- # Debug - Build
- if(CMAKE_BUILD_TYPE STREQUAL Debug)
-     # add defines
--    add_definitions(${CommonFlags} -g -Wall -D_DEBUG)
-+    add_definitions(${CommonFlags} -g -Wall -D_DEBUG -DZEROGS_DEVBUILD)
- endif(CMAKE_BUILD_TYPE STREQUAL Debug)
- 
- # Devel - Build
diff --git a/debian_unofficial/patches/old/31_add_cdvd_cmake_and_fix.patch b/debian_unofficial/patches/old/31_add_cdvd_cmake_and_fix.patch
deleted file mode 100644
index d7202fc30c..0000000000
--- a/debian_unofficial/patches/old/31_add_cdvd_cmake_and_fix.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-Fix cmake to include an additional CDVD module. Mainly rename version.h, to avoid a conflict with alsa/version.h
-Upstream need to properly fix the "version.h"
-Index: pcsx2.snapshot-3185/plugins/CDVDlinuz/Src/Linux/CDVDlinuz.c
-===================================================================
---- pcsx2.snapshot-3185.orig/plugins/CDVDlinuz/Src/Linux/CDVDlinuz.c	2010-06-08 19:27:02.000000000 +0200
-+++ pcsx2.snapshot-3185/plugins/CDVDlinuz/Src/Linux/CDVDlinuz.c	2010-06-08 19:35:28.095953061 +0200
-@@ -47,7 +47,7 @@
- #include "DVD.h" // InitDVDInfo()
- #include "device.h"
- 
--#include "../version.h"
-+#include "../version_local.h"
- 
- 
- // Globals
-Index: pcsx2.snapshot-3185/plugins/CDVDlinuz/Src/Linux/aboutbox.c
-===================================================================
---- pcsx2.snapshot-3185.orig/plugins/CDVDlinuz/Src/Linux/aboutbox.c	2010-06-08 19:27:02.000000000 +0200
-+++ pcsx2.snapshot-3185/plugins/CDVDlinuz/Src/Linux/aboutbox.c	2010-06-08 19:35:28.095953061 +0200
-@@ -62,7 +62,7 @@
- 
- 
- 
--#include "version.h"
-+#include "version_local.h"
- 
- #include "aboutbox.h"
- 
-Index: pcsx2.snapshot-3185/plugins/CDVDlinuz/Src/version.h
-===================================================================
---- pcsx2.snapshot-3185.orig/plugins/CDVDlinuz/Src/version.h	2010-06-08 19:27:02.000000000 +0200
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,86 +0,0 @@
--/*  version.h
--
-- *  Copyright (C) 2002-2005  PCSX2 Team
--
-- *
--
-- *  This program is free software; you can redistribute it and/or modify
--
-- *  it under the terms of the GNU General Public License as published by
--
-- *  the Free Software Foundation; either version 2 of the License, or
--
-- *  (at your option) any later version.
--
-- *
--
-- *  This program is distributed in the hope that it will be useful,
--
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--
-- *  GNU General Public License for more details.
--
-- *
--
-- *  You should have received a copy of the GNU General Public License
--
-- *  along with this program; if not, write to the Free Software
--
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--
-- *
--
-- *  PCSX2 members can be contacted through their website at www.pcsx2.net.
--
-- */
--
--
--
--
--
--#ifndef VERSION_H
--
--#define VERSION_H
--
--
--
--
--
--#ifndef __LINUX__
--
--#ifdef __linux__
--
--#define __LINUX__
--
--#endif /* __linux__ */
--
--#endif /* No __LINUX__ */
--
--
--
--#define CDVDdefs
--
--#include "PS2Edefs.h"
--
--
--
--
--
--extern char *libname;
--
--
--
--extern const unsigned char version;
--
--extern const unsigned char revision;
--
--extern const unsigned char build;
--
--
--
--
--
--#endif /* VERSION_H */
--
-Index: pcsx2.snapshot-3185/plugins/CDVDlinuz/Src/version_local.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ pcsx2.snapshot-3185/plugins/CDVDlinuz/Src/version_local.h	2010-06-08 19:35:28.095953061 +0200
-@@ -0,0 +1,86 @@
-+/*  version.h
-+
-+ *  Copyright (C) 2002-2005  PCSX2 Team
-+
-+ *
-+
-+ *  This program is free software; you can redistribute it and/or modify
-+
-+ *  it under the terms of the GNU General Public License as published by
-+
-+ *  the Free Software Foundation; either version 2 of the License, or
-+
-+ *  (at your option) any later version.
-+
-+ *
-+
-+ *  This program is distributed in the hope that it will be useful,
-+
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+
-+ *  GNU General Public License for more details.
-+
-+ *
-+
-+ *  You should have received a copy of the GNU General Public License
-+
-+ *  along with this program; if not, write to the Free Software
-+
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+
-+ *
-+
-+ *  PCSX2 members can be contacted through their website at www.pcsx2.net.
-+
-+ */
-+
-+
-+
-+
-+
-+#ifndef VERSION_H
-+
-+#define VERSION_H
-+
-+
-+
-+
-+
-+#ifndef __LINUX__
-+
-+#ifdef __linux__
-+
-+#define __LINUX__
-+
-+#endif /* __linux__ */
-+
-+#endif /* No __LINUX__ */
-+
-+
-+
-+#define CDVDdefs
-+
-+#include "PS2Edefs.h"
-+
-+
-+
-+
-+
-+extern char *libname;
-+
-+
-+
-+extern const unsigned char version;
-+
-+extern const unsigned char revision;
-+
-+extern const unsigned char build;
-+
-+
-+
-+
-+
-+#endif /* VERSION_H */
-+
-Index: pcsx2.snapshot-3185/plugins/CDVDlinuz/Src/CMakeLists.txt
-===================================================================
---- pcsx2.snapshot-3185.orig/plugins/CDVDlinuz/Src/CMakeLists.txt	2010-06-08 19:27:02.000000000 +0200
-+++ pcsx2.snapshot-3185/plugins/CDVDlinuz/Src/CMakeLists.txt	2010-06-08 19:35:28.095953061 +0200
-@@ -50,7 +50,7 @@
-     PS2Etypes.h
-     # ERROR It takes /usr/include/alsa/version.h
-     # Either fix include dir. Or rename the file. Or mv stuff into in another include file.
--    version.h
-+    version_local.h
- )
- 
- # CDVDlinuz Linux sources
diff --git a/debian_unofficial/patches/old/97_CDVDnull_setting.patch b/debian_unofficial/patches/old/97_CDVDnull_setting.patch
deleted file mode 100644
index 2b626b9d7b..0000000000
--- a/debian_unofficial/patches/old/97_CDVDnull_setting.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: pcsx2.snapshot-3185/plugins/CDVDnull/Linux/Config.cpp
-===================================================================
---- pcsx2.snapshot-3185.orig/plugins/CDVDnull/Linux/Config.cpp	2010-06-10 15:41:19.391525024 +0200
-+++ pcsx2.snapshot-3185/plugins/CDVDnull/Linux/Config.cpp	2010-06-10 15:45:25.552686133 +0200
-@@ -24,6 +24,8 @@
- #include <string.h>
- 
- GtkWidget *MsgDlg;
-+extern string s_strIniPath;
-+PluginConf Ini;
- 
- void OnMsg_Ok()
- {
-@@ -73,6 +75,38 @@
- 	gtk_main();
- }
- 
-+void CDVDconfigure()
-+{
-+	LoadConfig();
-+	PluginNullConfigure("Since this is a null plugin, all that is really configurable is logging.", conf.Log);
-+	SaveConfig();
-+}
-+
- void LoadConfig()
- {
-+    const std::string iniFile(s_strIniPath + "/CDVDNull.ini");
-+
-+	if (!Ini.Open(iniFile, READ_FILE))
-+	{
-+		printf("failed to open %s\n", iniFile.c_str());
-+		SaveConfig();//save and return
-+		return;
-+	}
-+
-+	conf.Log = Ini.ReadInt("logging", 0);
-+	Ini.Close();
-+}
-+
-+void SaveConfig()
-+{
-+    const std::string iniFile(s_strIniPath + "/CDVDNull.ini");
-+
-+	if (!Ini.Open(iniFile, WRITE_FILE))
-+	{
-+		printf("failed to open %s\n", iniFile.c_str());
-+		return;
-+	}
-+
-+	Ini.WriteInt("logging", conf.Log);
-+	Ini.Close();
- }
-Index: pcsx2.snapshot-3185/plugins/CDVDnull/CDVD.h
-===================================================================
---- pcsx2.snapshot-3185.orig/plugins/CDVDnull/CDVD.h	2010-06-10 15:41:15.267525668 +0200
-+++ pcsx2.snapshot-3185/plugins/CDVDnull/CDVD.h	2010-06-10 15:51:09.344566061 +0200
-@@ -23,6 +23,7 @@
- 
- #define CDVDdefs
- #include "PS2Edefs.h"
-+#include "PS2Eext.h"
- 
- #ifdef __LINUX__
- #include <gtk/gtk.h>
diff --git a/debian_unofficial/patches/series b/debian_unofficial/patches/series
index dd2937a64b..806163f7f6 100644
--- a/debian_unofficial/patches/series
+++ b/debian_unofficial/patches/series
@@ -1,15 +1,8 @@
 01_rename_binary_generated.patch
 02_update_default_path.patch
-03_central_userconfig_function.patch
-04_xdg_config_home.patch
 05_move_data_to_config.patch
 21_use_legacy_soundtouch_13.patch
-# Regression
-#33_clean_fpic.patch
 # Personnal patch that need advance testing
-#43_fix_snapshot_path.patch
-#44_cpu_count.patch
-#50_zzogl_play.patch
 #55_cmake_opt_clean.patch
 #56_cmake_enable_opt1.patch
-#facility_for_my_personal_system.patch
+#57_cmake_enable_opt2.patch
diff --git a/pcsx2/gui/Panels/MiscPanelStuff.cpp b/pcsx2/gui/Panels/MiscPanelStuff.cpp
index 5bd7e717d3..ad910c9e05 100644
--- a/pcsx2/gui/Panels/MiscPanelStuff.cpp
+++ b/pcsx2/gui/Panels/MiscPanelStuff.cpp
@@ -48,7 +48,7 @@ Panels::DocsFolderPickerPanel::DocsFolderPickerPanel( wxWindow* parent, bool isF
 	{
 		RadioPanelItem(
 			_("User Documents (recommended)"),
-			_("Location: ") + PathDefs::GetDocuments(DocsFolder_User).GetFilename().GetFullPath()
+			_("Location: ") + PathDefs::GetDocuments(DocsFolder_User).ToString()
 		),
 
 		RadioPanelItem(