Merge

MB · MB · commit 85152c7280c3 · 2015-09-11T01:00:02.000Z
¯#	../Portland_State_University-falsemixed.xml
diff --git a/makexpi.sh b/makexpi.sh
@@ -100,12 +100,9 @@ fi
 
 # Prepare packages suitable for uploading to EFF and AMO, respectively.
 [ -d pkg ] || mkdir pkg
-[ -e pkg/xpi-eff ] && rm -rf pkg/xpi-eff
-cp -a src/ pkg/xpi-eff/
+rsync -a --delete --delete-excluded --exclude /chrome/content/rules src/ pkg/xpi-eff
 cp -a translations/* pkg/xpi-eff/chrome/locale/
-rm -r pkg/xpi-eff/chrome/content/rules
-[ -e pkg/xpi-amo ] && rm -rf pkg/xpi-amo
-cp -a pkg/xpi-eff/ pkg/xpi-amo/
+rsync -a --delete pkg/xpi-eff/ pkg/xpi-amo
 # The AMO version of the package cannot contain the updateKey or updateURL tags.
 # Also, it has a different id than the eff-hosted version, because Firefox now
 # requires us to upload the eff-hosted version to an unlisted extension on AMO
diff --git a/src/chrome/content/about.xul b/src/chrome/content/about.xul
@@ -38,7 +38,7 @@
 
     <groupbox>
       <caption label="&https-everywhere.about.version;" />
-      <label>5.0.9</label>
+      <label>5.1.0</label>
     </groupbox>
     
     <groupbox>
diff --git a/src/chrome/content/rules/Walmart.com.xml b/src/chrome/content/rules/Walmart.com.xml
@@ -144,7 +144,7 @@
 	<!--	Complications:
 				-->
 	<target host="walmart.com" />
-	<target host="localad.walmart.com" />
+	<!-- <target host="localad.walmart.com" /> -->
 	<target host="p13n-assets.walmart.com" />
 
 		<!-- 	Redirect to http:
@@ -190,19 +190,23 @@
 			<test url="http://help.walmart.com/euf/assets/images/BTN_search_75x30.png" />
 			<test url="http://help.walmart.com/favicon.ico" />
 
+		<!--
 		<exclusion pattern="^http://localad\.walmart\.com/+(?!$|\?)" />
+		-->
 
 			<!--	+ve:
 					-->
+		<!--
 			<test url="http://localad.walmart.com/f" />
 			<test url="http://localad.walmart.com/o" />
 			<test url="http://localad.walmart.com//o" />
 			<test url="http://localad.walmart.com/b" />
 			<test url="http://localad.walmart.com/a" />
+		-->
 
 			<!--	-ve:
 					-->
-			<test url="http://localad.walmart.com//" />
+			<!-- <test url="http://localad.walmart.com//" /> -->
 
 		<test url="http://beacon.walmart.com/tap.gif?tap=" />
 
@@ -227,8 +231,8 @@
 
 	<!--	Redirect keeps args:
 					-->
-	<rule from="^http://localad\.walmart\.com/+"
-		to="https://weeklyad.walmart.com/walmart/" />
+	<!-- <rule from="^http://localad\.walmart\.com/+"
+		to="https://weeklyad.walmart.com/walmart/" /> -->
 
 	<rule from="^http://p13n-assets\.walmart\.com/"
 		to="https://a248.e.akamai.net/f/1697/4479/7/p13n-assets.walmart.com/" />
