From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 19 Dec 2023 06:10:34 +0000 (+0100)
Subject: Merge tag 'v2.3.5' into testing
X-Git-Tag: v2.1.3^0
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=95890ae1fad3f09737f3777bc2889bdd689402eb;hp=a66b228cbbf545ecf24a218fce4ca51b04c0a9bd;p=gpl%2Fargeo-freed.git

Merge tag 'v2.3.5' into testing
---

diff --git a/argeo-freed.spec b/argeo-freed.spec
index 1357e2f..3535875 100644
--- 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 73ce3cd..a4e47ce 100644
--- 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 636fd47..9ba9150 100755
--- 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 9344578..c1320d4 100755
--- 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 2d3190d..ca3cd0b 100644
--- 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