Author: tmancill Date: 2014-01-04 23:16:52 +0000 (Sat, 04 Jan 2014) New Revision: 17630
Added: trunk/jblas/debian/patches/build-with-ruby19.patch trunk/jblas/debian/patches/series Removed: trunk/jblas/debian/jblas.lintian-overrides Modified: trunk/jblas/debian/changelog trunk/jblas/debian/compat trunk/jblas/debian/control trunk/jblas/debian/rules Log: changes for 1.2.0-5 debian upload the jblas.lintian-overrides was inadvertently omitted, and will be restored Modified: trunk/jblas/debian/changelog =================================================================== --- trunk/jblas/debian/changelog 2013-12-31 21:25:27 UTC (rev 17629) +++ trunk/jblas/debian/changelog 2014-01-04 23:16:52 UTC (rev 17630) @@ -1,8 +1,15 @@ -jblas (1.2.0-5) UNRELEASED; urgency=low +jblas (1.2.0-5) unstable; urgency=medium - * Add lintian ignores for hardening flags. + * Team upload. + * Add build-with-ruby19.patch (Closes: #733773) + - package now has build-dep on locales + * Enable tests. + - package now has build-dep on junit4 + * Update Vcs URLs to be canonical. + * Depend on DH 9. + * Bump Standards-Version to 3.9.5 (no changes). - -- Soeren Sonnenburg <[email protected]> Sat, 30 Jun 2012 20:53:52 +0200 + -- tony mancill <[email protected]> Sat, 04 Jan 2014 12:29:52 -0800 jblas (1.2.0-4) unstable; urgency=low Modified: trunk/jblas/debian/compat =================================================================== --- trunk/jblas/debian/compat 2013-12-31 21:25:27 UTC (rev 17629) +++ trunk/jblas/debian/compat 2014-01-04 23:16:52 UTC (rev 17630) @@ -1 +1 @@ -7 +9 Modified: trunk/jblas/debian/control =================================================================== --- trunk/jblas/debian/control 2013-12-31 21:25:27 UTC (rev 17629) +++ trunk/jblas/debian/control 2014-01-04 23:16:52 UTC (rev 17630) @@ -3,13 +3,13 @@ Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Soeren Sonnenburg <[email protected]>, Torsten Werner <[email protected]> -Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant-optional, gfortran, - libatlas-base-dev, ruby1.8 -Standards-Version: 3.9.3 +Build-Depends: cdbs, debhelper (>= 9), default-jdk, ant-optional, gfortran, + libatlas-base-dev, ruby, locales, junit4 +Standards-Version: 3.9.5 Section: science Homepage: http://jblas.org -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jblas -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jblas/ +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jblas +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jblas Package: jblas Architecture: any Deleted: trunk/jblas/debian/jblas.lintian-overrides =================================================================== --- trunk/jblas/debian/jblas.lintian-overrides 2013-12-31 21:25:27 UTC (rev 17629) +++ trunk/jblas/debian/jblas.lintian-overrides 2014-01-04 23:16:52 UTC (rev 17630) @@ -1,3 +0,0 @@ -W: jblas: hardening-no-relro usr/lib/jni/libjblas.so -W: jblas: hardening-no-fortify-functions usr/lib/jni/libjblas.so -W: jblas: hardening-no-relro usr/lib/jni/libjblas_arch_flavor.so Added: trunk/jblas/debian/patches/build-with-ruby19.patch =================================================================== --- trunk/jblas/debian/patches/build-with-ruby19.patch (rev 0) +++ trunk/jblas/debian/patches/build-with-ruby19.patch 2014-01-04 23:16:52 UTC (rev 17630) @@ -0,0 +1,29 @@ +--- a/config/configure.rb ++++ b/config/configure.rb +@@ -32,6 +32,8 @@ + # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ## --- END LICENSE BLOCK --- + ++$: << "." ++ + require 'config/path' + require 'config/config' + require 'config/opts' +--- a/config/lib_helpers.rb ++++ b/config/lib_helpers.rb +@@ -64,7 +64,7 @@ + # returns an array of the symbols defined in the library +fn+. + def libsyms(fn) + nmopt = File.extname(fn) == '.so' ? '-D' : '' +- %x(#{Config::CONFIG['NM']} -p #{nmopt} #{fn.escape}).grep(/ T _?([a-zA-Z0-9_]+)/) {|m| $1} ++ %x(#{Config::CONFIG['NM']} -p #{nmopt} #{fn.escape}).lines.grep(/ T _?([a-zA-Z0-9_]+)/) {|m| $1} + end + + def locate_lib(libpath, name, symbol=nil) +@@ -163,4 +163,4 @@ + Config::CONFIG['BUILD_TYPE'] = 'static' + Config::CONFIG['OS_NAME'] = 'Linux' + p find_libs(paths, libs, symbols_needed) +-end +\ No newline at end of file ++end Added: trunk/jblas/debian/patches/series =================================================================== --- trunk/jblas/debian/patches/series (rev 0) +++ trunk/jblas/debian/patches/series 2014-01-04 23:16:52 UTC (rev 17630) @@ -0,0 +1 @@ +build-with-ruby19.patch Modified: trunk/jblas/debian/rules =================================================================== --- trunk/jblas/debian/rules 2013-12-31 21:25:27 UTC (rev 17629) +++ trunk/jblas/debian/rules 2014-01-04 23:16:52 UTC (rev 17630) @@ -7,15 +7,28 @@ DEB_ANT_BUILDFILE := build.xml DEB_ANT_BUILD_TARGET := minimal-jar javadoc DEB_ANT_CLEAN_TARGET := clean clean-jars -DEB_JARS := ant-nodeps.jar +DEB_ANT_CHECK_TARGET := test +DEB_JARS := ant-nodeps.jar junit4.jar ant-junit4.jar ant-junit.jar +# tell CDBS to be more verbose +DEB_VERBOSE_ALL := true + +# override DEB_ANT_INVOKE +#DEB_ANT_INVOKE := export LOCPATH=$(CURDIR)/debian/tmp/locale/ && export LC_ALL=en_US.UTF-8 && $(DEB_ANT_INVOKE) + clean:: make clean || true debian/stamp-ant-build: debian/stamp-jblas-build debian/stamp-jblas-build: - ./configure --libpath=/usr/lib:/usr/lib/atlas - make + mkdir -p debian/tmp/locale/ + 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:/usr/lib/atlas + export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \ + export LC_ALL=en_US.UTF-8 && \ + make touch $@ install/jblas:: _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
