diff -Nru starjava-cdf-1.0+2018.11.28+dfsg/build.xml starjava-cdf-1.0+2019.07.12+dfsg/build.xml
--- starjava-cdf-1.0+2018.11.28+dfsg/build.xml	2018-11-28 13:19:36.000000000 +0000
+++ starjava-cdf-1.0+2019.07.12+dfsg/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.5"/>
+  <property name="source.version" value="1.6"/>
 
   <!-- Extra task options, if any -->
   <property name="chmod.fail" value="false"/>
@@ -321,16 +321,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
    !    =========================================
@@ -404,6 +394,7 @@
            deprecation="${deprecation}"
            source="${source.version}"
            optimize="${optimize}">
+      <compilerarg value="-Xlint:all,-path,-serial"/>
 
       <classpath refid="classpath"/>
 
@@ -461,12 +452,15 @@
     </jar>
 
     <!-- Sign all jar files -->
+    <antcall target="signjars"/>
+  </target>
+     
+  <target name="signjars" if="sign.jars">
     <signjar jar="${dist.lib.pkg}/${name}.jar"
              alias="${webstart.alias}"
              keystore="${webstart.keystore}"
              keypass="${webstart.keypass}"
              storepass="${webstart.storepass}"/>
-
   </target>
 
   <!--
@@ -497,7 +491,7 @@
        </security>
 
        <resources>
-         <j2se version="1.5+"/>
+         <j2se version="1.6+"/>
 
          <!-- Define the main library jar file -->
          <jar href="${name}/${name}.jar"/>
@@ -897,6 +891,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-cdf-1.0+2018.11.28+dfsg/debian/changelog starjava-cdf-1.0+2019.07.12+dfsg/debian/changelog
--- starjava-cdf-1.0+2018.11.28+dfsg/debian/changelog	2018-11-30 07:29:44.000000000 +0000
+++ starjava-cdf-1.0+2019.07.12+dfsg/debian/changelog	2019-08-02 09:17:11.000000000 +0000
@@ -1,3 +1,12 @@
+starjava-cdf (1.0+2019.07.12+dfsg-1) unstable; urgency=low
+
+  * New upstream version 1.0+2019.07.12+dfsg. 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:17:11 +0200
+
 starjava-cdf (1.0+2018.11.28+dfsg-1) unstable; urgency=low
 
   * Update VCS fields to use salsa.d.o
diff -Nru starjava-cdf-1.0+2018.11.28+dfsg/debian/compat starjava-cdf-1.0+2019.07.12+dfsg/debian/compat
--- starjava-cdf-1.0+2018.11.28+dfsg/debian/compat	2018-11-30 07:29:13.000000000 +0000
+++ starjava-cdf-1.0+2019.07.12+dfsg/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru starjava-cdf-1.0+2018.11.28+dfsg/debian/control starjava-cdf-1.0+2019.07.12+dfsg/debian/control
--- starjava-cdf-1.0+2018.11.28+dfsg/debian/control	2018-11-30 07:29:17.000000000 +0000
+++ starjava-cdf-1.0+2019.07.12+dfsg/debian/control	2019-08-02 09:16:23.000000000 +0000
@@ -3,14 +3,14 @@
 Uploaders: Ole Streicher <olebole@debian.org>
 Section: java
 Priority: optional
-Build-Depends: ant, debhelper (>= 11), dh-exec, javahelper
+Build-Depends: ant, debhelper-compat (= 12), dh-exec, javahelper
 Build-Depends-Indep: ant-optional,
                      default-jdk,
                      default-jdk-doc,
                      junit,
                      libjcdf-java,
                      starlink-table-java
-Standards-Version: 4.2.1
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/debian-astro-team/starjava-cdf
 Vcs-Git: https://salsa.debian.org/debian-astro-team/starjava-cdf.git
 Homepage: https://github.com/Starlink/starjava/tree/master/cdf
diff -Nru starjava-cdf-1.0+2018.11.28+dfsg/debian/gitlab-ci.yml starjava-cdf-1.0+2019.07.12+dfsg/debian/gitlab-ci.yml
--- starjava-cdf-1.0+2018.11.28+dfsg/debian/gitlab-ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ starjava-cdf-1.0+2019.07.12+dfsg/debian/gitlab-ci.yml	2019-08-02 09:16:56.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-cdf-1.0+2018.11.28+dfsg/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch starjava-cdf-1.0+2019.07.12+dfsg/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch
--- starjava-cdf-1.0+2018.11.28+dfsg/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch	2018-11-30 07:29:00.000000000 +0000
+++ starjava-cdf-1.0+2019.07.12+dfsg/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch	2019-08-02 09:15:36.000000000 +0000
@@ -3,11 +3,11 @@
 Subject: Fix build.xml for use outside of starjava
 
 ---
- build.xml | 54 +++++++++++++++++++++++++-----------------------------
- 1 file changed, 25 insertions(+), 29 deletions(-)
+ build.xml | 56 +++++++++++++++++++++++++-------------------------------
+ 1 file changed, 25 insertions(+), 31 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index 42a8537..8ca9f10 100644
+index 8fa5443..f4a283c 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -32,12 +32,6 @@
@@ -98,15 +98,7 @@
    </path>
  
    <!-- Turn this path into a string which is passed to the tests -->
-@@ -328,7 +326,6 @@
-    !    tasks should be moved into the ANT package if used outside of this
-    !    package. 
-    !-->
--  <taskdef resource="axis-tasks.properties" classpathref="classpath"/>
- 
-   <!--
-    !    =========================================
-@@ -402,7 +399,8 @@
+@@ -392,7 +390,8 @@
             destdir="${build.classes}"
             debug="${debug}"
             deprecation="${deprecation}"
@@ -114,9 +106,9 @@
 +           encoding="cp1252"
 +           includeantruntime="false"
             optimize="${optimize}">
+       <compilerarg value="-Xlint:all,-path,-serial"/>
  
-       <classpath refid="classpath"/>
-@@ -452,6 +450,10 @@
+@@ -443,6 +442,10 @@
            description="-> creates the package jar file(s)">
  
      <mkdir dir="${dist.lib.pkg}"/>
@@ -127,30 +119,33 @@
      <jar destfile="${dist.lib.pkg}/${name}.jar"
           basedir="${build.classes}">
        <manifest>
-@@ -460,13 +462,6 @@
+@@ -451,16 +454,6 @@
        </manifest>
      </jar>
  
 -    <!-- Sign all jar files -->
+-    <antcall target="signjars"/>
+-  </target>
+-     
+-  <target name="signjars" if="sign.jars">
 -    <signjar jar="${dist.lib.pkg}/${name}.jar"
 -             alias="${webstart.alias}"
 -             keystore="${webstart.keystore}"
 -             keypass="${webstart.keypass}"
 -             storepass="${webstart.storepass}"/>
--
    </target>
  
    <!--
-@@ -895,7 +890,7 @@
+@@ -889,7 +882,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
-@@ -976,7 +971,8 @@
+@@ -971,7 +964,8 @@
      <javac srcdir="${tests.dir}"
             destdir="${build.tests}"
             debug="${debug}"
diff -Nru starjava-cdf-1.0+2018.11.28+dfsg/src/main/uk/ac/starlink/cdf/CdfDomains.java starjava-cdf-1.0+2019.07.12+dfsg/src/main/uk/ac/starlink/cdf/CdfDomains.java
--- starjava-cdf-1.0+2018.11.28+dfsg/src/main/uk/ac/starlink/cdf/CdfDomains.java	2018-11-28 13:19:36.000000000 +0000
+++ starjava-cdf-1.0+2019.07.12+dfsg/src/main/uk/ac/starlink/cdf/CdfDomains.java	2019-07-12 13:01:01.000000000 +0000
@@ -26,6 +26,7 @@
     /**
      * Returns an appropriate DomainMapper for a given CDF data type.
      *
+     * @param   dtype   data type
      * @return   appropriate domain mapper, or null
      */
     public static DomainMapper getMapper( DataType dtype ) {
diff -Nru starjava-cdf-1.0+2018.11.28+dfsg/src/main/uk/ac/starlink/cdf/CdfStarTable.java starjava-cdf-1.0+2019.07.12+dfsg/src/main/uk/ac/starlink/cdf/CdfStarTable.java
--- starjava-cdf-1.0+2018.11.28+dfsg/src/main/uk/ac/starlink/cdf/CdfStarTable.java	2018-11-28 13:19:36.000000000 +0000
+++ starjava-cdf-1.0+2019.07.12+dfsg/src/main/uk/ac/starlink/cdf/CdfStarTable.java	2019-07-12 13:01:01.000000000 +0000
@@ -55,6 +55,7 @@
      * @param   content  CDF data content object
      * @param   profile  parameterisation of how CDFs should get turned
      *                   into StarTables
+     * @throws  IOException  in case of error
      */
     public CdfStarTable( CdfContent content, CdfTableProfile profile )
             throws IOException {
@@ -312,7 +313,7 @@
             return array;
         }
         else {
-            Class elClass = dtype.getArrayElementClass();
+            Class<?> elClass = dtype.getArrayElementClass();
             Object array =Array.newInstance( elClass, nent );
             for ( int i = 0; i < nent; i++ ) {
                 Array.set( array, i, entries[ i ].getShapedValue() );
@@ -332,7 +333,7 @@
     private static ValueInfo createValueInfo( Variable var, String descrip,
                                               String units ) {
         String name = var.getName();
-        Class clazz = var.getShaper().getShapeClass();
+        Class<?> clazz = var.getShaper().getShapeClass();
         DataType dtype = var.getDataType();
         int grpSize = dtype.getGroupSize();
         final int[] shape;