- tor-commits - lists.torproject.org

[arm/master] Changing arm's versioning scheme to differentiate it from debian.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 8dac24227ae6a8eb61da31ea6cb64c0eb3ebc6a2 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 7 17:42:11 2010 +0000 Changing arm's versioning scheme to differentiate it from debian. svn:r23899 --- src/version.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/version.py b/src/version.py index fc30f0b..4a0b625 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.0-2' +VERSION = '1.4.0.2' LAST_MODIFIED = "November 30, 2010"

1 0

[arm/master] More fixes for issues caught by weasel
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit c43535aee0c9038fefa7867ffc511dea4e258568 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 12 00:21:28 2010 +0000 More fixes for issues caught by weasel change: noting myself in the license file fix: startup script wasn't hanlding unusual paths, such as with spaces and dashes fix: startup script was forking the final process instad of calling exec fix: initially built diff differed from rebuilt version since it was missing the pycompat svn:r23926 --- LICENSE | 2 +- arm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index 94a9ed0..1528791 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Copyright (C) 2009-2010 Damian Johnson <atagar1(a)gmail.com> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/arm b/arm index a6d336a..de0b248 100755 --- a/arm +++ b/arm @@ -1,13 +1,13 @@ #!/bin/sh -if [ $0 = /usr/bin/arm ]; then +if [ "$0" = /usr/bin/arm ]; then arm_base=/usr/share/arm/ else - arm_base=$( dirname $0 )/src/ + arm_base=$( dirname "$0" )/src/ fi -python ${arm_base}prereq.py +python "${arm_base}prereq.py" if [ $? = 0 ]; then - python -W ignore::DeprecationWarning ${arm_base}starter.py $* + exec python -W ignore::DeprecationWarning "${arm_base}starter.py" $* fi

1 0

[arm/master] Bumping version in debian changelog for hotfix release.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 76dcdd263dc172c97e46516cecabca321257b5ce Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 8 17:00:14 2010 +0000 Bumping version in debian changelog for hotfix release. svn:r23466 --- debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9dd15fa..c3664d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +tor-arm (1.3.7-1) unstable; urgency=low + + * hotfix for crashing issue with the graph panel (caught by tomb) + + -- Damian Johnson (www.atagar.com) <atagar1(a)gmail.com> Wed, 7 Oct 2010 09:50:43 -0700 + tor-arm (1.3.7) unstable; urgency=low * see http://www.atagar.com/arm/log.php

1 0

[arm/master] Bumping the version for the hotfix.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit cfa0fd24792e7d5c95303d5de10727f04fec99d0 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 8 16:42:15 2010 +0000 Bumping the version for the hotfix. svn:r23465 --- src/version.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.py b/src/version.py index dc41d36..08989e3 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.3.7' -LAST_MODIFIED = "October 6, 2010" +VERSION = '1.3.7-1' +LAST_MODIFIED = "October 7, 2010"

1 0

[arm/master] Reverting change to the license (looks like that isn't allowed) and removing copyright section from the man page.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit a40075d0258738b4620f95c541ca8fd20a2d2bfc Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 12 01:02:54 2010 +0000 Reverting change to the license (looks like that isn't allowed) and removing copyright section from the man page. svn:r23927 --- LICENSE | 2 +- arm.1 | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 1528791..94a9ed0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2009-2010 Damian Johnson <atagar1(a)gmail.com> + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/arm.1 b/arm.1 index 32ab749..58cc3ce 100644 --- a/arm.1 +++ b/arm.1 @@ -68,6 +68,3 @@ Sample armrc configuration file that documents all options .SH AUTHOR Written by Damian Johnson (atagar1(a)gmail.com) -.SH COPYRIGHT -GNU GPL version 3, \fIhttp://gnu.org/licenses/gpl.html\fR -

1 0

[arm/packaging] Bumping deb changelog to 1.4.2.4.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 8291777b45b337037be469a988a83051840e6b41 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 17:48:56 2011 -0700 Bumping deb changelog to 1.4.2.4. --- build/debian/changelog | 6 ++++++ deb-prep.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index 138b201..6af48b4 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,3 +1,9 @@ +tor-arm (1.4.2.4-1) unstable; urgency=low + + * Upstream release 1.4.2.4. + + -- Damian Johnson <atagar(a)torproject.org> Sat, 21 Apr 2011 1:30:43 -0700 + tor-arm (1.4.2.0-1) unstable; urgency=low * Upstream release 1.4.2.0. diff --git a/deb-prep.sh b/deb-prep.sh index 9bf7e2b..6962143 100755 --- a/deb-prep.sh +++ b/deb-prep.sh @@ -11,10 +11,10 @@ # dpkg-source -x tor-arm_1.4.0.1-1.dsc # debuild -rfakeroot -uc -us -j3 -# alternate (works, but svn export is simpler): +# alternate (works, but not sure if it'll miss resources like gitignore): # tar czf tor-arm_1.3.7.orig.tar.gz --exclude-vcs --exclude="*.pyc" -v release -export DEB_VERSION="1.2.3.4" +export DEB_VERSION="1.4.2.4" mkdir release_deb git archive --format=tar release | (cd ./release_deb && tar xf -)

1 0

[arm/packaging] VCS fields are expected to be in the upper section
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 129a413b23edeca1274351d858bc2661a9dd6c08 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 09:32:19 2011 -0700 VCS fields are expected to be in the upper section When in the build contents of deb/control this casued repeated warnings (not lintian errors): dpkg-source: warning: unknown information field 'Vcs-Git' in input data in package's section of control info file dpkg-source: warning: unknown information field 'Vcs-Browser' in input data in package's section of control info file --- build/debian/control | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/debian/control b/build/debian/control index b11c10f..793d6fc 100644 --- a/build/debian/control +++ b/build/debian/control @@ -5,6 +5,8 @@ Maintainer: Damian Johnson <atagar(a)torproject.org> Build-Depends: debhelper (>= 5), python-support (>= 0.6), cdbs (>= 0.4.49), python Standards-Version: 3.9.1 XS-Python-Version: >= 2.5 +Vcs-Git: git://git.torproject.org/arm.git +Vcs-Browser: https://gitweb.torproject.org/arm.git Homepage: http://www.atagar.com/arm/ Package: tor-arm @@ -12,8 +14,6 @@ Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-torctl Suggests: tor XB-Python-Version: ${python:Versions} -Vcs-Git: git://git.torproject.org/arm.git -Vcs-Browser: https://gitweb.torproject.org/arm.git Description: terminal status monitor for tor The anonymizing relay monitor (arm) is a terminal status monitor for Tor relays, intended for command-line aficionados, ssh connections, and anyone

1 0

[arm/packaging] Deb build process expects a local branches
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit e8cf0f4e96443dccfc9f0afa1674345631933e43 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 09:24:10 2011 -0700 Deb build process expects a local branches The deb-prep.sh script is written to use a local release and packaging branch, so if they don't exist it errors. --- build/debian/README.source | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/build/debian/README.source b/build/debian/README.source index 372638d..8f3bbdd 100644 --- a/build/debian/README.source +++ b/build/debian/README.source @@ -2,7 +2,8 @@ To rebuild this deb run the following... git clone git://git.torproject.org/arm.git cd arm -git checkout remotes/origin/packaging +git checkout -b release remotes/origin/release +git checkout -b packaging remotes/origin/packaging ./deb-prep-sh cd release_deb ./debian/make-deb

1 0

[arm/packaging] Making deb-prep take the arm version as an arg
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 292058c721a7370da6fb54094bf784b37d5d5599 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 09:05:03 2011 -0700 Making deb-prep take the arm version as an arg --- build/debian/README.source | 2 +- deb-prep.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build/debian/README.source b/build/debian/README.source index 8f3bbdd..078cc52 100644 --- a/build/debian/README.source +++ b/build/debian/README.source @@ -4,7 +4,7 @@ git clone git://git.torproject.org/arm.git cd arm git checkout -b release remotes/origin/release git checkout -b packaging remotes/origin/packaging -./deb-prep-sh +./deb-prep-sh <arm version> cd release_deb ./debian/make-deb diff --git a/deb-prep.sh b/deb-prep.sh index 6962143..f054064 100755 --- a/deb-prep.sh +++ b/deb-prep.sh @@ -14,7 +14,12 @@ # alternate (works, but not sure if it'll miss resources like gitignore): # tar czf tor-arm_1.3.7.orig.tar.gz --exclude-vcs --exclude="*.pyc" -v release -export DEB_VERSION="1.4.2.4" +if [ $# -lt 1 ] + then + echo "Usage: ./deb-prep.sh <arm version>" + exit 1 + else debVersion=$1 +fi mkdir release_deb git archive --format=tar release | (cd ./release_deb && tar xf -) @@ -24,7 +29,7 @@ git archive --format=tar release | (cd ./release_deb && tar xf -) # /usr/share/doc/arm/armrc.sample -> /usr/share/doc/tor-arm/armrc.sample.gz sed -i 's/\/usr\/share\/doc\/arm\/armrc.sample/\/usr\/share\/doc\/tor-arm\/armrc.sample.gz/g' release_deb/arm.1 -tar czf tor-arm_${DEB_VERSION}.orig.tar.gz release_deb +tar czf tor-arm_${debVersion}.orig.tar.gz release_deb (cd build && git archive --format=tar packaging debian) | (cd ./release_deb && tar xf -)

1 0

[arm/packaging] Bumping the Debian Standards-Version
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit b78238a33c5763382d6c85ddca74197851bf5a7d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 09:33:17 2011 -0700 Bumping the Debian Standards-Version suggested by dererk --- build/debian/changelog | 8 +++++++- build/debian/control | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index bebe47e..5fdd2a4 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -2,7 +2,13 @@ tor-arm (1.4.2.4-1) unstable; urgency=low * Upstream release 1.4.2.4. - -- Damian Johnson <atagar(a)torproject.org> Sat, 21 Apr 2011 1:30:43 -0700 + -- Damian Johnson <atagar(a)torproject.org> Sat, 22 Apr 2011 1:30:43 -0700 + +tor-arm (1.4.2.4-1) unstable; urgency=low + + * Updated Standard-version to 3.9.2.0 (no changes needed). + + -- Damian Johnson <atagar(a)torproject.org> Sat, 22 Apr 2011 1:25:43 -0700 tor-arm (1.4.1.2-2) unstable; urgency=low diff --git a/build/debian/control b/build/debian/control index 21a5308..e9cb710 100644 --- a/build/debian/control +++ b/build/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Damian Johnson <atagar(a)torproject.org> Uploaders: Ulises Vitulli <dererk(a)debian.org> Build-Depends: debhelper (>= 5), python-support (>= 0.6), cdbs (>= 0.4.49), python -Standards-Version: 3.9.1 +Standards-Version: 3.9.2.0 XS-Python-Version: >= 2.5 Vcs-Git: git://git.torproject.org/arm.git Vcs-Browser: https://gitweb.torproject.org/arm.git

1 0