--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear Release Team,
Please unblock package armadillo. Upstream has sent the following
patch as a bug fix. I have CCed upstream (Conrad) here for any
questions that may arise.
Please let me know if there is any further clarification or action
required from my side.
Thanks.
Kumar
diff -urN armadillo-7.600.2+dfsg-1/debian/changelog armadillo-7.600.2+dfsg/debian/changelog
--- armadillo-7.600.2+dfsg-1/debian/changelog 2016-12-24 21:19:03.000000000 +0530
+++ armadillo-7.600.2+dfsg/debian/changelog 2017-02-19 12:24:41.000000000 +0530
@@ -1,3 +1,9 @@
+armadillo (1:7.600.2+dfsg-2) unstable; urgency=medium
+
+ * Add patch for conv_alias from upstream
+
+ -- Kumar Appaiah <akumar@debian.org> Sun, 19 Feb 2017 12:24:41 +0530
+
armadillo (1:7.600.2+dfsg-1) unstable; urgency=medium
* New upstream release
diff -urN armadillo-7.600.2+dfsg-1/debian/control armadillo-7.600.2+dfsg/debian/control
--- armadillo-7.600.2+dfsg-1/debian/control 2016-12-24 21:18:46.000000000 +0530
+++ armadillo-7.600.2+dfsg/debian/control 2017-02-19 12:18:39.000000000 +0530
@@ -2,7 +2,7 @@
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
Uploaders: Kumar Appaiah <akumar@debian.org>
-Build-Depends: debhelper (>= 7), libblas-dev, liblapack-dev, cmake, libarpack2-dev, dpkg-dev (>= 1.16.1~), libsuperlu-dev (>= 5.2)
+Build-Depends: debhelper (>= 7), libblas-dev, liblapack-dev, cmake, libarpack2-dev, dpkg-dev (>= 1.16.1~), libsuperlu-dev (>= 5.2), quilt
Standards-Version: 3.9.8
Section: libs
Homepage: http://arma.sourceforge.net/
diff -urN armadillo-7.600.2+dfsg-1/debian/patches/conv_alias_fix.patch armadillo-7.600.2+dfsg/debian/patches/conv_alias_fix.patch
--- armadillo-7.600.2+dfsg-1/debian/patches/conv_alias_fix.patch 1970-01-01 05:30:00.000000000 +0530
+++ armadillo-7.600.2+dfsg/debian/patches/conv_alias_fix.patch 2017-02-19 12:06:43.000000000 +0530
@@ -0,0 +1,44 @@
+diff --git a/include/armadillo_bits/glue_conv_meat.hpp b/include/armadillo_bits/glue_conv_meat.hpp
+index eb515c4a..d3b7a7f2 100644
+--- a/include/armadillo_bits/glue_conv_meat.hpp
++++ b/include/armadillo_bits/glue_conv_meat.hpp
+@@ -28,8 +28,6 @@ glue_conv::apply(Mat<eT>& out, const Mat<eT>& A, const Mat<eT>& B, const bool A_
+ const uword x_n_elem = x.n_elem;
+ const uword out_n_elem = ((h_n_elem + x_n_elem) > 0) ? (h_n_elem + x_n_elem - 1) : uword(0);
+
+- (A_is_col) ? out.set_size(out_n_elem, 1) : out.set_size(1, out_n_elem);
+-
+ if( (h_n_elem == 0) || (x_n_elem == 0) ) { out.zeros(); return; }
+
+
+@@ -52,6 +50,8 @@ glue_conv::apply(Mat<eT>& out, const Mat<eT>& A, const Mat<eT>& B, const bool A_
+ arrayops::copy( &(xx_mem[h_n_elem_m1]), x_mem, x_n_elem );
+
+
++ (A_is_col) ? out.set_size(out_n_elem, 1) : out.set_size(1, out_n_elem);
++
+ eT* out_mem = out.memptr();
+
+ for(uword i=0; i < out_n_elem; ++i)
+@@ -132,10 +132,9 @@ glue_conv2::apply(Mat<eT>& out, const Mat<eT>& A, const Mat<eT>& B)
+ const uword out_n_rows = ((W.n_rows + G.n_rows) > 0) ? (W.n_rows + G.n_rows - 1) : uword(0);
+ const uword out_n_cols = ((W.n_cols + G.n_cols) > 0) ? (W.n_cols + G.n_cols - 1) : uword(0);
+
+- out.set_size( out_n_rows, out_n_cols );
+-
+ if(G.is_empty() || W.is_empty()) { out.zeros(); return; }
+
++
+ Mat<eT> H(G.n_rows, G.n_cols); // flipped filter coefficients
+
+ const uword H_n_rows = H.n_rows;
+@@ -159,6 +158,9 @@ glue_conv2::apply(Mat<eT>& out, const Mat<eT>& A, const Mat<eT>& B)
+
+ X( H_n_rows_m1, H_n_cols_m1, arma::size(W) ) = W; // zero padded version of 2D image
+
++
++ out.set_size( out_n_rows, out_n_cols );
++
+ for(uword col=0; col < out_n_cols; ++col)
+ {
+ eT* out_colptr = out.colptr(col);
diff -urN armadillo-7.600.2+dfsg-1/debian/patches/series armadillo-7.600.2+dfsg/debian/patches/series
--- armadillo-7.600.2+dfsg-1/debian/patches/series 1970-01-01 05:30:00.000000000 +0530
+++ armadillo-7.600.2+dfsg/debian/patches/series 2017-02-19 12:03:02.000000000 +0530
@@ -0,0 +1 @@
+conv_alias_fix.patch
diff -urN armadillo-7.600.2+dfsg-1/debian/rules armadillo-7.600.2+dfsg/debian/rules
--- armadillo-7.600.2+dfsg-1/debian/rules 2016-12-24 21:18:46.000000000 +0530
+++ armadillo-7.600.2+dfsg/debian/rules 2017-02-19 12:09:20.000000000 +0530
@@ -11,6 +11,7 @@
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
+include /usr/share/quilt/quilt.make
CFLAGS+=$(CPPFLAGS)
CXXFLAGS+=$(CPPFLAGS)
unblock armadillo/1:7.600.2+dfsg-2
-- System Information:
Debian Release: 9.0
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_IN.UTF-8, LC_CTYPE=en_IN.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Kumar Appaiah
--- End Message ---