Ready for release

PolaricServer · Nov 6, 2019 · ed3a01e · ed3a01e
1 parent 3abcc97
commit ed3a01e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,9 @@
-polaric-aprsd (2.1.2+) UNRELEASED; urgency=medium
+polaric-aprsd (2.2) stable; urgency=medium
 
-  * 
+  * Move to Java 11 
+  * etc.. (see Changelog file)
 
- -- Øyvind Hanssen <ohanssen@acm.org>  Thu, 10 Oct 2019 22:20:08 +0200
+ -- Øyvind Hanssen <ohanssen@acm.org>  Wed, 06 Nov 2019 20:51:26 +0100
 
 polaric-aprsd (2.1.2) stable; urgency=medium
 

diff --git a/debian/control b/debian/control
@@ -2,13 +2,13 @@ Source: polaric-aprsd
 Section: hamradio
 Priority: optional
 Maintainer: Øyvind Hanssen <ohanssen@acm.org>
-Build-Depends: debhelper (>= 10), gettext-base, libgettext-commons-java, libcommons-codec-java, libjackson2-core-java, libjackson2-databind-java, openjdk-11-jdk|openjdk-12-jdk, scala (>> 2.11.12)
+Build-Depends: debhelper (>= 10), gettext-base, libgettext-commons-java, libcommons-codec-java, libjackson2-core-java, libjackson2-databind-java, openjdk-11-jdk|openjdk-12-jdk|openjdk-13-jdk, scala (>> 2.11.12)
 Standards-Version: 3.9.8
 Homepage: http://aprs.no/polaricserver
 
 Package: polaric-aprsd
 Architecture: all
-Depends: openjdk-11-jre-headless|openjdk-12-jre-headless, libslf4j-java, librxtx-java, scala-library (>> 2.11.12), scala-xml, scala-parser-combinators, gettext-base, libgettext-commons-java, libcommons-codec-java, libjackson2-core-java, libjackson2-databind-java, adduser, apache2-utils, sudo, lsb-base, ${misc:Depends}
+Depends: openjdk-11-jre-headless|openjdk-12-jre-headless|openjdk-13-headless, libslf4j-java, librxtx-java, scala-library (>> 2.11.12), scala-xml, scala-parser-combinators, gettext-base, libgettext-commons-java, libcommons-codec-java, libjackson2-core-java, libjackson2-databind-java, adduser, apache2-utils, sudo, lsb-base, ${misc:Depends}
 Conflicts: polaric-database-plugin (<= 2.1), polaric-ais-plugin (<= 2.1.0) 
 Recommends:
 Description: Polaric Server: APRS daemon part. 

diff --git a/debian/polaric-passwd.1 b/debian/polaric-passwd.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH POLARIC-PASSWD 1 "November 07, 2017"
+.TH POLARIC-PASSWD 1 "November 06, 2019"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -26,7 +26,7 @@ polaric-passwd \- Set or change password of a user
 polaric-passwd is an utility for changing passwords used to log in to 
 Polaric Server. It is a simple wrapper for 'htpasswd' provided by the Apache
 web server software. Please note that you have to manually add user to 
-permissions list in /etc/polaric-aprsd/server.ini to grant access to 
-the user. I hope to automate this in later versions.
+permissions list in /etc/polaric-aprsd/server.ini to grant SAR or admin 
+access to the user. I hope to automate this in later versions.
 .PP
 This program and manual page was written by LA7ECA, Øyvind hanssen <ohanssen@acm.org>.
diff --git a/debian/polaric-restart.1 b/debian/polaric-restart.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH POLARIC-APRSD 1 "September 2, 2014"
+.TH POLARIC-APRSD 1 "November 6, 2019"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:

diff --git a/debian/postinst b/debian/postinst
@@ -13,10 +13,10 @@ case "$1" in
                    polaric
                usermod -G dialout polaric
            fi
-           chown -R polaric:adm /var/log/polaric /var/lib/polaric
            chmod 755 /var/log/polaric
            if [ -d "/var/lib/polaric/mapcache" ]; then
-              chown -R www-data:www-data /var/lib/polaric/mapcache
+                chown www-data:www-data /var/lib/polaric/mapcache
+                chown www-data:www-data /var/lib/polaric/mapcache/*.db
            fi
         fi  
         if [ -e "/etc/polaric-webapp/users" ] ; then

diff --git a/src/aprsd/Main.java b/src/aprsd/Main.java
@@ -29,8 +29,8 @@
 
 public class Main implements ServerAPI
 {
-   public  static String version = "2.1.2+";
-   public static String toaddr  = "APPS21";
+   public  static String version = "2.2";
+   public static String toaddr  = "APPS22";
 
    private static StationDB db = null;
    private static AprsParser parser = null;