Hi,
probably in response to my last mail here[1] a commit was somehow
pushed by Markus Koschany[2] (or see below).
Partly Explanation: Since I basically package this for Debian Med and
this team has its commit list salvaged on alioth-lists I've pointed
integration settings on salsa to this list to realise if something happens
in this repository. This was obviously a good idea.
Totally lack of explanation is: Why does neither a `git pull` nor the
history in the Gitlab frontend[3] shows a sign of the commit done by
Markus? My only vague explanation is that Markus has forked the
repository and that fork inheritted the integration settings as well.
Hmmm, Markus, if you have some better explanation - how can I get your
(admittedly promising) changes?
Kind regards
Andreas.
[1] https://lists.debian.org/debian-java/2018/05/msg00078.html
[2]
https://alioth-lists.debian.net/pipermail/debian-med-commit/2018-May/085258.html
[3] https://salsa.debian.org/java-team/libjavolution-java/commits/master
On Fri, May 25, 2018 at 10:21:46PM +0000, Markus Koschany wrote:
> Markus Koschany pushed to branch master at Debian Java Maintainers /
> libjavolution-java
>
>
> Commits:
> 82863cd1 by Andreas Tille at 2018-05-26T00:20:33+02:00
> Import Debian changes 6.0.0+dfsg-1
>
> libjavolution-java (6.0.0+dfsg-1) UNRELEASED; urgency=low
>
> * Initial release (Closes: #xxxxxx).
>
> - - - - -
>
>
> 4 changed files:
>
> - debian/control
> - debian/libjavolution-java.poms
> - + debian/patches/bundle-jar.patch
> - + debian/patches/series
>
>
> Changes:
>
> =====================================
> debian/control
> =====================================
> --- a/debian/control
> +++ b/debian/control
> @@ -6,6 +6,8 @@ Priority: optional
> Build-Depends: debhelper (>= 11~),
> default-jdk,
> javahelper,
> + libosgi-compendium-java,
> + libosgi-core-java,
> maven-debian-helper
> Standards-Version: 4.1.4
> Vcs-Browser: https://salsa.debian.org/java-team/libjavolution-java
> @@ -14,7 +16,7 @@ Homepage: http://javolution.org/
>
> Package: libjavolution-java
> Architecture: all
> -Depends: ${java:Depends},
> +Depends: ${maven:Depends},
> ${misc:Depends}
> Description: Java core library for real-time and embedded systems
> Javolution real-time goals are simple: To make your application faster
>
>
> =====================================
> debian/libjavolution-java.poms
> =====================================
> --- a/debian/libjavolution-java.poms
> +++ b/debian/libjavolution-java.poms
> @@ -27,4 +27,4 @@
> #
> pom.xml --no-parent --has-package-version
> core-java/pom.xml --has-package-version
> -core-cpp/pom.xml --has-package-version
> +core-cpp/pom.xml --ignore
>
>
> =====================================
> debian/patches/bundle-jar.patch
> =====================================
> --- /dev/null
> +++ b/debian/patches/bundle-jar.patch
> @@ -0,0 +1,28 @@
> +From: Markus Koschany <a...@debian.org>
> +Date: Sat, 26 May 2018 00:05:52 +0200
> +Subject: bundle-jar
> +
> +---
> + core-java/pom.xml | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/core-java/pom.xml b/core-java/pom.xml
> +index d8a3107..458626d 100644
> +--- a/core-java/pom.xml
> ++++ b/core-java/pom.xml
> +@@ -11,7 +11,7 @@
> + <version>6.0.0</version>
> + </parent>
> + <artifactId>javolution-core-java</artifactId>
> +- <packaging>bundle</packaging>
> ++ <packaging>jar</packaging>
> + <name>Javolution Core (Java)</name>
> +
> + <!-- ======================================================= -->
> +@@ -110,4 +110,4 @@
> +
> + </plugins>
> + </build>
> +-</project>
> +\ No newline at end of file
> ++</project>
>
>
> =====================================
> debian/patches/series
> =====================================
> --- /dev/null
> +++ b/debian/patches/series
> @@ -0,0 +1 @@
> +bundle-jar.patch
>
>
>
> View it on GitLab:
> https://salsa.debian.org/java-team/libjavolution-java/commit/82863cd11b1b16ac972284f867d5905d04752483
>
> --
> View it on GitLab:
> https://salsa.debian.org/java-team/libjavolution-java/commit/82863cd11b1b16ac972284f867d5905d04752483
> You're receiving this email because of your account on salsa.debian.org.
> _______________________________________________
> debian-med-commit mailing list
> debian-med-com...@alioth-lists.debian.net
> https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
--
http://fam-tille.de
