Tidy up filter list headers

Drop `%version%` for now.

Remove header data from imported sublists at build-from-template time.

filters/annoyances-cookies.txt

@@ -1,10 +1,9 @@
 ! Title: uBlock filters – Cookie Notices
-! Version: %version%
 ! Last modified: %timestamp%
+! Expires: 7 days
 ! Description: |
 !   Filters optimized for uBlock Origin, to be used with EasyList's
 !   and/or Adguard's "Cookie Notices" list(s)
-! Expires: 7 days
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 ! Forums: https://github.com/uBlockOrigin/uAssets/issues

filters/annoyances-others.txt

@@ -1,9 +1,9 @@
 ! Title: uBlock filters – Other Annoyances
+! Last modified: %timestamp%
+! Expires: 7 days
 ! Description: |
 !   Filters optimized for uBlock Origin, to be used with EasyList's
 !   and/or Adguard's "Other Annoyances" list(s)
-! Expires: 7 days
-! Last modified: %timestamp%
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 ! Forums: https://github.com/uBlockOrigin/uAssets/issues

filters/annoyances.txt

@@ -1,9 +1,9 @@
 ! Title: uBlock₀ filters – Annoyances
+! Last modified: %timestamp%
+! Expires: 7 days
 ! Description: |
 !   Filters optimized for uBlock Origin, to be used with Fanboy's
 !   and/or Adguard's "Annoyances" list(s)
-! Expires: 7 days
-! Last modified: %timestamp%
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 ! Forums: https://github.com/uBlockOrigin/uAssets/issues

filters/badware.txt

@@ -1,11 +1,10 @@
 ! Title: uBlock₀ filters – Badware risks
-! Version: %version%
 ! Last modified: %timestamp%
+! Expires: 5 days
 ! Description: |
 !   For sites documented to put users at risk of installing 
 !   adware/crapware/malware, having login credentials stolen, etc.
 !   The purpose is to at least ensure a user is warned of the risks ahead.
-! Expires: 5 days
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 !

filters/filters-2020.txt

@@ -1,6 +1,6 @@
-! Title: uBlock₀ filters (2020)
-! Description: Filters optimized for uBlock, to be used along EasyList
+! Title: uBlock filters (2020)
 ! Last modified: %timestamp%
+! Description: Filters optimized for uBlock, to be used along EasyList
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 ! new filters from april 2020 to ->

filters/filters-2021.txt

@@ -1,6 +1,6 @@
-! Title: uBlock₀ filters (2021)
-! Description: Filters optimized for uBlock, to be used along EasyList
+! Title: uBlock filters (2021)
 ! Last modified: %timestamp%
+! Description: Filters optimized for uBlock, to be used along EasyList
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 ! New filters from January 2021 to ->

filters/filters-2022.txt

@@ -1,6 +1,6 @@
-! Title: uBlock₀ filters (2022)
-! Description: Filters optimized for uBlock, to be used along EasyList
+! Title: uBlock filters (2022)
 ! Last modified: %timestamp%
+! Description: Filters optimized for uBlock, to be used along EasyList
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 ! New filters from January 2022 to ->

filters/filters-2023.txt

@@ -1,6 +1,6 @@
-! Title: uBlock₀ filters (2023)
-! Description: Filters optimized for uBlock, to be used along EasyList
+! Title: uBlock filters (2023)
 ! Last modified: %timestamp%
+! Description: Filters optimized for uBlock, to be used along EasyList
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 ! New filters from January 2023 to ->

filters/filters-mobile.txt

@@ -1,6 +1,6 @@
 ! Title: uBlock filters – Mobile
-! Description: Filters optimized for uBlock, to be used along EasyList
 ! Last modified: %timestamp%
+! Description: Filters optimized for uBlock, to be used along EasyList
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 !

filters/filters.txt

@@ -1,8 +1,7 @@
-! Title: uBlock₀ filters
-! Version: %version%
+! Title: uBlock filters
 ! Last modified: %timestamp%
-! Description: Filters optimized for uBlock, to be used along EasyList
 ! Expires: 5 days
+! Description: Filters optimized for uBlock, to be used along EasyList
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 !

filters/lan-block.txt

@@ -1,8 +1,8 @@
 [uBlock Origin]
 ! Title: Block Outsider Intrusion into LAN
-! Description: Prevents public internet sites from digging into your local LAN files.
-! Expires: 29 days
 ! Last modified: %timestamp%
+! Expires: 29 days
+! Description: Prevents public internet sites from digging into your local LAN files.
 ! Requested here: https://github.com/uBlockOrigin/uAssets/issues/4318
 ! Revived for: https://github.com/uBlockOrigin/uBlock-issues/issues/1070
 ! Homepage: https://github.com/uBlockOrigin/uAssets

filters/legacy.txt

@@ -1,7 +1,7 @@
-! Title: uBlock₀ filters -- Legacy
-! Description: Filters to address issues specific to legacy versions of uBO.
-! Expires: 11 days
+! Title: uBlock filters -- Legacy
 ! Last modified: %timestamp%
+! Expires: 11 days
+! Description: Filters to address issues specific to legacy versions of uBO.
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 !

filters/privacy.txt

@@ -1,11 +1,10 @@
-! Title: uBlock₀ filters – Privacy
-! Version: %version%
+! Title: uBlock filters – Privacy
 ! Last modified: %timestamp%
+! Expires: 7 days
 ! Description: |
 !   Some of these filters make use of the `important` filter option,
 !   which purpose is to guarantee that a filter won't be overriden by
 !   exception filters.
-! Expires: 7 days
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 !

filters/quick-fixes.txt

@@ -1,8 +1,7 @@
 ! Title: uBlock₀ filters – Quick fixes
-! Version: %version%
 ! Last modified: %timestamp%
-! Description: Immediate, temporary filters to fix websites
 ! Expires: 12 hours
+! Description: Immediate, temporary filters to fix websites
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 ! Forums: https://github.com/uBlockOrigin/uAssets/issues

filters/resource-abuse.txt

@@ -1,10 +1,10 @@
-! Title: uBlock₀ filters – Resource abuse
+! Title: uBlock filters – Resource abuse
+! Last modified: %timestamp%
+! Expires: 7 days
 ! Description: |
 !   To foil sites potentially abusing CPU/bandwidth resources without informed
 !   consent. Any such resource-abuse scripts MUST be opt-in, with complete
 !   informed consent from the visitor.
-! Expires: 7 days
-! Last modified: %timestamp%
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 !

filters/ubol-filters.txt

@@ -1,7 +1,7 @@
 ! Title: uBO Lite filters
-! Description: Filters optimized for uBO Lite
-! Expires: 4 days
 ! Last modified: %timestamp%
+! Expires: 4 days
+! Description: Filters optimized for uBO Lite
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 !

filters/unbreak.txt

@@ -1,10 +1,9 @@
-! Title: uBlock₀ filters – Unbreak
-! Version: %version%
+! Title: uBlock filters – Unbreak
 ! Last modified: %timestamp%
+! Expires: 5 days
 ! Description:
 !     Filters optimized for uBlock Origin, to unbreak sites broken as
 !     a result of 3rd-party filter lists enabled by default.
-! Expires: 5 days
 ! Homepage: https://github.com/uBlockOrigin/uAssets
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 !

templates/easylist-annoyances.template

@@ -1,6 +1,5 @@
 [Adblock Plus 2.0]
 ! Title: EasyList – Annoyances
-! Version: %version%
 ! Last modified: %timestamp%
 ! Expires: 7 days (update frequency)
 %include easylist:template_header.txt%

templates/easylist-chat.template

@@ -1,6 +1,5 @@
 [Adblock Plus 2.0]
 ! Title: EasyList – Chat Widgets
-! Version: %version%
 ! Last modified: %timestamp%
 %include easylist:template_header.txt%
 !

templates/easylist-cookies.template

@@ -1,6 +1,5 @@
 [Adblock Plus 2.0]
 ! Title: EasyList – Cookie Notices
-! Version: %version%
 ! Last modified: %timestamp%
 ! Expires: 7 days (update frequency)
 %include easylist:template_header.txt%

templates/easylist-newsletters.template

@@ -1,6 +1,5 @@
 [Adblock Plus 2.0]
 ! Title: EasyList – Newsletter Notices
-! Version: %version%
 ! Last modified: %timestamp%
 ! Expires: 7 days (update frequency)
 %include easylist:template_header.txt%

templates/easylist-notifications.template

@@ -1,6 +1,5 @@
 [Adblock Plus 2.0]
 ! Title: EasyList – Notifications
-! Version: %version%
 ! Last modified: %timestamp%
 ! Expires: 7 days (update frequency)
 %include easylist:template_header.txt%

templates/easylist-social.template

@@ -1,6 +1,5 @@
 [Adblock Plus 2.0]
 ! Title: EasyList – Social Widgets
-! Version: %version%
 ! Last modified: %timestamp%
 ! Expires: 7 days (update frequency)
 %include easylist:template_header.txt%

templates/easylist.template

@@ -1,10 +1,9 @@
 [Adblock Plus 2.0]
 ! Title: EasyList
-! Version: %version%
 ! Last modified: %timestamp%
+! Expires: 6 days (update frequency)
 ! Diff-Path: %diffpath%
 ! Diff-Name: easylist
-! Expires: 6 days (update frequency)
 %include easylist:template_header.txt%
 !
 !-----------------------General advert blocking filters-----------------------!

templates/easyprivacy.template

@@ -1,10 +1,9 @@
 [Adblock Plus 1.1]
 ! Title: EasyPrivacy
-! Version: %version%
 ! Last modified: %timestamp%
+! Expires: 6 days (update frequency)
 ! Diff-Path: %diffpath%
 ! Diff-Name: easyprivacy
-! Expires: 6 days (update frequency)
 %include easylist:template_header.txt%
 !
 !-----------------General tracking systems-----------------!

templates/ublock-annoyances.template

@@ -1 +1,8 @@
+! Title: uBlock filters – Annoyances
+! Last modified: %timestamp%
+! Expires: 7 days
+! Diff-Path: %diffpath%
+! Diff-Name: ublock-annoyances
+! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
+
 %include uAssets:filters/annoyances.txt%

templates/ublock-filters.template

@@ -1,15 +1,9 @@
 ! Title: uBlock filters
-! Version: %version%
 ! Last modified: %timestamp%
+! Expires: 5 days
 ! Diff-Path: %diffpath%
 ! Diff-Name: ublock-filters
-! Description: Filters optimized for uBlock, to be used along EasyList
-! Expires: 5 days
-! Homepage: https://github.com/uBlockOrigin/uAssets
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
-!
-! GitHub issues: https://github.com/uBlockOrigin/uAssets/issues
-! GitHub pull requests: https://github.com/uBlockOrigin/uAssets/pulls
 
 %include uAssets:filters/filters.txt%
 

templates/ublock-privacy.template

@@ -1,16 +1,9 @@
 ! Title: uBlock filters – Privacy
-! Version: %version%
 ! Last modified: %timestamp%
-! Description: |
-!   Some of these filters make use of the `important` filter option,
-!   which purpose is to guarantee that a filter won't be overriden by
-!   exception filters.
 ! Expires: 7 days
+! Diff-Path: %diffpath%
+! Diff-Name: ublock-privacy
 ! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
-! Homepage: https://github.com/uBlockOrigin/uAssets
-!
-! GitHub issues: https://github.com/uBlockOrigin/uAssets/issues
-! GitHub pull requests: https://github.com/uBlockOrigin/uAssets/pulls
 
 %include uAssets:filters/privacy.txt%
 

templates/ublock-quick-fixes.template

@@ -1,7 +1,8 @@
-! Title: uBlock₀ filters – Quick fixes
-! Version: %version%
+! Title: uBlock filters – Quick fixes
 ! Last modified: %timestamp%
+! Expires: 12 hours
 ! Diff-Path: %diffpath%
 ! Diff-Name: ublock-quick-fixes
+! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 
 %include uAssets:filters/quick-fixes.txt%

templates/ublock-unbreak.template

@@ -1,7 +1,8 @@
 ! Title: uBlock₀ filters – Unbreak
-! Version: %version%
 ! Last modified: %timestamp%
+! Expires: 5 days
 ! Diff-Path: %diffpath%
 ! Diff-Name: ublock-unbreak
+! License: https://github.com/uBlockOrigin/uAssets/blob/master/LICENSE
 
 %include uAssets:filters/unbreak.txt%

thirdparties/easylist/easylist-annoyances.txt

@@ -1,6 +1,5 @@
 [Adblock Plus 2.0]
 ! Title: EasyList – Annoyances
-! Version: %version%
 ! Last modified: %timestamp%
 ! Expires: 7 days (update frequency)
 ! *** easylist:template_header.txt ***

thirdparties/easylist/easylist-chat.txt

@@ -1,6 +1,5 @@
 [Adblock Plus 2.0]
 ! Title: EasyList – Chat Widgets
-! Version: %version%
 ! Last modified: %timestamp%
 ! *** easylist:template_header.txt ***
 !

thirdparties/easylist/easylist-cookies.txt

@@ -1,6 +1,5 @@
 [Adblock Plus 2.0]
 ! Title: EasyList – Cookie Notices
-! Version: %version%
 ! Last modified: %timestamp%
 ! Expires: 7 days (update frequency)
 ! *** easylist:template_header.txt ***

thirdparties/easylist/easylist-newsletters.txt

@@ -1,6 +1,5 @@
 [Adblock Plus 2.0]
 ! Title: EasyList – Newsletter Notices
-! Version: %version%
 ! Last modified: %timestamp%
 ! Expires: 7 days (update frequency)
 ! *** easylist:template_header.txt ***

thirdparties/easylist/easylist-notifications.txt

@@ -1,6 +1,5 @@
 [Adblock Plus 2.0]
 ! Title: EasyList – Notifications
-! Version: %version%
 ! Last modified: %timestamp%
 ! Expires: 7 days (update frequency)
 ! *** easylist:template_header.txt ***

thirdparties/easylist/easylist-social.txt

@@ -1,6 +1,5 @@
 [Adblock Plus 2.0]
 ! Title: EasyList – Social Widgets
-! Version: %version%
 ! Last modified: %timestamp%
 ! Expires: 7 days (update frequency)
 ! *** easylist:template_header.txt ***

thirdparties/easylist/easylist.txt

@@ -1,10 +1,9 @@
 [Adblock Plus 2.0]
 ! Title: EasyList
-! Version: %version%
 ! Last modified: %timestamp%
+! Expires: 6 days (update frequency)
 ! Diff-Path: %diffpath%
 ! Diff-Name: easylist
-! Expires: 6 days (update frequency)
 ! *** easylist:template_header.txt ***
 !
 ! Please report any unblocked adverts or problems

thirdparties/easylist/easyprivacy.txt

@@ -1,10 +1,9 @@
 [Adblock Plus 1.1]
 ! Title: EasyPrivacy
-! Version: %version%
 ! Last modified: %timestamp%
+! Expires: 6 days (update frequency)
 ! Diff-Path: %diffpath%
 ! Diff-Name: easyprivacy
-! Expires: 6 days (update frequency)
 ! *** easylist:template_header.txt ***
 !
 ! Please report any unblocked adverts or problems