[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 31706f6f633beb1c7498492390d3f22f5c87d998
Author: Andrey Rahmatullin <wrar at wrar.name>
Date:   Fri Jun 15 22:34:22 2012 +0600

    Move plugins from /usr/lib/games/psemu to /usr/lib/psemu.

diff --git a/debian/patches/fix-plugin-dir.patch b/debian/patches/fix-plugin-dir.patch
new file mode 100644
index 0000000..d5a641d
--- /dev/null
+++ b/debian/patches/fix-plugin-dir.patch
@@ -0,0 +1,99 @@
+Description: Move the plugins directory from $libdir/games to $libdir.
+Author: Andrey Rahmatullin <wrar at wrar.name>
+Forwarded: no
+Last-Update: 2012-06-15
+
+diff --git a/gui/Makefile.am b/gui/Makefile.am
+index 50e9e8f..b2874e0 100644
+--- a/gui/Makefile.am
++++ b/gui/Makefile.am
+@@ -4,7 +4,7 @@ INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
+ 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+ 	-I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \
+ 	-DPSEMU_DATA_DIR=\"${datadir}/psemu\" \
+-	-DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\"
++	-DDEF_PLUGIN_DIR=\"${libdir}/psemu\"
+ 
+ bin_PROGRAMS = pcsx
+ 
+diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am
+index 6edf16b..4692e5f 100644
+--- a/plugins/dfcdrom/Makefile.am
++++ b/plugins/dfcdrom/Makefile.am
+@@ -1,5 +1,5 @@
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFCdrom.la
+ 
+diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am
+index 0f5138a..13cc599 100644
+--- a/plugins/dfinput/Makefile.am
++++ b/plugins/dfinput/Makefile.am
+@@ -1,5 +1,5 @@
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFInput.la
+ 
+diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am
+index 36f9768..0e806b0 100644
+--- a/plugins/dfnet/Makefile.am
++++ b/plugins/dfnet/Makefile.am
+@@ -1,5 +1,5 @@
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFNet.la
+ 
+diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am
+index 88a7dc8..568eee4 100644
+--- a/plugins/dfsound/Makefile.am
++++ b/plugins/dfsound/Makefile.am
+@@ -4,8 +4,8 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
+ 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+ 	-I../../include
+ 
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFSound.la
+ 
+diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am
+index 89ba770..8460c2d 100644
+--- a/plugins/dfxvideo/Makefile.am
++++ b/plugins/dfxvideo/Makefile.am
+@@ -13,8 +13,8 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
+ 	-I../../libpcsxcore \
+ 	-I../../include
+ 
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFXVideo.la
+ 
+diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am
+index d88dc94..41a7c1a 100644
+--- a/plugins/peopsxgl/Makefile.am
++++ b/plugins/peopsxgl/Makefile.am
+@@ -4,8 +4,8 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
+ 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
+ 	-I../../libpcsxcore -I../../include -fPIC
+ 
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libpeopsxgl.la
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 39b6be3..b8039b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix-i386-exec-stack.patch
 fix-armel-ftbfs.diff
 disable-ppc-auto-dynarec.patch
 fix-pcsx-link.patch
+fix-plugin-dir.patch
diff --git a/debian/pcsxr.install b/debian/pcsxr.install
index 698ab6f..5ca49a1 100644
--- a/debian/pcsxr.install
+++ b/debian/pcsxr.install
@@ -1,4 +1,4 @@
-/usr/lib/games/psemu/
+/usr/lib/psemu/
 /usr/games/pcsx
 /usr/share/psemu/
 /usr/share/locale/
diff --git a/debian/rules b/debian/rules
index 58c15e6..a0f04a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
 	dh_auto_install --parallel
-	rm -f $(CURDIR)/debian/tmp/usr/lib/games/psemu/*.la
+	rm -f $(CURDIR)/debian/tmp/usr/lib/psemu/*.la
 
 override_dh_install:
 	dh_install --fail-missing

-- 
pcsxr packaging