Followup-For: Bug #715107
Control: tag -1 patch pending

Hi,

I prepared a patch fixing several issues in scotch and will upload it to
DELAYED/5. Please let me know if I should delay it longer or reschedule.

Andreas
diff -Nru scotch-5.1.12b.dfsg/debian/changelog scotch-5.1.12b.dfsg/debian/changelog
--- scotch-5.1.12b.dfsg/debian/changelog	2012-07-17 10:51:39.000000000 +0200
+++ scotch-5.1.12b.dfsg/debian/changelog	2017-03-17 23:23:06.000000000 +0100
@@ -1,3 +1,16 @@
+scotch (5.1.12b.dfsg-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop DMUA.
+  * Remove Christophe Prud'homme from Uploaders.  (Closes: #835019)
+  * libptscotch-5.1: Fix library installation path.  (Closes: #715107)
+  * libscotchmetis-dev: Fix libmetis.* -> libscotchmetis.* links.
+  * libscotchparmetis-dev: Fix libparmetis.* -> libptscotchparmetis.* links.
+    (Closes: #715112, #816109)
+  * Make package build reproducibly, thanks to Dhole.  (Closes: #787997)
+
+ -- Andreas Beckmann <a...@debian.org>  Fri, 17 Mar 2017 23:23:06 +0100
+
 scotch (5.1.12b.dfsg-2) unstable; urgency=low
 
   [ Christophe Trophime ]
diff -Nru scotch-5.1.12b.dfsg/debian/control scotch-5.1.12b.dfsg/debian/control
--- scotch-5.1.12b.dfsg/debian/control	2012-07-17 10:51:39.000000000 +0200
+++ scotch-5.1.12b.dfsg/debian/control	2017-03-17 23:23:00.000000000 +0100
@@ -2,10 +2,9 @@
 Section: math
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintain...@lists.alioth.debian.org>
-Uploaders: Christophe Prud'homme <prudh...@debian.org>,
+Uploaders:
  "Adam C. Powell, IV" <hazel...@debian.org>,
  Andreas Tille <ti...@debian.org>
-DM-Upload-Allowed: yes
 Build-Depends: quilt, debhelper (>= 7), bison, flex, zlib1g-dev, chrpath,
  mpi-default-dev, mpi-default-bin
 Standards-Version: 3.9.3
diff -Nru scotch-5.1.12b.dfsg/debian/libptscotch-5.1.install scotch-5.1.12b.dfsg/debian/libptscotch-5.1.install
--- scotch-5.1.12b.dfsg/debian/libptscotch-5.1.install	2012-07-17 10:51:39.000000000 +0200
+++ scotch-5.1.12b.dfsg/debian/libptscotch-5.1.install	2017-03-17 20:31:34.000000000 +0100
@@ -4,20 +4,20 @@
 int/lib/libptscotchparmetis-*.so /usr/lib
 int/lib/libptesmumps-*.so /usr/lib
 
-int32/lib/libptscotch-*.so /usr/lib/scotch_int32
-int32/lib/libptscotcherr-*.so /usr/lib/scotch_int32
-int32/lib/libptscotcherrexit-*.so /usr/lib/scotch_int32
-int32/lib/libptscotchparmetis-*.so /usr/lib/scotch_int32
-int32/lib/libptesmumps-*.so /usr/lib/scotch_int32
+int32/lib/libptscotch-*.so /usr/lib/scotch-int32
+int32/lib/libptscotcherr-*.so /usr/lib/scotch-int32
+int32/lib/libptscotcherrexit-*.so /usr/lib/scotch-int32
+int32/lib/libptscotchparmetis-*.so /usr/lib/scotch-int32
+int32/lib/libptesmumps-*.so /usr/lib/scotch-int32
 
-int64/lib/libptscotch-*.so /usr/lib/scotch_int64
-int64/lib/libptscotcherr-*.so /usr/lib/scotch_int64
-int64/lib/libptscotcherrexit-*.so /usr/lib/scotch_int64
-int64/lib/libptscotchparmetis-*.so /usr/lib/scotch_int64
-int64/lib/libptesmumps-*.so /usr/lib/scotch_int64
+int64/lib/libptscotch-*.so /usr/lib/scotch-int64
+int64/lib/libptscotcherr-*.so /usr/lib/scotch-int64
+int64/lib/libptscotcherrexit-*.so /usr/lib/scotch-int64
+int64/lib/libptscotchparmetis-*.so /usr/lib/scotch-int64
+int64/lib/libptesmumps-*.so /usr/lib/scotch-int64
 
-long/lib/libptscotch-*.so /usr/lib/scotch_long
-long/lib/libptscotcherr-*.so /usr/lib/scotch_long
-long/lib/libptscotcherrexit-*.so /usr/lib/scotch_long
-long/lib/libptscotchparmetis-*.so /usr/lib/scotch_long
-long/lib/libptesmumps-*.so /usr/lib/scotch_long
+long/lib/libptscotch-*.so /usr/lib/scotch-long
+long/lib/libptscotcherr-*.so /usr/lib/scotch-long
+long/lib/libptscotcherrexit-*.so /usr/lib/scotch-long
+long/lib/libptscotchparmetis-*.so /usr/lib/scotch-long
+long/lib/libptesmumps-*.so /usr/lib/scotch-long
diff -Nru scotch-5.1.12b.dfsg/debian/libscotchmetis-dev.install scotch-5.1.12b.dfsg/debian/libscotchmetis-dev.install
--- scotch-5.1.12b.dfsg/debian/libscotchmetis-dev.install	2012-07-17 10:51:39.000000000 +0200
+++ scotch-5.1.12b.dfsg/debian/libscotchmetis-dev.install	2017-03-17 21:27:37.000000000 +0100
@@ -3,16 +3,16 @@
 int/lib/libmetis.a /usr/lib
 
 int32/include/metis.h /usr/include/metis-int32
-int32/lib/libmetis.so /usr/lib/metis-int32
-int32/lib/libmetis.a /usr/lib/metis-int32
+#int32/lib/libmetis.so /usr/lib/metis-int32
+#int32/lib/libmetis.a /usr/lib/metis-int32
 
 int64/include/metis.h /usr/include/metis-int64
-int64/lib/libmetis.so /usr/lib/metis-int64
-int64/lib/libmetis.a /usr/lib/metis-int64
+#int64/lib/libmetis.so /usr/lib/metis-int64
+#int64/lib/libmetis.a /usr/lib/metis-int64
 
 long/include/metis.h /usr/include/metis-long
-long/lib/libmetis.so /usr/lib/metis-long
-long/lib/libmetis.a /usr/lib/metis-long
+#long/lib/libmetis.so /usr/lib/metis-long
+#long/lib/libmetis.a /usr/lib/metis-long
 
 doc/CeCILL-C_V1-en.txt /usr/share/doc/libscotchmetis-dev
 doc/CeCILL-C_V1-fr.txt /usr/share/doc/libscotchmetis-dev
diff -Nru scotch-5.1.12b.dfsg/debian/libscotchmetis-dev.links scotch-5.1.12b.dfsg/debian/libscotchmetis-dev.links
--- scotch-5.1.12b.dfsg/debian/libscotchmetis-dev.links	1970-01-01 01:00:00.000000000 +0100
+++ scotch-5.1.12b.dfsg/debian/libscotchmetis-dev.links	2017-03-17 21:27:18.000000000 +0100
@@ -0,0 +1,8 @@
+/usr/lib/scotch-int32/libscotchmetis.so	/usr/lib/metis-int32/libmetis.so
+/usr/lib/scotch-int32/libscotchmetis.a	/usr/lib/metis-int32/libmetis.a
+
+/usr/lib/scotch-int64/libscotchmetis.so	/usr/lib/metis-int64/libmetis.so
+/usr/lib/scotch-int64/libscotchmetis.a	/usr/lib/metis-int64/libmetis.a
+
+/usr/lib/scotch-long/libscotchmetis.so	/usr/lib/metis-long/libmetis.so
+/usr/lib/scotch-long/libscotchmetis.a	/usr/lib/metis-long/libmetis.a
diff -Nru scotch-5.1.12b.dfsg/debian/libscotchparmetis-dev.install scotch-5.1.12b.dfsg/debian/libscotchparmetis-dev.install
--- scotch-5.1.12b.dfsg/debian/libscotchparmetis-dev.install	2012-07-17 10:51:39.000000000 +0200
+++ scotch-5.1.12b.dfsg/debian/libscotchparmetis-dev.install	2017-03-17 21:51:27.000000000 +0100
@@ -3,16 +3,16 @@
 int/lib/libparmetis.a /usr/lib
 
 int32/include/parmetis.h /usr/include/parmetis-int32
-int32/lib/libparmetis.so /usr/lib/parmetis-int32
-int32/lib/libparmetis.a /usr/lib/parmetis-int32
+#int32/lib/libparmetis.so /usr/lib/parmetis-int32
+#int32/lib/libparmetis.a /usr/lib/parmetis-int32
 
 int64/include/parmetis.h /usr/include/parmetis-int64
-int64/lib/libparmetis.so /usr/lib/parmetis-int64
-int64/lib/libparmetis.a /usr/lib/parmetis-int64
+#int64/lib/libparmetis.so /usr/lib/parmetis-int64
+#int64/lib/libparmetis.a /usr/lib/parmetis-int64
 
 long/include/parmetis.h /usr/include/parmetis-long
-long/lib/libparmetis.so /usr/lib/parmetis-long
-long/lib/libparmetis.a /usr/lib/parmetis-long
+#long/lib/libparmetis.so /usr/lib/parmetis-long
+#long/lib/libparmetis.a /usr/lib/parmetis-long
 
 doc/CeCILL-C_V1-en.txt /usr/share/doc/libscotchparmetis-dev
 doc/CeCILL-C_V1-fr.txt /usr/share/doc/libscotchparmetis-dev
diff -Nru scotch-5.1.12b.dfsg/debian/libscotchparmetis-dev.links scotch-5.1.12b.dfsg/debian/libscotchparmetis-dev.links
--- scotch-5.1.12b.dfsg/debian/libscotchparmetis-dev.links	1970-01-01 01:00:00.000000000 +0100
+++ scotch-5.1.12b.dfsg/debian/libscotchparmetis-dev.links	2017-03-17 22:00:24.000000000 +0100
@@ -0,0 +1,8 @@
+/usr/lib/scotch-int32/libptscotchparmetis.so	/usr/lib/parmetis-int32/libparmetis.so
+/usr/lib/scotch-int32/libptscotchparmetis.a	/usr/lib/parmetis-int32/libparmetis.a
+
+/usr/lib/scotch-int64/libptscotchparmetis.so	/usr/lib/parmetis-int64/libparmetis.so
+/usr/lib/scotch-int64/libptscotchparmetis.a	/usr/lib/parmetis-int64/libparmetis.a
+
+/usr/lib/scotch-long/libptscotchparmetis.so	/usr/lib/parmetis-long/libparmetis.so
+/usr/lib/scotch-long/libptscotchparmetis.a	/usr/lib/parmetis-long/libparmetis.a
diff -Nru scotch-5.1.12b.dfsg/debian/rules scotch-5.1.12b.dfsg/debian/rules
--- scotch-5.1.12b.dfsg/debian/rules	2012-07-17 10:51:39.000000000 +0200
+++ scotch-5.1.12b.dfsg/debian/rules	2017-03-17 22:43:21.000000000 +0100
@@ -117,7 +117,7 @@
 	cp debian/ptscotch_esmumps.1 int/share/man/man1	
 #	Fix lintian warnings
 	for file in $(shell ls int/bin); do \
-	   (cd int/share/man/man1 && gzip -9 $$file.1); \
+	   (cd int/share/man/man1 && gzip -9n $$file.1); \
 	done
 
 	for file in $(shell ls int/bin); do \
@@ -149,6 +149,7 @@
 	dh_install -i
 	dh_installdocs -i
 	dh_installchangelogs -i
+	dh_link -i
 	dh_compress -i -XMakefile -Xcc -Xinp
 	dh_fixperms -i
 	dh_installdeb -i
@@ -163,6 +164,7 @@
 	dh_install -a
 	dh_installdocs -a
 	dh_installchangelogs -a
+	dh_link -a
 	dh_strip -pscotch --dbg-package=scotch-dbg
 	dh_strip -pptscotch --dbg-package=ptscotch-dbg
 	dh_strip -plibscotch-5.1 --dbg-package=libscotch-dbg

Reply via email to