diff -Nru starjava-connect-0.1+2016.05.03/build.xml starjava-connect-0.1+2019.07.12/build.xml
--- starjava-connect-0.1+2016.05.03/build.xml 2016-05-03 09:40:27.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/build.xml 2019-07-12 13:01:01.000000000 +0000
@@ -88,7 +88,7 @@
-
+
@@ -325,16 +325,6 @@
-
-
-
+
+
+
+
-
@@ -899,6 +893,7 @@
defaultexcludes="yes"
source="${source.version}"
classpathref="classpath">
+
diff -Nru starjava-connect-0.1+2016.05.03/debian/changelog starjava-connect-0.1+2019.07.12/debian/changelog
--- starjava-connect-0.1+2016.05.03/debian/changelog 2018-11-17 20:30:44.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/debian/changelog 2019-08-01 14:15:18.000000000 +0000
@@ -1,3 +1,12 @@
+starjava-connect (0.1+2019.07.12-1) unstable; urgency=low
+
+ * New upstream version 0.1+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 Thu, 01 Aug 2019 16:15:18 +0200
+
starjava-connect (0.1+2016.05.03-2) unstable; urgency=low
* Update VCS fields to use salsa.d.o
diff -Nru starjava-connect-0.1+2016.05.03/debian/compat starjava-connect-0.1+2019.07.12/debian/compat
--- starjava-connect-0.1+2016.05.03/debian/compat 2018-11-17 20:30:20.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/debian/compat 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru starjava-connect-0.1+2016.05.03/debian/control starjava-connect-0.1+2019.07.12/debian/control
--- starjava-connect-0.1+2016.05.03/debian/control 2018-11-17 20:30:25.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/debian/control 2019-08-01 14:14:45.000000000 +0000
@@ -3,13 +3,13 @@
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,
starlink-util-java
-Standards-Version: 4.2.1
+Standards-Version: 4.4.0
Vcs-Browser: https://salsa.debian.org/debian-astro-team/starjava-connect
Vcs-Git: https://salsa.debian.org/debian-astro-team/starjava-connect.git
Homepage: https://github.com/Starlink/starjava/tree/master/connect
diff -Nru starjava-connect-0.1+2016.05.03/debian/gitlab-ci.yml starjava-connect-0.1+2019.07.12/debian/gitlab-ci.yml
--- starjava-connect-0.1+2016.05.03/debian/gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/debian/gitlab-ci.yml 2019-08-01 14:15:01.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-connect-0.1+2016.05.03/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch starjava-connect-0.1+2019.07.12/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch
--- starjava-connect-0.1+2016.05.03/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch 2018-11-17 20:28:19.000000000 +0000
+++ starjava-connect-0.1+2019.07.12/debian/patches/Fix-build.xml-for-use-outside-of-starjava.patch 2019-08-01 14:14:02.000000000 +0000
@@ -21,11 +21,11 @@
* Don't sign the jarfile
---
- build.xml | 55 ++++++++++++++++++++++++-------------------------------
- 1 file changed, 24 insertions(+), 31 deletions(-)
+ build.xml | 57 ++++++++++++++++++++++++---------------------------------
+ 1 file changed, 24 insertions(+), 33 deletions(-)
diff --git a/build.xml b/build.xml
-index 01d512a..1fabddf 100644
+index b5fbdac..80458a1 100644
--- a/build.xml
+++ b/build.xml
@@ -32,12 +32,6 @@
@@ -115,15 +115,7 @@
-@@ -332,7 +327,6 @@
- ! tasks should be moved into the ANT package if used outside of this
- ! package.
- !-->
--
-
-
+-
+-
+-
+-
-
--