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 @@
-
+
@@ -367,16 +367,6 @@
-
-
-
+
+
+
+
-
@@ -1013,6 +1006,7 @@
defaultexcludes="yes"
source="${source.version}"
classpathref="classpath">
+
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 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
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 @@
--
-
-
+-
+-
+-
+-
-
-
-
--
@@ -59,7 +59,7 @@
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 @@
@@ -60,7 +60,7 @@
@@ -72,7 +72,7 @@
@@ -60,7 +60,7 @@