[shotwell] Rebase upstream's multilib patch to apply to 0.9.0 final (the original patch is in a context where a

[Michel Alexandre Salim]

commit c47bd38104d7acb1c57eb660022d9876fae4fc17
Author: Michel Alexandre Salim 
Date:   Fri Apr 1 11:55:30 2011 +0200

Rebase upstream's multilib patch to apply to 0.9.0 final (the original patch
    is in a context where an unrelated line has been updated)

shotwell-0.9.0-multilib.patch |   77 +++++++++++++---------------------------
 1 files changed, 25 insertions(+), 52 deletions(-)
---
diff --git a/shotwell-0.9.0-multilib.patch b/shotwell-0.9.0-multilib.patch
index ff6873d..7b10a2a 100644
--- a/shotwell-0.9.0-multilib.patch
+++ b/shotwell-0.9.0-multilib.patch
@@ -1,22 +1,16 @@
-From bec8dcaa01f71a44320c7437493e281d8d47bd2a Mon Sep 17 00:00:00 2001
-From: lucas 
-Date: Thu, 31 Mar 2011 21:17:50 +0000
-Subject: [PATCH] Allows configuring the name of the system library directory at build time. Closes #3421.
-
-git-svn-id: svn://svn.yorba.org/shotwell/trunk@2823 3d32681d-0f36-45c0-afa7-64c43348dfec
----
- Makefile                   |    7 ++++---
- configure                  |   12 +++++++++++-
- shotwell-plugin-dev-1.0.m4 |    2 +-
- src/AppDirs.vala           |    2 +-
- src/Resources.vala         |    5 ++++-
- 5 files changed, 21 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 9cab74f..c900420 100644
---- a/Makefile
-+++ b/Makefile
-@@ -14,19 +14,19 @@ INSTALL_DATA := install -m 644
+--- shotwell-0.9.0/shotwell-plugin-dev-1.0.m4.multilib	2011-03-22 21:46:17.000000000 +0100
++++ shotwell-0.9.0/shotwell-plugin-dev-1.0.m4	2011-04-01 11:50:56.914539923 +0200
+@@ -1,6 +1,6 @@
+ prefix=_PREFIX_
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/_LIB_
+ includedir=${prefix}/include
+ 
+ Name: Shotwell Plugin Development
+--- shotwell-0.9.0/Makefile.multilib	2011-03-22 21:46:17.000000000 +0100
++++ shotwell-0.9.0/Makefile	2011-04-01 11:54:19.668539920 +0200
+@@ -14,19 +14,19 @@
  PREFIX=/usr/local
  SCHEMA_FILE_DIR=/etc/gconf/schemas
  BUILD_RELEASE=1
@@ -31,14 +25,14 @@ index 9cab74f..c900420 100644

EXPORT_FLAGS = -export-dynamic

- SUPPORTED_LANGUAGES=fr de it es pl et sv sk lv pt bg bn nl da zh_CN el ru pa hu en_GB uk ja fi zh_TW cs nb id th sl hr ar ast ro sr lt gl tr ca ko kk pt_BR eu he mk te ta
+ SUPPORTED_LANGUAGES=fr de it es pl et sv sk lv pt bg bn nl da zh_CN el ru pa hu en_GB uk ja fi zh_TW cs nb id th sl hr ar ast ro sr lt gl tr ca ko kk pt_BR eu he mk te_IN
  LOCAL_LANG_DIR=locale-langpack
  SYSTEM_LANG_DIR=$(DESTDIR)$(PREFIX)/share/locale
 -LIB=lib

include units.mk
  include plugins/plugins.mk
-@@ -556,7 +556,8 @@ ifdef INSTALL_HEADERS
+@@ -557,7 +557,8 @@
  endif

$(PC_FILE): $(PC_INPUT) $(MAKE_FILES)
@@ -48,11 +42,9 @@ index 9cab74f..c900420 100644

$(UNITIZE_STAMP): $(MAKE_FILES) src/unit/rc/UnitInternals.m4 src/unit/rc/unitize_entry.m4
    @mkdir -p $(UNITIZE_DIR)
-diff --git a/configure b/configure
-index 815cfad..a63259f 100755
---- a/configure
-+++ b/configure
-@@ -19,6 +19,8 @@ configure_help() {
+--- shotwell-0.9.0/configure.multilib	2011-03-22 21:46:17.000000000 +0100
++++ shotwell-0.9.0/configure	2011-04-01 11:50:56.911539923 +0200
+@@ -19,6 +19,8 @@
      printf "\t\t\t\t[--release]\n"
      printf "\t--prefix=PREFIX\t\tPrepend PREFIX to program installation paths.\n"
      printf "\t\t\t\t[/usr/local]\n"
@@ -61,7 +53,7 @@ index 815cfad..a63259f 100755
      printf "\t--define=SYMBOL\t\tDefine a symbol for the Vala compiler.\n"
      printf "\t--with-gconf-schema-file-dir=DIR\n"
      printf "\t\t\t\tDirectory for installing schema files.\n"
-@@ -65,7 +67,15 @@ do
+@@ -65,7 +67,15 @@

variables="${variables}PREFIX=$value\n"
                              ;;
@@ -78,23 +70,9 @@ index 815cfad..a63259f 100755
          --assume-pkgs)      variables="${variables}ASSUME_PKGS=1\n"
                              ;;

-diff --git a/shotwell-plugin-dev-1.0.m4 b/shotwell-plugin-dev-1.0.m4
-index 3a2fc94..1cbf175 100644
---- a/shotwell-plugin-dev-1.0.m4
-+++ b/shotwell-plugin-dev-1.0.m4
-@@ -1,6 +1,6 @@
- prefix=_PREFIX_
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=${exec_prefix}/_LIB_
- includedir=${prefix}/include
- 
- Name: Shotwell Plugin Development
-diff --git a/src/AppDirs.vala b/src/AppDirs.vala
-index e69238b..72f7a0e 100644
---- a/src/AppDirs.vala
-+++ b/src/AppDirs.vala
-@@ -153,7 +153,7 @@ class AppDirs {
+--- shotwell-0.9.0/src/AppDirs.vala.multilib	2011-03-22 21:46:15.000000000 +0100
++++ shotwell-0.9.0/src/AppDirs.vala	2011-04-01 11:50:56.915539923 +0200
+@@ -153,7 +153,7 @@
      public static File get_lib_dir() {
          File? install_dir = get_install_dir();

@@ -103,10 +81,8 @@ index e69238b..72f7a0e 100644
              : get_exec_dir();
      }

-diff --git a/src/Resources.vala b/src/Resources.vala
-index 9123d8c..a5f8e47 100644
---- a/src/Resources.vala
-+++ b/src/Resources.vala
+--- shotwell-0.9.0/src/Resources.vala.multilib	2011-03-22 21:46:15.000000000 +0100
++++ shotwell-0.9.0/src/Resources.vala	2011-04-01 11:50:56.916539923 +0200
 @@ -8,6 +8,7 @@
  extern const string _PREFIX;
  extern const string _VERSION;
@@ -115,7 +91,7 @@ index 9123d8c..a5f8e47 100644

namespace Resources {
      public const string APP_TITLE = "Shotwell";
-@@ -21,7 +22,9 @@ namespace Resources {
+@@ -21,7 +22,9 @@
      public const string WIKI_URL = "http://trac.yorba.org/wiki/Shotwell";
      public const string FAQ_URL = "http://trac.yorba.org/wiki/Shotwell/FAQ";
      public const string DIR_PATTERN_URI_SYSWIDE = "ghelp:shotwell?other-files";
@@ -126,6 +102,3 @@ index 9123d8c..a5f8e47 100644
      public const string PREFIX = _PREFIX;

public const double TRANSIENT_WINDOW_OPACITY = 0.90;
--- 
-1.7.4.2
-