From: Robert Kaiser <kairo@kairo.at>
Date: Sun, 6 Jul 2014 23:53:12 +0000 (+0200)
Subject: make bug 997131 work actually work on both sides of the change and merge branches
X-Git-Tag: LCARStrek-2.28~12
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=94863ccc203336a3b8c0b976b14e23b4b8ee7db9;hp=f897a590a135f4de8227cc5cc228bd0b60885c05;p=themes.git

make bug 997131 work actually work on both sides of the change and merge branches
---

diff --git a/EarlyBlue/install.rdf b/EarlyBlue/install.rdf
index c9a79759..c3417218 100644
--- a/EarlyBlue/install.rdf
+++ b/EarlyBlue/install.rdf
@@ -5,13 +5,13 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>EarlyBlue@kairo.at</em:id>
-    <em:version>2.27</em:version>
+    <em:version>2.28</em:version>
 
     <!-- SeaMonkey -->
     <em:targetApplication>
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.27</em:minVersion>
+        <em:minVersion>2.28</em:minVersion>
         <em:maxVersion>2.30a1</em:maxVersion>
       </Description>
     </em:targetApplication>
diff --git a/LCARStrek/install.rdf b/LCARStrek/install.rdf
index a1cacdc9..6aad4b9e 100644
--- a/LCARStrek/install.rdf
+++ b/LCARStrek/install.rdf
@@ -5,13 +5,13 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>LCARStrek@kairo.at</em:id>
-    <em:version>2.27</em:version>
+    <em:version>2.28</em:version>
 
     <!-- SeaMonkey -->
     <em:targetApplication>
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.27</em:minVersion>
+        <em:minVersion>2.28</em:minVersion>
         <em:maxVersion>2.30a1</em:maxVersion>
       </Description>
     </em:targetApplication>
@@ -19,7 +19,7 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>30.0</em:minVersion>
+        <em:minVersion>31.0</em:minVersion>
         <em:maxVersion>33.0a1</em:maxVersion>
       </Description>
     </em:targetApplication>
diff --git a/origdiff b/origdiff
index 3b681577..a6878ff6 100755
--- a/origdiff
+++ b/origdiff
@@ -6,15 +6,15 @@ SCRIPT_DIR=$(pwd)
 
 # ============ vars specific to the versions ==============
 
-NAME_PRE=29
-NAME_POST=30
+NAME_PRE=30
+NAME_POST=31
 
-TAG_PRE_COMM=BETA_29_END
-TAG_POST_COMM=tip #BETA_30_END
-TAG_PRE_MOZ=FIREFOX_29_0b9_RELEASE #FIREFOX_BETA_29_END
-TAG_POST_MOZ=tip #FIREFOX_BETA_30_END
-TAG_PRE_EXT=SEAMONKEY_2_26_RELEASE
-TAG_POST_EXT=tip #SEAMONKEY_2_27_RELEASE
+TAG_PRE_COMM=BETA_30_END
+TAG_POST_COMM=tip #BETA_31_END
+TAG_PRE_MOZ=FIREFOX_BETA_30_END
+TAG_POST_MOZ=tip #FIREFOX_BETA_31_END
+TAG_PRE_EXT=SEAMONKEY_2_26_RELEASE #SEAMONKEY_2_27_RELEASE
+TAG_POST_EXT=tip #SEAMONKEY_2_28_RELEASE
 
 # ===================== process repos =====================