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 @@
-
+
@@ -321,16 +321,6 @@
-
-
-
+
+
+
+
-
@@ -897,6 +891,7 @@
defaultexcludes="yes"
source="${source.version}"
classpathref="classpath">
+
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 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
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 @@
-@@ -328,7 +326,6 @@
- ! tasks should be moved into the ANT package if used outside of this
- ! package.
- !-->
--
-
-
+-
+-
+-
+-
-
--