[Git][java-team/libejml-java][master] 7 commits: Refreshing no-examples.patch.

Tue Nov 12 09:20:53 GMT 2019


Andrius Merkys pushed to branch master at Debian Java Maintainers / libejml-java


Commits:
b80b7741 by Andrius Merkys at 2019-11-12T07:42:43Z
Refreshing no-examples.patch.

- - - - -
d5f6e27f by Andrius Merkys at 2019-11-12T08:11:56Z
Building the package without gversion-plugin.

- - - - -
a9355882 by Andrius Merkys at 2019-11-12T08:20:38Z
Wrapping and sorting.

- - - - -
7544c427 by Andrius Merkys at 2019-11-12T08:31:39Z
Removing no longer needed debian/maven.rules.

- - - - -
a914622c by Andrius Merkys at 2019-11-12T08:38:33Z
Adding patch descriptions.

- - - - -
616f098f by Andrius Merkys at 2019-11-12T08:43:12Z
Adding README.Debian explaining the missing EjmlVersion.class.

- - - - -
9301e675 by Andrius Merkys at 2019-11-12T08:46:22Z
Preparing for release.

- - - - -


10 changed files:

- + debian/README.Debian
- debian/changelog
- debian/control
- debian/copyright
- − debian/maven.rules
- debian/patches/add-mavenLocal.patch
- debian/patches/no-examples.patch
- + debian/patches/remove-gversion.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/README.Debian
=====================================
@@ -0,0 +1,5 @@
+The JARs in Debian lack EjmlVersion.class, which would be created by
+gversion-plugin in a clone of upstream's git repository. As this is not
+the case for Debian builds, the class is omitted.
+
+Andrius Merkys <merkys at debian.org>


=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-libejml-java (0.38+ds-1) UNRELEASED; urgency=medium
+libejml-java (0.38+ds-1) unstable; urgency=medium
 
   * Team upload.
 
@@ -15,18 +15,15 @@ libejml-java (0.38+ds-1) UNRELEASED; urgency=medium
 
   [ Andrius Merkys ]
   * New upstream version 0.38+ds (Closes: #929053)
-  * Adding a patch to use local maven repository.
-  * Adding a patch to turn off example compilation, as it fails.
   * Relying on gradle buildsystem to build the package.
-  * Using maven-repo-helper to correct gversion's artifactId.
-  * Adding b-deps on gversion gradle plugin and libauto64fto32f-java.
   * Listing all the poms and their jars in debian/libejml-java.poms.
   * Removing debian/libejml-java.jlibs, as jars are now installed by
     debian/libejml-java.pom.
   * ManualEJML.pdf is no longer present.
   * Removing all generated java files.
+  * Adding README.Debian explaining the missing EjmlVersion.class.
 
- -- Andrius Merkys <merkys at debian.org>  Wed, 15 May 2019 10:45:10 -0400
+ -- Andrius Merkys <merkys at debian.org>  Tue, 12 Nov 2019 03:44:31 -0500
 
 libejml-java (0.28-1) unstable; urgency=low
 


=====================================
debian/control
=====================================
@@ -1,13 +1,14 @@
 Source: libejml-java
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille at debian.org>
+Uploaders:
+ Andreas Tille <tille at debian.org>,
 Section: java
 Priority: optional
-Build-Depends: debhelper (>= 12~),
-               gradle-debian-helper,
-               libauto64fto32f-java,
-               libgradle-gversion-plugin-java,
-               maven-repo-helper
+Build-Depends:
+ debhelper (>= 12~),
+ gradle-debian-helper,
+ libauto64fto32f-java,
+ maven-repo-helper,
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/java-team/libejml-java
 Vcs-Git: https://salsa.debian.org/java-team/libejml-java.git
@@ -15,7 +16,8 @@ Homepage: http://ejml.org/wiki
 
 Package: libejml-java
 Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: Efficient Java Matrix Library
  Efficient Java Matrix Library (EJML) is a linear algebra library for
  manipulating dense matrices. Its design goals are;


=====================================
debian/copyright
=====================================
@@ -28,4 +28,3 @@ License: Apache-2.0
  .
  On Debian systems you can find a copy of Apache 2.0 at
  /usr/share/common-licenses/Apache-2.0
-


=====================================
debian/maven.rules deleted
=====================================
@@ -1 +0,0 @@
-com.peterabeles.gversion s/com.peterabeles.gversion.gradle.plugin/gversion/ * s/.*/debian/ * *


=====================================
debian/patches/add-mavenLocal.patch
=====================================
@@ -1,3 +1,5 @@
+Description: Adding local Maven repository.
+Author: Andrius Merkys <merkys at debian.org>
 --- a/settings.gradle
 +++ b/settings.gradle
 @@ -1,3 +1,11 @@


=====================================
debian/patches/no-examples.patch
=====================================
@@ -1,3 +1,5 @@
+Description: Not compiling the examples.
+Author: Andrius Merkys <merkys at debian.org>
 --- a/settings.gradle
 +++ b/settings.gradle
 @@ -7,5 +7,5 @@
@@ -9,7 +11,7 @@
          'main:ejml-dsparse'
 --- a/build.gradle
 +++ b/build.gradle
-@@ -241,7 +241,7 @@
+@@ -242,7 +242,7 @@
  project(':main:ejml-core').compileJava.dependsOn(createVersionFile)
  
  // Disable the creation of jars for distribution.  If you don't do this it will crash


=====================================
debian/patches/remove-gversion.patch
=====================================
@@ -0,0 +1,28 @@
+Description: Removing gversion-plugin, which expects the source to be in git
+ repository.
+Author: Andrius Merkys <merkys at debian.org>
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,13 +1,3 @@
+-plugins {
+-    id "com.peterabeles.gversion" version "1.4.1"
+-}
+-
+-gversion {
+-    srcDir = "main/ejml-core/src"
+-    classPackage = "org.ejml"
+-    className = "EjmlVersion"
+-}
+-
+ allprojects {
+     apply plugin: 'idea'
+     apply plugin: 'eclipse'
+@@ -239,8 +229,6 @@
+     gradleVersion = '4.10.2'
+ }
+ 
+-project(':main:ejml-core').compileJava.dependsOn(createVersionFile)
+-
+ // Disable the creation of jars for distribution.  If you don't do this it will crash
+ [':main',':main:autocode'].each {String a ->
+     project(a) {


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 add-mavenLocal.patch
 no-examples.patch
+remove-gversion.patch


=====================================
debian/rules
=====================================
@@ -14,7 +14,6 @@ override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf main/ejml-cdense/src main/ejml-cdense/test
 	rm -rf main/ejml-fdense/src main/ejml-fdense/test
-	rm -f main/ejml-core/src/org/ejml/EjmlVersion.java
 	rm -f main/ejml-core/src/org/ejml/data/CMatrixD1.java
 	rm -f main/ejml-core/src/org/ejml/data/CMatrix.java
 	rm -f main/ejml-core/src/org/ejml/data/CMatrixRMaj.java



View it on GitLab: https://salsa.debian.org/java-team/libejml-java/compare/ea5211584a49e4500e9e199abce332c115dc0a79...9301e675db384f6658d6557c5166174915294662

-- 
View it on GitLab: https://salsa.debian.org/java-team/libejml-java/compare/ea5211584a49e4500e9e199abce332c115dc0a79...9301e675db384f6658d6557c5166174915294662
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20191112/3d7cbb07/attachment.html>
