take in fixes for bug 1043797, bug 1043803, and bug 1043805 to make content blocking...

[themes.git] / origdiff

diff --git a/origdiff b/origdiff
index f6323e8b086dc859ad3cb97ff730797baff0cd56..7aa5a14b0c2c5ea2c94a7029e23212d1b2b9d520 100755 (executable)
--- a/origdiff
+++ b/origdiff
@@ -6,15 +6,15 @@ SCRIPT_DIR=$(pwd)
 
 # ============ vars specific to the versions ==============
 
-NAME_PRE=21
-NAME_POST=22
+NAME_PRE=31
+NAME_POST=32
 
-TAG_PRE_COMM=BETA_21_END
-TAG_POST_COMM=tip #BETA_22_END
-TAG_PRE_MOZ=FIREFOX_BETA_21_END
-TAG_POST_MOZ=tip #FIREFOX_BETA_22_END
-TAG_PRE_EXT=SEAMONKEY_2_18b4_RELEASE #SEAMONKEY_2_18_RELEASE
-TAG_POST_EXT=tip #SEAMONKEY_2_19_RELEASE
+TAG_PRE_COMM=BETA_31_END
+TAG_POST_COMM=tip #BETA_32_END
+TAG_PRE_MOZ=FIREFOX_BETA_31_END
+TAG_POST_MOZ=tip #FIREFOX_BETA_32_END
+TAG_PRE_EXT=SEAMONKEY_2_26_RELEASE #SEAMONKEY_2_28_RELEASE
+TAG_POST_EXT=tip #SEAMONKEY_2_29_RELEASE
 
 # ===================== process repos =====================
 
@@ -30,7 +30,7 @@ COMM_LOG=$RUN_DIR/theme-suitedefault.$NAME_PRE-$NAME_POST.log
 
 HG_MOZ_DIR=/mnt/mozilla/hg/comm-beta/mozilla
 MOZ_HG_OPTIONS=
-MOZ_DIR=toolkit/themes/windows/
+MOZ_DIR="toolkit/themes/windows/ toolkit/themes/shared/"
 MOZ_TAG_PRE=$TAG_PRE_MOZ
 MOZ_TAG_POST=$TAG_POST_MOZ
 MOZ_NAME_EXTRA=" (toolkit)"
@@ -38,7 +38,7 @@ MOZ_LOG=$RUN_DIR/theme-toolkitwin.$NAME_PRE-$NAME_POST.log
 
 HG_MOZB_DIR=/mnt/mozilla/hg/comm-beta/mozilla
 MOZB_HG_OPTIONS=
-MOZB_DIR=browser/themes/windows/
+MOZB_DIR="browser/themes/windows/ browser/themes/shared/"
 MOZB_TAG_PRE=$TAG_PRE_MOZ
 MOZB_TAG_POST=$TAG_POST_MOZ
 MOZB_NAME_EXTRA=" (browser)"