commit 17613113cafb9937f6827a180107cd865f26cc64 Author: Sukhbir Singh <sukhbir@torproject.org> Date: Fri Aug 19 20:21:41 2016 -0400 Reflect proper Tor Messenger version during build --- projects/instantbird/build | 2 ++ projects/instantbird/config | 1 - projects/instantbird/version.patch | 7 ------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/projects/instantbird/build b/projects/instantbird/build index 8eb81e4..a397816 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -81,6 +81,8 @@ rm im/content/aboutDialog* cp $rootdir/aboutDialog* im/content/ cp $rootdir/aboutDialog.dtd im/locales/en-US/chrome/instantbird/aboutDialog.dtd +echo '[% c("var/tormessenger_version") %]' > im/config/version.txt + cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 then diff --git a/projects/instantbird/config b/projects/instantbird/config index 65d3316..7e3bf13 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -73,7 +73,6 @@ input_files: - filename: trac-17896.patch - filename: trac-17494.patch - filename: trac-13312.patch - - filename: version.patch - filename: search-context-menu.patch - filename: search-preferences-xul.patch - filename: log-preferences-xul.patch diff --git a/projects/instantbird/version.patch b/projects/instantbird/version.patch deleted file mode 100644 index a47cde1..0000000 --- a/projects/instantbird/version.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/im/config/version.txt b/im/config/version.txt -index 57b62cb..c239c60 100644 ---- a/im/config/version.txt -+++ b/im/config/version.txt -@@ -1 +1 @@ --1.6a1pre -+1.5