From b90f6525b13657b6ed845c56d1b8f6a101ce8e33 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Sat, 7 Sep 2013 21:20:02 +0200 Subject: fix repo name in yet another place --- docs/dev/environment.rst | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/dev/environment.rst b/docs/dev/environment.rst index 7ce536f9..5ae3871a 100644 --- a/docs/dev/environment.rst +++ b/docs/dev/environment.rst @@ -13,9 +13,11 @@ Cloning the repo :: - git clone git://leap.se/bitmask + git clone git://leap.se/leap_client git checkout develop +.. XXX change this when repo changes. + Base Dependencies ------------------ Bitmask depends on these libraries: @@ -121,6 +123,10 @@ If you *only* are running bitmask from inside a virtualenv, you will need to cop Missing Authentication agent ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -If you are running a desktop other than gnome or unity, you might get an error saying that you are not running the authentication agent. You can launch it like this:: +If you are using linux and running a desktop other than unity or gnome, you might get an error saying that you are not running the authentication agent. For systems with gnome libraries installed you can launch it like this:: /usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 & + +or if you are a kde user:: + + /usr/lib/kde4/libexec/polkit-kde-authentication-agent-1 & -- cgit v1.2.3 From 3d7ceef972571dc898448e572dd70bf77cd91b8e Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Mon, 9 Sep 2013 11:23:02 -0300 Subject: Update release doc, remove exec bits. Closes #3617 --- docs/release_checklist.wiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki index e6467048..273804c7 100644 --- a/docs/release_checklist.wiki +++ b/docs/release_checklist.wiki @@ -27,7 +27,7 @@ * [ ] git checkout develop && git pull origin develop && git merge release-X.Y.Z && git push origin develop * [ ] Build and upload bundles * [ ] Use the scripts under pkg// to build the the bundles. - * [ ] Sign them with gpg -a + * [ ] Sign them with gpg -a --sign --detach-sign * [ ] Upload bundle and signature to web-uploads@salmon.leap.se:~/public/client//Bitmask--.(tar.bz2,dmg,zip) * [ ] Update symbolic link for latest upload and signature: * [ ] ~/public/client/Bitmask--latest -- cgit v1.2.3 From 5dcb215617ac174aed4e346d21a9efc648f6ee45 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Thu, 12 Sep 2013 11:35:30 -0300 Subject: Change the order of the actions in the release. With this change we are following more accurately: http://nvie.com/posts/a-successful-git-branching-model/ Also, we achieve a clean version in master. If we do the tag before the merge in master, then we would have an extra commit after the tagging, which causes version to be X.Y.Z-1-blah. --- docs/release_checklist.wiki | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki index 273804c7..aa83b566 100644 --- a/docs/release_checklist.wiki +++ b/docs/release_checklist.wiki @@ -21,10 +21,10 @@ * [ ] Review pkg/requirements.pip for everything and update if needed (that's why the order). - See whatever has been introduced in changes/VERSION_COMPAT - Reset changes/VERSION_COMPAT + * [ ] git checkout master && git pull origin master && git merge --no-ff release-X.Y.Z && git push origin master + * [ ] git checkout develop && git pull origin develop && git merge --no-ff release-X.Y.Z && git push origin develop * [ ] git tag -s X.Y.Z (note the -s so that it's a signed tag) The message should be something like: Tag version X.Y.Z * [ ] git push origin X.Y.Z - * [ ] git checkout master && git pull origin master && git merge release-X.Y.Z && git push origin master - * [ ] git checkout develop && git pull origin develop && git merge release-X.Y.Z && git push origin develop * [ ] Build and upload bundles * [ ] Use the scripts under pkg// to build the the bundles. * [ ] Sign them with gpg -a --sign --detach-sign @@ -38,3 +38,5 @@ Notes ----- (*) this checklist kindly borrowed from tahoe-lafs documentation =) + +For a good reference look at http://nvie.com/posts/a-successful-git-branching-model/ -- cgit v1.2.3 From 061c2aae0821f1e37b1de5b0347077ecfb276b65 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 12 Sep 2013 15:07:24 +0200 Subject: add --version flag --- docs/man/bitmask.1.rst | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs') diff --git a/docs/man/bitmask.1.rst b/docs/man/bitmask.1.rst index 7a1d2ae1..ed4f7133 100644 --- a/docs/man/bitmask.1.rst +++ b/docs/man/bitmask.1.rst @@ -38,6 +38,8 @@ general options **-s, --standalone** Makes Bitmask use standalone directories for configuration and binary searching. +**-V, --version** Displays Bitmask version and exits. + openvpn options --------------- -- cgit v1.2.3 From 63d5a8f004cd34f5e8a9e0168a28610fc1f2ebd2 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 12 Sep 2013 17:03:56 +0200 Subject: add checkboxes --- docs/release_checklist.wiki | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki index aa83b566..e6513f90 100644 --- a/docs/release_checklist.wiki +++ b/docs/release_checklist.wiki @@ -2,12 +2,12 @@ * [ ] Check that all tests are passing! * [ ] Tag everything * Should be done for the following packages, in order: - 1. leap.common - 2. leap.keymanager - 3. leap.soledad - 4. leap.mail - 5. leap.bitmask - 6. leap.mx + * [ ] 1. leap.common + * [ ] 2. leap.keymanager + * [ ] 3. leap.soledad + * [ ] 4. leap.mail + * [ ] 5. leap.bitmask + * [ ] 6. leap.mx * NOTE: It's assumed that origin is the leap.se repo * [ ] git fetch origin * [ ] git tag -l, and see the latest tagged version (unless it's not a minor version bump, in which case, just bump to it) -- cgit v1.2.3 From fd697344cb39bd7b5a53e8e8b83ab7c78e1ef5ed Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Thu, 12 Sep 2013 17:01:58 -0300 Subject: Update instructions to improve release process. This allows us to have master and develop in sync after the release. Also get a correct and clean version report. I've included the `-m` switch in the `git tag` command so we avoid to open an editor and let us closer to make a script to automate this. --- docs/release_checklist.wiki | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki index e6513f90..b12a42a4 100644 --- a/docs/release_checklist.wiki +++ b/docs/release_checklist.wiki @@ -22,9 +22,9 @@ - See whatever has been introduced in changes/VERSION_COMPAT - Reset changes/VERSION_COMPAT * [ ] git checkout master && git pull origin master && git merge --no-ff release-X.Y.Z && git push origin master - * [ ] git checkout develop && git pull origin develop && git merge --no-ff release-X.Y.Z && git push origin develop - * [ ] git tag -s X.Y.Z (note the -s so that it's a signed tag) The message should be something like: Tag version X.Y.Z + * [ ] git tag -s X.Y.Z -m "Tag version X.Y.Z" # (note the -s so that it's a signed tag and -m to specify the message for the tag) * [ ] git push origin X.Y.Z + * [ ] git checkout develop && git merge master && git push origin develop * [ ] Build and upload bundles * [ ] Use the scripts under pkg// to build the the bundles. * [ ] Sign them with gpg -a --sign --detach-sign -- cgit v1.2.3 From 25cecaf03dd02ca2dd9fa78b7495c8557f20ec85 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 12 Sep 2013 23:12:52 +0200 Subject: update to new git repo name --- docs/dev/environment.rst | 2 +- docs/testers/howto.rst | 4 ++-- docs/user/install.rst | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'docs') diff --git a/docs/dev/environment.rst b/docs/dev/environment.rst index 5ae3871a..e942b1cb 100644 --- a/docs/dev/environment.rst +++ b/docs/dev/environment.rst @@ -13,7 +13,7 @@ Cloning the repo :: - git clone git://leap.se/leap_client + git clone git://leap.se/bitmask_client git checkout develop .. XXX change this when repo changes. diff --git a/docs/testers/howto.rst b/docs/testers/howto.rst index 9c6561ed..015a4ab2 100644 --- a/docs/testers/howto.rst +++ b/docs/testers/howto.rst @@ -41,12 +41,12 @@ Download and source the following script in the parent folder where you want you .. code-block:: bash cd /tmp - wget https://raw.github.com/leapcode/leap_client/develop/pkg/scripts/bitmask_bootstrap.sh + wget https://raw.github.com/leapcode/bitmask_client/develop/pkg/scripts/bitmask_bootstrap.sh source bitmask_bootstrap.sh Tada! If everything went well, you should be able to run bitmask by typing:: - bin/bitmask + bitmask Noticed that your prompt changed? That was *virtualenv*. Keep reading... diff --git a/docs/user/install.rst b/docs/user/install.rst index 81807a43..e5765302 100644 --- a/docs/user/install.rst +++ b/docs/user/install.rst @@ -88,15 +88,13 @@ Installing Bitmask is as simple as using `pip `_ Show me the code! ----------------- -.. XXX UPDATE REPO NAMES AS SOON AS #3417 is DONE - You can get the code from LEAP public git repository :: - $ git clone git://leap.se/leap_client + $ git clone git://leap.se/bitmask_client Or from the github mirror :: - $ git clone git://github.com/leapcode/leap_client.git + $ git clone git://github.com/leapcode/bitmask_client.git Once you have grabbed a copy of the sources, you can install it into your site-packages easily :: -- cgit v1.2.3 From ee2c55062a2cb5112adc9f63e042ad8748b511cb Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 13 Sep 2013 11:07:41 +0200 Subject: update metadata in setup.py --- docs/release_checklist.wiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki index b12a42a4..19a19289 100644 --- a/docs/release_checklist.wiki +++ b/docs/release_checklist.wiki @@ -17,10 +17,10 @@ - Helper bash line: for i in $(ls changes); do cat changes/$i; echo; done * [ ] Update relnotes.txt if needed. * [ ] git rm changes/* - * [ ] git commit -av * [ ] Review pkg/requirements.pip for everything and update if needed (that's why the order). - See whatever has been introduced in changes/VERSION_COMPAT - Reset changes/VERSION_COMPAT + * [ ] git commit -av # we should add a commit message here... * [ ] git checkout master && git pull origin master && git merge --no-ff release-X.Y.Z && git push origin master * [ ] git tag -s X.Y.Z -m "Tag version X.Y.Z" # (note the -s so that it's a signed tag and -m to specify the message for the tag) * [ ] git push origin X.Y.Z -- cgit v1.2.3 From e196338abec4597862142c5e6ac4e57d1c0b27ce Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 18 Sep 2013 12:26:47 -0400 Subject: update obsolete qt4 dep --- docs/testers/howto.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/testers/howto.rst b/docs/testers/howto.rst index 015a4ab2..61d38787 100644 --- a/docs/testers/howto.rst +++ b/docs/testers/howto.rst @@ -25,8 +25,9 @@ Install dependencies ^^^^^^^^^^^^^^^^^^^^ First, install all the base dependencies plus git, virtualenv and development files needed to compile several extensions:: - apt-get install openvpn git-core python-dev python-qt4 python-setuptools python-virtualenv + apt-get install openvpn git-core python-dev python-pyside python-setuptools python-virtualenv +.. TODO Should review these dependencies. ^^ Bootstrap script ^^^^^^^^^^^^^^^^ -- cgit v1.2.3