[SCM] pcsxr packaging branch, master, updated. debian/1.9.92-3-13-g4ac25d7

[Andrey Rahmatullin]

The following commit has been merged in the master branch:
commit f2525d3f05828aa03f9f6e52709042c507cfda98
Author: Andrey Rahmatullin <wrar at wrar.name>
Date:   Fri Jun 15 22:35:08 2012 +0600

    Update symlinks in ~/.pcsx/plugins/ automatically.

diff --git a/debian/patches/series b/debian/patches/series
index b8039b8..6ace374 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ fix-armel-ftbfs.diff
 disable-ppc-auto-dynarec.patch
 fix-pcsx-link.patch
 fix-plugin-dir.patch
+update-homedir-symlinks.patch
diff --git a/debian/patches/update-homedir-symlinks.patch b/debian/patches/update-homedir-symlinks.patch
new file mode 100644
index 0000000..e4de75b
--- /dev/null
+++ b/debian/patches/update-homedir-symlinks.patch
@@ -0,0 +1,35 @@
+Description: Remove old symlinks from ~/.pcsx/plugins/ before creating new ones
+ If a plugin location was changed and a symlink to the old location exist in
+ the home user directory, it must be updated.
+Author: Andrey Rahmatullin <wrar at wrar.name>
+Forwarded: no
+Last-Update: 2012-06-15
+
+diff --git a/gui/LnxMain.c b/gui/LnxMain.c
+index 8297a91..e316248 100644
+--- a/gui/LnxMain.c
++++ b/gui/LnxMain.c
+@@ -111,12 +111,15 @@ static void ScanPlugins(gchar* scandir) {
+ 			} else {
+ 				/* Create a symlink from this file to the directory ~/.pcsx/plugin */
+ 				linkname = g_build_filename (getenv("HOME"), PLUGINS_DIR, ent->d_name, NULL);
++				unlink(linkname);
+ 				symlink(filename, linkname);
+ 
++
+ 				/* If it's a config tool, make one in the cfg dir as well.
+ 				   This allows plugins with retarded cfg finding to work :- ) */
+ 				if (match(filename, "cfg.*") == 1) {
+ 					linkname = g_build_filename (getenv("HOME"), PLUGINS_CFG_DIR, ent->d_name, NULL);
++					unlink(linkname);
+ 					symlink(filename, linkname);
+ 				}
+ 				g_free (linkname);
+@@ -147,6 +150,7 @@ static void ScanBios(gchar* scandir) {
+ 			} else {
+ 				/* Create a symlink from this file to the directory ~/.pcsx/plugin */
+ 				linkname = g_build_filename(getenv("HOME"), BIOS_DIR, ent->d_name, NULL);
++				unlink(linkname);
+ 				symlink(filename, linkname);
+ 
+ 				g_free(linkname);

-- 
pcsxr packaging