some small fixes; prepare origdiff for path changes in next cycle (22)

[themes.git] / origdiff

diff --git a/origdiff b/origdiff
index adbfe841f0bab98bd6a400f706f2b37efe11b425..0ca3c426e1e10802d0301d77d3142e052dbb4bdd 100755 (executable)
--- a/origdiff
+++ b/origdiff
@@ -6,15 +6,15 @@ SCRIPT_DIR=$(pwd)
 
 # ============ vars specific to the versions ==============
 
-NAME_PRE=5
-NAME_POST=6
+NAME_PRE=20
+NAME_POST=21
 
-TAG_PRE_COMM=BETA_5_END
-TAG_POST_COMM=BETA_6_END
-TAG_PRE_MOZ=FIREFOX_BETA_5_END
-TAG_POST_MOZ=FIREFOX_BETA_6
-TAG_PRE_EXT=SEAMONKEY_2_2_RELEASE
-TAG_POST_EXT=SEAMONKEY_2_3_RELEASE
+TAG_PRE_COMM=BETA_20_END
+TAG_POST_COMM=tip #BETA_21_END
+TAG_PRE_MOZ=FIREFOX_BETA_20_END
+TAG_POST_MOZ=tip #FIREFOX_BETA_21_END
+TAG_PRE_EXT=SEAMONKEY_2_17_RELEASE
+TAG_POST_EXT=tip #SEAMONKEY_2_18_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/
 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/
 MOZB_TAG_PRE=$TAG_PRE_MOZ
 MOZB_TAG_POST=$TAG_POST_MOZ
 MOZB_NAME_EXTRA=" (browser)"