3 files changed, 21 insertions, 15 deletions

diff --git a/deskutils/mcatalog/files/patch-src::Defines.cs.in b/deskutils/mcatalog/files/patch-src::Defines.cs.in
index 9238d9dbfc20..ce9beac641fa 100644
--- a/deskutils/mcatalog/files/patch-src::Defines.cs.in
+++ b/deskutils/mcatalog/files/patch-src::Defines.cs.in
@@ -1,13 +1,14 @@
---- src/Defines.cs.in.orig	Sun Oct 24 23:22:12 2004
-+++ src/Defines.cs.in	Sun Oct 24 23:24:03 2004
-@@ -9,8 +9,8 @@
+--- src/Defines.cs.in.orig	Sun Aug  7 13:40:06 2005
++++ src/Defines.cs.in	Sun Aug  7 13:40:44 2005
+@@ -9,9 +9,9 @@
  
  public class Defines {
  	public static string VERSION = "@version@";
 -	public static string DATADIR = "@prefix@/share";
 +	public static string DATADIR = "@prefix@/share/gnome";
  	public static string APP_DATADIR = DATADIR + "/mcatalog";
- 	public static string IMAGE_DATADIR = DATADIR + "/pixmaps/mcatalog";
+ 	public static string IMAGE_DATADIR = APP_DATADIR + "/pixmaps";
+ 	public static string TEMPLATES_DATADIR = APP_DATADIR + "/templates";
 -	public static string GNOME_LOCALE_DIR = DATADIR + "/locale";
 +	public static string GNOME_LOCALE_DIR = "@prefix@/share/locale";
  }
diff --git a/deskutils/mcatalog/files/patch-src::Makefile.in b/deskutils/mcatalog/files/patch-src::Makefile.in
deleted file mode 100644
index b4b8cff3a965..000000000000
--- a/deskutils/mcatalog/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Sun Oct 24 22:54:23 2004
-+++ src/Makefile.in	Sun Oct 24 22:55:42 2004
-@@ -152,7 +152,7 @@
- MCATALOG_CSFILES =  	$(MCATALOG_ORIGINAL_CSFILES)				$(srcdir)/Defines.cs
- 
- 
--ASSEMBLIES =  	/r:System.Data					/r:System.Web.Services				/r:Mono.Data.SqliteClient			/r:Mono.Posix					/pkg:gtkhtml-sharp				/pkg:glade-sharp				/pkg:gconf-sharp
-+ASSEMBLIES =  	/r:System.Data					/r:System.Web.Services				/r:Mono.Data.SqliteClient			/r:Mono.Posix					$(shell pkg-config --libs gtkhtml-sharp glade-sharp gconf-sharp)
- 
- 
- RESOURCES =  	/resource:$(top_srcdir)/resources/mainwindow.glade,mainwindow.glade 				/resource:$(top_srcdir)/resources/themeselection.glade,themeselection.glade			/resource:$(top_srcdir)/resources/films.png,films.png 						/resource:$(top_srcdir)/resources/Database.sql,Database.sql 					/resource:$(top_srcdir)/resources/books.png,books.png 						/resource:$(top_srcdir)/resources/template_items_books.html,template_items_books.html 		/resource:$(top_srcdir)/resources/overviewbg.png,overviewbg.png 				/resource:$(top_srcdir)/resources/overviewbgnp.png,overviewbgnp.png 				/resource:$(top_srcdir)/resources/overview.png,overview.png 					/resource:$(top_srcdir)/resources/list.png,list.png 						/resource:$(top_srcdir)/resources/dialogaddbook.glade,dialogaddbook.glade 			/resource:$(top_srcdir)/resources/bigstar.png,bigstar.png 					/resource:$(top_srcdir)/resources/littlestar.png,littlestar.png 				/resource:$(top_srcdir)/resources/dialogaddfilm.glade,dialogaddfilm.glade 			/resource:$(top_srcdir)/resources/template_items_films.html,template_items_films.html 		/resource:$(top_srcdir)/resources/empty.png,empty.png 						/resource:$(top_srcdir)/resources/borrowed.png,borrowed.png 					/resource:$(top_srcdir)/resources/music.png,music.png
diff --git a/deskutils/mcatalog/files/patch-src_mcatalog.in b/deskutils/mcatalog/files/patch-src_mcatalog.in
new file mode 100644
index 000000000000..0962d28a10a0
--- /dev/null
+++ b/deskutils/mcatalog/files/patch-src_mcatalog.in
@@ -0,0 +1,16 @@
+--- src/mcatalog.in.orig	Sun Aug  7 14:51:42 2005
++++ src/mcatalog.in	Sun Aug  7 14:51:49 2005
+@@ -1,6 +1,12 @@
+ #!/bin/sh
+ 
+-export LD_LIBRARY_PATH="@prefix@/lib/mcatalog:$LD_LIBRARY_PATH"
++MOZILLA_HOME=%%MOZILLA%%
++export MOZILLA_HOME
++ 
++MOZILLA_FIVE_HOME=%%MOZILLA%%
++export MOZILLA_FIVE_HOME
++
++export LD_LIBRARY_PATH="@prefix@/lib/mcatalog:%%MOZILLA%%:$LD_LIBRARY_PATH"
+ EXE_TO_RUN="@prefix@/lib/mcatalog/mcatalog.exe"
+ 
+ mono $EXE_TO_RUN "$@"