richard pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
- 
c5bfcc1a
by Richard Pospesel at 2023-06-23T17:05:58+00:00
6 changed files:
- + ChangeLog-MB.txt
- ChangeLog.txt → ChangeLog-TBB.txt
- + projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
- projects/browser/Bundle-Data/Docs-PB/Licenses/uBlockOrigin.txt → projects/browser/Bundle-Data/Docs-MB/Licenses/uBlockOrigin.txt
- projects/browser/build
- tools/changelog-format-blog-post
Changes:
| 1 | +projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt | |
| \ No newline at end of file | 
| ... | ... | @@ -241,7 +241,7 @@ do | 
| 241 | 241 |        [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] \
 | 
| 242 | 242 |        -c . | tar -C "$tbdir[% IF ! c("var/macos") %]/[% c('var/ProjectName') %][% END %]" -x
 | 
| 243 | 243 |    [% ELSIF c("var/mullvad-browser") -%]
 | 
| 244 | -    cp -a Bundle-Data/Docs-PB/* "$tbdir/$DOCSPATH"
 | |
| 244 | +    cp -a Bundle-Data/Docs-MB/* "$tbdir/$DOCSPATH"
 | |
| 245 | 245 |    [% END -%]
 | 
| 246 | 246 |  done
 | 
| 247 | 247 | 
| ... | ... | @@ -12,7 +12,7 @@ sub version_type { | 
| 12 | 12 | |
| 13 | 13 |  my ($changelog, $current_tbversion, $last_tbversion);
 | 
| 14 | 14 | |
| 15 | -if (!open(CHANGELOG, '<', "$FindBin::Bin/../ChangeLog.txt")) {
 | |
| 15 | +if (!open(CHANGELOG, '<', "$FindBin::Bin/../ChangeLog-TBB.txt")) {
 | |
| 16 | 16 |    print STDERR "Error opening changelog file\n";
 | 
| 17 | 17 |    exit 1;
 | 
| 18 | 18 |  }
 | 
| ... | ... | @@ -49,6 +49,6 @@ if (! ( $current_tbversion =~ m/a/ ) ) { | 
| 49 | 49 |    my @v = split(/\./, $current_tbversion);
 | 
| 50 | 50 |    $changelog_branch = "maint-$v[0].$v[1]";
 | 
| 51 | 51 |  }
 | 
| 52 | -print "The full changelog since [Tor Browser $last_tbversion](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$changelog_branch/projects/browser/Bundle-Data/Docs/ChangeLog.txt) is:\n\n";
 | |
| 52 | +print "The full changelog since [Tor Browser $last_tbversion](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$changelog_branch/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt) is:\n\n";
 | |
| 53 | 53 | |
| 54 | 54 |  print $changelog; |