Unverified Commit 980115da authored by Georg Koppen's avatar Georg Koppen
Browse files

Pick up Firefox changes 

Use tor-browser -2 and build number bump
parent 8643124e

projects/firefox-langpacks/config

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil 


var:

  ff_version: '[% pc("firefox", "var/firefox_version") %]'

  ff_build: build1

  ff_build: build2

  ff_arch: linux-i686

  input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'

projects/firefox/config

+2 −2
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: '[% c("abbrev") %]'

filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'

git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2'

git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1'

tag_gpg_id: 1

git_url: https://git.torproject.org/tor-browser.git

gpg_keyring: torbutton.gpg
@@ -28,7 +28,7 @@ targets: 
      torbrowser_update_channel: release



  nightly:

    git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1'

    git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2'

    tag_gpg_id: 0

    var:

      torbrowser_update_channel: default

rbm.conf

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ buildconf: 


var:

  torbrowser_version: '8.0a1'

  torbrowser_build: 'build2'

  torbrowser_build: 'build3'

  torbrowser_incremental_from:

    - 7.5a10

  project_name: tor-browser