Merge tag 'v2.3.5' into testing

diff --git a/argeo-freed.spec b/argeo-freed.spec
index 1357e2f65925867b4ebb4ea9a5093714f29344a6..3535875b64f6f5a18e328d768744097fbb026906 100644 (file)
--- a/argeo-freed.spec
+++ b/argeo-freed.spec
@@ -1,5 +1,5 @@
 Name:           argeo-freed
-Version:        2.3.5
+Version:        2.1.3
 Release:        1%{?dist}
 Summary:        Utilities for a FREEd compatible domain
 

diff --git a/debian/changelog b/debian/changelog
index 73ce3cd770a52b9288ed785d6f1ff828f3047216..a4e47ce2bd6c8f903a1dd68c1713a348bb8ae7ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-argeo-freed (2.3.5) unstable; urgency=medium
+argeo-freed (2.1.3) testing; urgency=medium
 
   * Adapt to changes in Argeo TP
 

diff --git a/usr/bin/argeo b/usr/bin/argeo
index 636fd47696e1f36ec0fb775aadc1da9b5ea06e52..9ba91506a2669c4e8c48592cacf874992de80466 100755 (executable)
--- a/usr/bin/argeo
+++ b/usr/bin/argeo
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Dorg.argeo.api.cli.rootCommand=$0 -jar /usr/share/a2/org.argeo.cms/org.argeo.cms.cli.2.3.jar "$@"
\ No newline at end of file
+java -Dorg.argeo.api.cli.rootCommand=$0 -jar /usr/share/a2/org.argeo.cms/org.argeo.cms.cli.2.1.jar "$@"
\ No newline at end of file

diff --git a/usr/bin/jshc b/usr/bin/jshc
index 934457862be5f5c9fd3fed436291428f028f1cf6..c1320d4e7fd0ce86693ffd6a267abe81476241ff 100755 (executable)
--- a/usr/bin/jshc
+++ b/usr/bin/jshc
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Xms32m -Xmx64m -jar /usr/share/a2/org.argeo.cms/org.argeo.cms.jshell.2.3.jar "$@"
\ No newline at end of file
+java -Xms32m -Xmx64m -jar /usr/share/a2/org.argeo.cms/org.argeo.cms.jshell.2.1.jar "$@"
\ No newline at end of file

diff --git a/usr/share/argeo/jvm.args b/usr/share/argeo/jvm.args
index 2d3190d6f74b652a301f116f19f21da2b235abce..ca3cd0b100e43d8408b2abcd4616823a18dace33 100644 (file)
--- a/usr/share/argeo/jvm.args
+++ b/usr/share/argeo/jvm.args
@@ -1 +1 @@
--cp /usr/share/a2/osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.18.jar:/usr/share/a2/org.argeo.cms/org.argeo.init.2.3.jar org.argeo.init.Service
\ No newline at end of file
+-cp /usr/share/a2/osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.18.jar:/usr/share/a2/org.argeo.cms/org.argeo.init.2.1.jar org.argeo.init.Service
\ No newline at end of file