[or-cvs] r23899: {arm} Changing arm's versioning scheme to differentiate it from de (in arm: release/src resources resources/build/debian trunk/src)

[Damian Johnson <atagar1@xxxxxxxxx>]

Author: atagar
Date: 2010-12-07 17:42:11 +0000 (Tue, 07 Dec 2010)
New Revision: 23899

Modified:
   arm/release/src/version.py
   arm/resources/build/debian/changelog
   arm/resources/deb-prep.sh
   arm/trunk/src/version.py
Log:
Changing arm's versioning scheme to differentiate it from debian.



Modified: arm/release/src/version.py
===================================================================
--- arm/release/src/version.py	2010-12-07 03:35:21 UTC (rev 23898)
+++ arm/release/src/version.py	2010-12-07 17:42:11 UTC (rev 23899)
@@ -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"
 

Modified: arm/resources/build/debian/changelog
===================================================================
--- arm/resources/build/debian/changelog	2010-12-07 03:35:21 UTC (rev 23898)
+++ arm/resources/build/debian/changelog	2010-12-07 17:42:11 UTC (rev 23899)
@@ -1,10 +1,16 @@
-tor-arm (1.4.0-1) unstable; urgency=low
+tor-arm (1.4.0.1-1) unstable; urgency=low
 
-  * Upstream release 1.4.0.
+  * Upstream release 1.4.0.1.
   
+ -- Damian Johnson <atagar@xxxxxxxxxxxxxx>  Tue, 30 Nov 2010 23:30:43 -0700
+
+tor-arm (1.4.0.0-1) unstable; urgency=low
+
+  * Upstream release 1.4.0.0.
+  
  -- Damian Johnson <atagar@xxxxxxxxxxxxxx>  Tue, 30 Nov 2010 22:30:43 -0700
 
-tor-arm (1.3.7-1) unstable; urgency=low
+tor-arm (1.3.7.0-1) unstable; urgency=low
 
   * Initial release (upstream version 1.3.7-1, closes: #603056).
   

Modified: arm/resources/deb-prep.sh
===================================================================
--- arm/resources/deb-prep.sh	2010-12-07 03:35:21 UTC (rev 23898)
+++ arm/resources/deb-prep.sh	2010-12-07 17:42:11 UTC (rev 23899)
@@ -14,6 +14,6 @@
 # /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_1.4.0.orig.tar.gz release_deb
+tar czf tor-arm_1.4.0.2.orig.tar.gz release_deb
 svn export resources/build/debian release_deb/debian
 

Modified: arm/trunk/src/version.py
===================================================================
--- arm/trunk/src/version.py	2010-12-07 03:35:21 UTC (rev 23898)
+++ arm/trunk/src/version.py	2010-12-07 17:42:11 UTC (rev 23899)
@@ -2,6 +2,6 @@
 Provides arm's version and release date.
 """
 
-VERSION = '1.4.1_dev'
+VERSION = '1.4.1.dev'
 LAST_MODIFIED = "November 30, 2010"