diff -Nru starjava-datanode-1.0+2017.07.31/build.xml starjava-datanode-1.0+2019.07.12/build.xml
--- starjava-datanode-1.0+2017.07.31/build.xml	2017-07-31 09:00:31.000000000 +0000
+++ starjava-datanode-1.0+2019.07.12/build.xml	2019-07-12 13:01:01.000000000 +0000
@@ -88,7 +88,7 @@
   <property name="debug" value="true"/>
   <property name="deprecation" value="false"/>
   <property name="optimize" value="true"/>
-  <property name="source.version" value="1.4"/>
+  <property name="source.version" value="1.6"/>
 
   <!-- Extra task options, if any -->
   <property name="chmod.fail" value="false"/>
@@ -367,16 +367,6 @@
   <property name="tests-libpath" refid="tests-libpath.id"/>
 
   <!--
-   !    ===============
-   !    Extension tasks
-   !    ===============
-   !    Add any local or extension ANT tasks that are required. Local
-   !    tasks should be moved into the ANT package if used outside of this
-   !    package. 
-   !-->
-  <taskdef resource="axis-tasks.properties" classpathref="classpath"/>
-
-  <!--
    !    =========================================
    !    Check availability of direct dependencies
    !    =========================================
@@ -559,13 +549,16 @@
     </jar>
 
     <!-- Sign all jar files -->
+    <antcall target="signjars"/>
+  </target>
+     
+  <target name="signjars" if="sign.jars">
     <signjar alias="${webstart.alias}"
              keystore="${webstart.keystore}"
              keypass="${webstart.keypass}"
              storepass="${webstart.storepass}">
        <fileset dir="${dist.lib}" includes="**/*.jar **/*.zip"/>
     </signjar>
-
   </target>
 
   <!--
@@ -596,7 +589,7 @@
        </security>
 
        <resources>
-         <j2se version="1.5+"/>
+         <j2se version="1.6+"/>
 
          <!-- Define the main library jar file -->
          <jar href="${name}/${name}.jar"/>
@@ -1013,6 +1006,7 @@
              defaultexcludes="yes"
              source="${source.version}"
              classpathref="classpath">
+      <arg value="-Xdoclint:all,-missing"/>
 
       <!-- Get a list of directories that name all the potential
        !   java packages -->
diff -Nru starjava-datanode-1.0+2017.07.31/debian/changelog starjava-datanode-1.0+2019.07.12/debian/changelog
--- starjava-datanode-1.0+2017.07.31/debian/changelog	2017-10-05 19:09:18.000000000 +0000
+++ starjava-datanode-1.0+2019.07.12/debian/changelog	2019-08-02 09:06:03.000000000 +0000
@@ -1,3 +1,13 @@
+starjava-datanode (1.0+2019.07.12-1) unstable; urgency=low
+
+  * Update VCS fields to use salsa.d.o
+  * New upstream version 1.0+2019.07.12. Rediff patches
+  * Push Standards-Version to 4.4.0. No changes required
+  * Push compat to 12. Remove d/compat
+  * Add gitlab-ci for salsa
+
+ -- Ole Streicher <olebole@debian.org>  Fri, 02 Aug 2019 11:06:03 +0200
+
 starjava-datanode (1.0+2017.07.31-2) unstable; urgency=low
 
   * Add min version for starlink-fits-java
diff -Nru starjava-datanode-1.0+2017.07.31/debian/compat starjava-datanode-1.0+2019.07.12/debian/compat
--- starjava-datanode-1.0+2017.07.31/debian/compat	2017-03-25 13:58:00.000000000 +0000
+++ starjava-datanode-1.0+2019.07.12/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-9
\ No newline at end of file
diff -Nru starjava-datanode-1.0+2017.07.31/debian/control starjava-datanode-1.0+2019.07.12/debian/control
--- starjava-datanode-1.0+2017.07.31/debian/control	2017-10-05 19:08:48.000000000 +0000
+++ starjava-datanode-1.0+2019.07.12/debian/control	2019-08-02 09:01:27.000000000 +0000
@@ -3,7 +3,7 @@
 Uploaders: Ole Streicher <olebole@debian.org>
 Section: java
 Priority: optional
-Build-Depends: ant, debhelper (>= 9), dh-exec, javahelper
+Build-Depends: ant, debhelper-compat (= 12), dh-exec, javahelper
 Build-Depends-Indep: default-jdk,
                      default-jdk-doc,
                      libcommons-compress-java,
@@ -15,9 +15,9 @@
                      starlink-table-java,
                      starlink-util-java,
                      starlink-votable-java
-Standards-Version: 4.1.1
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-astro/packages/starjava-datanode.git
-Vcs-Git: https://anonscm.debian.org/cgit/debian-astro/packages/starjava-datanode.git
+Standards-Version: 4.4.0
+Vcs-Browser: https://salsa.debian.org/debian-astro-team/starjava-datanode
+Vcs-Git: https://salsa.debian.org/debian-astro-team/starjava-datanode.git
 Homepage: https://github.com/Starlink/starjava/tree/master/datanode
 
 Package: starlink-datanode-java
diff -Nru starjava-datanode-1.0+2017.07.31/debian/gitlab-ci.yml starjava-datanode-1.0+2019.07.12/debian/gitlab-ci.yml
--- starjava-datanode-1.0+2017.07.31/debian/gitlab-ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ starjava-datanode-1.0+2019.07.12/debian/gitlab-ci.yml	2019-08-02 09:01:55.000000000 +0000
@@ -0,0 +1,8 @@
+
+include: 
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+ RELEASE: 'unstable'
+ 
\ No newline at end of file
diff -Nru starjava-datanode-1.0+2017.07.31/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch starjava-datanode-1.0+2019.07.12/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch
--- starjava-datanode-1.0+2017.07.31/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch	2017-08-17 10:02:27.000000000 +0000
+++ starjava-datanode-1.0+2019.07.12/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch	2019-08-02 09:00:46.000000000 +0000
@@ -21,11 +21,11 @@
 
  * Don't sign the jarfile
 ---
- build.xml | 91 ++++++++++++++++++++++++---------------------------------------
- 1 file changed, 35 insertions(+), 56 deletions(-)
+ build.xml | 93 ++++++++++++++++++++++++---------------------------------------
+ 1 file changed, 35 insertions(+), 58 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index c62e3e1..142d086 100644
+index e59c4a5..43a88f6 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -32,12 +32,6 @@
@@ -145,15 +145,7 @@
  
    <!-- Find all local third party jars files.
     !
-@@ -354,7 +336,6 @@
-    !    tasks should be moved into the ANT package if used outside of this
-    !    package. 
-    !-->
--  <taskdef resource="axis-tasks.properties" classpathref="classpath"/>
- 
-   <!--
-    !    =========================================
-@@ -463,7 +444,8 @@
+@@ -453,7 +435,8 @@
             destdir="${build.classes}"
             debug="${debug}"
             deprecation="${deprecation}"
@@ -163,7 +155,7 @@
             optimize="${optimize}">
  
        <classpath refid="classpath"/>
-@@ -518,6 +500,10 @@
+@@ -508,6 +491,10 @@
            description="-> creates the package jar file(s)">
  
      <mkdir dir="${dist.lib.pkg}"/>
@@ -174,31 +166,34 @@
      <jar destfile="${dist.lib.pkg}/${name}.jar"
           basedir="${build.classes}">
        <manifest>
-@@ -526,14 +512,6 @@
+@@ -516,17 +503,6 @@
        </manifest>
      </jar>
  
 -    <!-- Sign all jar files -->
+-    <antcall target="signjars"/>
+-  </target>
+-     
+-  <target name="signjars" if="sign.jars">
 -    <signjar alias="${webstart.alias}"
 -             keystore="${webstart.keystore}"
 -             keypass="${webstart.keypass}"
 -             storepass="${webstart.storepass}">
 -       <fileset dir="${dist.lib}" includes="**/*.jar **/*.zip"/>
 -    </signjar>
--
    </target>
  
    <!--
-@@ -975,7 +953,7 @@
+@@ -968,7 +944,7 @@
               windowtitle="${Name} API"
               doctitle="${Name}"
               defaultexcludes="yes"
 -             source="${source.version}"
 +             encoding="cp1252"
               classpathref="classpath">
+       <arg value="-Xdoclint:all,-missing"/>
  
-       <!-- Get a list of directories that name all the potential
-@@ -1069,7 +1047,8 @@
+@@ -1063,7 +1039,8 @@
      <javac srcdir="${tests.dir}"
             destdir="${build.tests}"
             debug="${debug}"
diff -Nru starjava-datanode-1.0+2017.07.31/debian/patches/Remove-AST-references.patch starjava-datanode-1.0+2019.07.12/debian/patches/Remove-AST-references.patch
--- starjava-datanode-1.0+2017.07.31/debian/patches/Remove-AST-references.patch	2017-08-17 10:02:27.000000000 +0000
+++ starjava-datanode-1.0+2019.07.12/debian/patches/Remove-AST-references.patch	2019-08-02 09:00:46.000000000 +0000
@@ -12,7 +12,7 @@
  5 files changed, 15 insertions(+), 86 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index e9b1807..61ad8ce 100644
+index cda3151..489adec 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -204,9 +204,6 @@
@@ -34,7 +34,7 @@
      <pathelement
         location="${star.build.dir}/tamfits/lib/tamfits/tamfits.jar"/>
      <pathelement
-@@ -411,12 +406,6 @@
+@@ -401,12 +396,6 @@
                 classname="uk.ac.starlink.table.StarTable"/>
      <fail message="No Table available" unless="table.present"/>
  
@@ -47,7 +47,7 @@
      <!-- Need TAMFITS -->
      <available property="tamfits.present"
                 classpathref="classpath"
-@@ -514,6 +503,11 @@
+@@ -504,6 +493,11 @@
        <classpath refid="classpath"/>
  
        <include name="**/*.java"/>
@@ -59,7 +59,7 @@
      </javac>
  
      <!-- Copy extra files that should live with packages classes
-@@ -607,7 +601,6 @@
+@@ -600,7 +594,6 @@
           <extension name="UTIL" href="util.jnlp"/>
           <extension name="ARRAY" href="array.jnlp"/>
           <extension name="TABLE" href="table.jnlp"/>
@@ -67,7 +67,7 @@
           <extension name="TAMFITS" href="tamfits.jnlp"/>
           <extension name="FITS" href="fits.jnlp"/>
           <extension name="JNIHDS" href="jnihds.jnlp"/>
-@@ -1016,9 +1009,14 @@
+@@ -1010,9 +1003,14 @@
  
        <!-- Get a list of directories that name all the potential
         !   java packages -->
diff -Nru starjava-datanode-1.0+2017.07.31/debian/patches/Remove-HDS-references.patch starjava-datanode-1.0+2019.07.12/debian/patches/Remove-HDS-references.patch
--- starjava-datanode-1.0+2017.07.31/debian/patches/Remove-HDS-references.patch	2017-08-17 10:02:27.000000000 +0000
+++ starjava-datanode-1.0+2019.07.12/debian/patches/Remove-HDS-references.patch	2019-08-02 09:00:46.000000000 +0000
@@ -13,7 +13,7 @@
  7 files changed, 11 insertions(+), 147 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index 61ad8ce..572e28e 100644
+index 489adec..7891654 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -210,12 +210,6 @@
@@ -40,7 +40,7 @@
      <pathelement
         location="${star.build.dir}/ndx/lib/ndx/ndx.jar"/>
      <pathelement
-@@ -418,19 +408,6 @@
+@@ -408,19 +398,6 @@
                 classname="uk.ac.starlink.fits.MappedFile"/>
      <fail message="No FITS available" unless="fits.present"/>
  
@@ -60,7 +60,7 @@
      <!-- Need NDX -->
      <available property="ndx.present"
                 classpathref="classpath"
-@@ -508,6 +485,11 @@
+@@ -498,6 +475,11 @@
        <exclude name="uk/ac/starlink/datanode/nodes/FrameDataNode.java"/>
        <exclude name="uk/ac/starlink/datanode/viewers/AstTextShower.java"/>
        <exclude name="uk/ac/starlink/datanode/viewers/AstFITSShower.java"/>
@@ -72,7 +72,7 @@
      </javac>
  
      <!-- Copy extra files that should live with packages classes
-@@ -603,8 +585,6 @@
+@@ -596,8 +578,6 @@
           <extension name="TABLE" href="table.jnlp"/>
           <extension name="TAMFITS" href="tamfits.jnlp"/>
           <extension name="FITS" href="fits.jnlp"/>
@@ -81,7 +81,7 @@
           <extension name="NDX" href="ndx.jnlp"/>
           <extension name="VOTABLE" href="votable.jnlp"/>
           <extension name="CONNECT" href="connect.jnlp"/>
-@@ -1016,6 +996,11 @@
+@@ -1010,6 +990,11 @@
  	 <exclude name="uk/ac/starlink/datanode/nodes/FrameDataNode.java"/>
  	 <exclude name="uk/ac/starlink/datanode/viewers/AstTextShower.java"/>
  	 <exclude name="uk/ac/starlink/datanode/viewers/AstFITSShower.java"/>
diff -Nru starjava-datanode-1.0+2017.07.31/debian/patches/Remove-NDX-HDX-references.patch starjava-datanode-1.0+2019.07.12/debian/patches/Remove-NDX-HDX-references.patch
--- starjava-datanode-1.0+2017.07.31/debian/patches/Remove-NDX-HDX-references.patch	2017-08-17 10:02:27.000000000 +0000
+++ starjava-datanode-1.0+2019.07.12/debian/patches/Remove-NDX-HDX-references.patch	2019-08-02 09:00:46.000000000 +0000
@@ -15,7 +15,7 @@
  9 files changed, 9 insertions(+), 192 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index 572e28e..c62e3e1 100644
+index 7891654..e59c4a5 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -210,9 +210,6 @@
@@ -37,7 +37,7 @@
      <pathelement
         location="${star.build.dir}/votable/lib/votable/votable.jar"/>
      <pathelement
-@@ -408,12 +403,6 @@
+@@ -398,12 +393,6 @@
                 classname="uk.ac.starlink.fits.MappedFile"/>
      <fail message="No FITS available" unless="fits.present"/>
  
@@ -50,7 +50,7 @@
      <!-- Need VOTable -->
      <available property="votable.present"
                 classpathref="classpath"
-@@ -490,6 +479,9 @@
+@@ -480,6 +469,9 @@
        <exclude name="uk/ac/starlink/datanode/nodes/HDXDataNode.java"/>
        <exclude name="uk/ac/starlink/datanode/nodes/HistoryDataNode.java"/>
        <exclude name="uk/ac/starlink/datanode/nodes/NDFDataNode.java"/>
@@ -60,7 +60,7 @@
      </javac>
  
      <!-- Copy extra files that should live with packages classes
-@@ -585,7 +577,6 @@
+@@ -578,7 +570,6 @@
           <extension name="TABLE" href="table.jnlp"/>
           <extension name="TAMFITS" href="tamfits.jnlp"/>
           <extension name="FITS" href="fits.jnlp"/>
@@ -68,7 +68,7 @@
           <extension name="VOTABLE" href="votable.jnlp"/>
           <extension name="CONNECT" href="connect.jnlp"/>
           <extension name="ASTROGRID" href="astrogrid.jnlp"/>
-@@ -1001,6 +992,9 @@
+@@ -995,6 +986,9 @@
  	 <exclude name="uk/ac/starlink/datanode/nodes/HDXDataNode.java"/>
  	 <exclude name="uk/ac/starlink/datanode/nodes/HistoryDataNode.java"/>
  	 <exclude name="uk/ac/starlink/datanode/nodes/NDFDataNode.java"/>
diff -Nru starjava-datanode-1.0+2017.07.31/debian/patches/series starjava-datanode-1.0+2019.07.12/debian/patches/series
--- starjava-datanode-1.0+2017.07.31/debian/patches/series	2017-08-17 10:02:27.000000000 +0000
+++ starjava-datanode-1.0+2019.07.12/debian/patches/series	2019-08-02 09:00:46.000000000 +0000
@@ -2,6 +2,5 @@
 Remove-HDS-references.patch
 Remove-NDX-HDX-references.patch
 Fix-build.xml-for-use-outside-of-starjava.patch
-Use-latest-nom.tam.fits-API.patch
 Remove-javax.media.jai-dependency.patch
 Use-commons.compress-instead-of-ant-tar.patch
diff -Nru starjava-datanode-1.0+2017.07.31/debian/patches/Use-latest-nom.tam.fits-API.patch starjava-datanode-1.0+2019.07.12/debian/patches/Use-latest-nom.tam.fits-API.patch
--- starjava-datanode-1.0+2017.07.31/debian/patches/Use-latest-nom.tam.fits-API.patch	2017-08-17 10:02:27.000000000 +0000
+++ starjava-datanode-1.0+2019.07.12/debian/patches/Use-latest-nom.tam.fits-API.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Tue, 10 Jan 2017 08:59:35 +0100
-Subject: Use latest nom.tam.fits API
-
----
- src/main/uk/ac/starlink/datanode/nodes/TableHDUDataNode.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main/uk/ac/starlink/datanode/nodes/TableHDUDataNode.java b/src/main/uk/ac/starlink/datanode/nodes/TableHDUDataNode.java
-index bfa4759..0ff484e 100644
---- a/src/main/uk/ac/starlink/datanode/nodes/TableHDUDataNode.java
-+++ b/src/main/uk/ac/starlink/datanode/nodes/TableHDUDataNode.java
-@@ -202,7 +202,7 @@ public class TableHDUDataNode extends HDUDataNode {
-             AsciiTable tdata = new AsciiTable( hdr );
-             tdata.read( strm );
-             tdata.getData();
--            TableHDU thdu = new AsciiTableHDU( hdr, (Data) tdata );
-+            TableHDU thdu = new AsciiTableHDU( hdr, tdata );
-             return new FitsStarTable( thdu );
-         }
- 
diff -Nru starjava-datanode-1.0+2017.07.31/src/main/uk/ac/starlink/datanode/nodes/IconFactory.java starjava-datanode-1.0+2019.07.12/src/main/uk/ac/starlink/datanode/nodes/IconFactory.java
--- starjava-datanode-1.0+2017.07.31/src/main/uk/ac/starlink/datanode/nodes/IconFactory.java	2017-07-31 09:00:31.000000000 +0000
+++ starjava-datanode-1.0+2019.07.12/src/main/uk/ac/starlink/datanode/nodes/IconFactory.java	2019-07-12 13:01:01.000000000 +0000
@@ -109,7 +109,7 @@
      * may be null if the icon does not have a gif (because it is acquired
      * directly from the UIManager for instance).
      *
-     * @param  id
+     * @param  id  icon identifier
      * @return  the URL of the icon, or null
      * @throws  IllegalArgumentException  if <tt>id</tt> is not one of the
      *          known icon identifiers
diff -Nru starjava-datanode-1.0+2017.07.31/src/main/uk/ac/starlink/datanode/nodes/TableHDUDataNode.java starjava-datanode-1.0+2019.07.12/src/main/uk/ac/starlink/datanode/nodes/TableHDUDataNode.java
--- starjava-datanode-1.0+2017.07.31/src/main/uk/ac/starlink/datanode/nodes/TableHDUDataNode.java	2017-07-31 09:00:31.000000000 +0000
+++ starjava-datanode-1.0+2019.07.12/src/main/uk/ac/starlink/datanode/nodes/TableHDUDataNode.java	2019-07-12 13:01:01.000000000 +0000
@@ -6,7 +6,6 @@
 import nom.tam.fits.AsciiTableHDU;
 import nom.tam.fits.BinaryTable;
 import nom.tam.fits.BinaryTableHDU;
-import nom.tam.fits.Data;
 import nom.tam.fits.FitsException;
 import nom.tam.fits.TableData;
 import nom.tam.fits.TableHDU;
@@ -202,7 +201,7 @@
             AsciiTable tdata = new AsciiTable( hdr );
             tdata.read( strm );
             tdata.getData();
-            TableHDU thdu = new AsciiTableHDU( hdr, (Data) tdata );
+            TableHDU thdu = new AsciiTableHDU( hdr, tdata );
             return new FitsStarTable( thdu );
         }