[Git][java-team/jblas][master] 10 commits: Avoid B-D on specific BLAS/LAPACK implementation (Closes: #976264)

Sun Dec 13 05:54:24 GMT 2020


Tony Mancill pushed to branch master at Debian Java Maintainers / jblas


Commits:
25033e22 by tony mancill at 2020-12-12T20:29:43-08:00
Avoid B-D on specific BLAS/LAPACK implementation (Closes: #976264)

Thank you to Mo Zhou <lumin at debian.org> for the patch.  Also see #943712.

- - - - -
530e8298 by tony mancill at 2020-12-12T20:49:31-08:00
Set Rules-Requires-Root: no in debian/control

- - - - -
a0605c16 by tony mancill at 2020-12-12T20:49:31-08:00
Use debhelper-compat 13

- - - - -
33ea39eb by tony mancill at 2020-12-12T20:49:31-08:00
Bump Standards-Version to 4.5.1

- - - - -
742a422a by tony mancill at 2020-12-12T20:49:31-08:00
Update Vcs URLs to point to Salsa

- - - - -
eb6e2324 by tony mancill at 2020-12-12T20:59:02-08:00
Check DEB_BUILD_OPTIONS before running tests

- - - - -
27fb0f07 by tony mancill at 2020-12-12T21:07:46-08:00
Update debian/watch URL on Github

- - - - -
4687b51c by tony mancill at 2020-12-12T21:13:19-08:00
No longer name the versioned JAR as a SNAPSHOT

- - - - -
f552d977 by tony mancill at 2020-12-12T21:47:20-08:00
Correct documentation path in doc-base

- - - - -
3a449fc4 by tony mancill at 2020-12-12T21:49:50-08:00
prepare changelog for upload to unstable

- - - - -


7 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/jblas-doc.doc-base
- debian/patches/version-property.patch
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+jblas (1.2.4-3) unstable; urgency=medium
+
+  * Avoid B-D on specific BLAS/LAPACK implementation (Closes: #976264)
+    Thank you to Mo Zhou for the patch.  Also see #943712.
+  * Set Rules-Requires-Root: no in debian/control
+  * Use debhelper-compat 13
+  * Bump Standards-Version to 4.5.1
+  * Update Vcs URLs to point to Salsa
+  * Check DEB_BUILD_OPTIONS before running tests
+  * Update debian/watch URL on Github
+  * No longer name the versioned JAR as a SNAPSHOT
+  * Correct documentation path in doc-base
+
+ -- tony mancill <tmancill at debian.org>  Sat, 12 Dec 2020 21:19:39 -0800
+
 jblas (1.2.4-2) unstable; urgency=medium
 
   * Team upload.
@@ -65,7 +80,7 @@ jblas (1.2.3-3) unstable; urgency=medium
   * Upload to unstable.
   * Tweak debian/rules for tests on powerpc.
   * Remove ./target/ in clean target of debian/rules.
-  
+
  -- tony mancill <tmancill at debian.org>  Thu, 23 Jan 2014 20:37:23 -0800
 
 jblas (1.2.3-2) experimental; urgency=medium
@@ -99,7 +114,7 @@ jblas (1.2.0-6) unstable; urgency=medium
 jblas (1.2.0-5) unstable; urgency=medium
 
   * Team upload.
-  * Add build-with-ruby19.patch (Closes: #733773) 
+  * Add build-with-ruby19.patch (Closes: #733773)
     - package now has build-dep on locales
   * Enable tests.
     - package now has build-dep on junit4


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -6,18 +6,20 @@ Uploaders:
  tony mancill <tmancill at debian.org>
 Build-Depends:
  ant-optional,
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
  gfortran,
  junit4,
- libatlas-base-dev,
+ libblas-dev,
+ liblapack-dev,
  locales,
  ruby
-Standards-Version: 4.1.4
+Standards-Version: 4.5.1
 Section: science
 Homepage: http://jblas.org
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jblas.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-java/jblas.git
+Vcs-Git: https://salsa.debian.org/java-team/jblas.git
+Vcs-Browser: https://salsa.debian.org/java-team/jblas
+Rules-Requires-Root: no
 
 Package: jblas
 Architecture: linux-any


=====================================
debian/jblas-doc.doc-base
=====================================
@@ -9,5 +9,5 @@ Abstract: jblas is a fast linear algebra library for Java. jblas is
 Section: Science/Data Analysis
 
 Format: HTML
-Index: /usr/share/doc/jblas-doc/javadoc/index.html
-Files: /usr/share/doc/jblas-doc/javadoc/*.html
+Index: /usr/share/doc/jblas/javadoc/index.html
+Files: /usr/share/doc/jblas/javadoc/*.html


=====================================
debian/patches/version-property.patch
=====================================
@@ -18,7 +18,7 @@ index 5598460..3092333 100644
      <!-- Define directories -->
  
 -    <property name="version" value="1.2.3-SNAPSHOT" />
-+    <property name="version" value="1.2.4-SNAPSHOT" />
++    <property name="version" value="1.2.4" />
      <property name="src" value="${basedir}/src/main/java" />
      <property name="test" value="${basedir}/src/test/java" />
      <property name="bin" value="${basedir}/target/classes" />


=====================================
debian/rules
=====================================
@@ -16,7 +16,7 @@ override_dh_auto_build:
 	localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
 	export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
 		export LC_ALL=en_US.UTF-8 && \
-		./configure --libpath=/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH)/atlas
+		./configure --libpath=/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH)/blas:/usr/lib/$(DEB_HOST_MULTIARCH)/lapack --lapack-build --built-type=lapack
 	export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
 		export LC_ALL=en_US.UTF-8 && \
 		$(MAKE)
@@ -29,14 +29,15 @@ override_dh_auto_clean:
 override_dh_install:
 	install -m755 -d debian/jblas/usr/lib/jni
 	install -m644 $(shell find ./src/main/resources/lib/dynamic -name '*.so') debian/jblas/usr/lib/jni
-	install -m644 -D jblas-minimal-$(DEB_VERSION_UPSTREAM)-SNAPSHOT.jar \
-		debian/jblas/usr/share/java/jblas-$(DEB_VERSION_UPSTREAM)-SNAPSHOT.jar
+	install -m644 -D jblas-minimal-$(DEB_VERSION_UPSTREAM).jar \
+		debian/jblas/usr/share/java/jblas-$(DEB_VERSION_UPSTREAM).jar
 
 override_dh_link:
 	dh_link
-	dh_link -pjblas /usr/share/java/jblas-$(DEB_VERSION_UPSTREAM)-SNAPSHOT.jar /usr/share/java/jblas.jar
+	dh_link -pjblas /usr/share/java/jblas-$(DEB_VERSION_UPSTREAM).jar /usr/share/java/jblas.jar
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# the tests need to be able to find the JNI libs
 ifeq ($(DEB_BUILD_ARCH),powerpc)
 	export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/ppc
@@ -48,3 +49,4 @@ else
 	export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/$(DEB_BUILD_ARCH)
 endif
 	dh_auto_test
+endif


=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
 version=4
-https://github.com/mikiobraun/jblas/releases /mikiobraun/jblas/archive/jblas- at ANY_VERSION@.tar.gz
+https://github.com/jblas-project/jblas/tags .*/jblas-(\d\S+)\.tar\.gz



View it on GitLab: https://salsa.debian.org/java-team/jblas/-/compare/8bf0d7616bfe5e10fa0560039c66df1b9ef2e0b6...3a449fc4759b8d947c3c3bee1b67aa3d3c176040

-- 
View it on GitLab: https://salsa.debian.org/java-team/jblas/-/compare/8bf0d7616bfe5e10fa0560039c66df1b9ef2e0b6...3a449fc4759b8d947c3c3bee1b67aa3d3c176040
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/20201213/d2260f75/attachment.html>
