first part of syncing LCARStrek with Firefox 36 windows theme changes

[themes.git] / origdiff

diff --git a/origdiff b/origdiff
index 725f57f9a74c9b74db08ed828fb52d4e15868ec1..11d8d4e554e6cdff1631ebc385d84e63a7f67193 100755 (executable)
--- a/origdiff
+++ b/origdiff
@@ -6,15 +6,15 @@ SCRIPT_DIR=$(pwd)
 
 # ============ vars specific to the versions ==============
 
-NAME_PRE=14
-NAME_POST=15
+NAME_PRE=35
+NAME_POST=36
 
-TAG_PRE_COMM=BETA_14_END
-TAG_POST_COMM=tip #BETA_15_END
-TAG_PRE_MOZ=FIREFOX_BETA_14_END
-TAG_POST_MOZ=tip #FIREFOX_BETA_15_END
-TAG_PRE_EXT=SEAMONKEY_2_11_RELEASE
-TAG_POST_EXT=tip #SEAMONKEY_2_12_RELEASE
+TAG_PRE_COMM=BETA_35_END
+TAG_POST_COMM=tip #BETA_36_END
+TAG_PRE_MOZ=FIREFOX_BETA_35_END
+TAG_POST_MOZ=tip #FIREFOX_BETA_36_END
+TAG_PRE_EXT=SEAMONKEY_2_32_RELEASE
+TAG_POST_EXT=tip #SEAMONKEY_2_33_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/winstripe/
+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/winstripe/
+MOZB_DIR="browser/themes/windows/ browser/themes/shared/"
 MOZB_TAG_PRE=$TAG_PRE_MOZ
 MOZB_TAG_POST=$TAG_POST_MOZ
 MOZB_NAME_EXTRA=" (browser)"