Bug#612621: Bugs #619935 & #612621 : most debian/* files rewritten + patches

Pierre Saramito Pierre.Saramito at imag.fr
Thu Mar 31 14:12:20 UTC 2011


Hi Adam and Johannes,

> From Adam:
> This is a very strange error in its irreproducibility...

Please find a tarball containing a new version of debian files,
together with git-status and git-diff files (some files are added,
others are removed). This new version fix two major bugs:

 #619935 FTBFS on several arches due to lex issue
 #612621 SCOTCH_dgraphInit: linking with both libScotch and libPTScotch is not allowed

For the second bug, I've run the two tests from Johannes and run more complex tests (the 
scotch library together with both pastix and rheolef, distributed environment).


Here is the changes (see debian/changelog) :

  * Separate compilations for static & shared libs (closes: #612621)
    Note: removing -DSCOTCH_PTHREAD was not sufficient
  * Add flags to flex & bison & gcc -DSCOTCH_RENAME_PARSER (closes: #619935)
  * All patches/* has been simplified & merged in one short file, for clarity


These patch has been successfully checked with pbuilder on two arch: i386 & amd64
and on sid, wheezy & squeeze dists. Also checked on ubuntu natty dist.

Could you, please upload these files ?

Pierre
-- 
Pierre.Saramito at imag.fr
Directeur de Recherche CNRS
Laboratoire Jean Kuntzmann, Grenoble, France
http://www-ljk.imag.fr/membres/Pierre.Saramito
-------------- next part --------------
A non-text attachment was scrubbed...
Name: scotch-debian.tgz
Type: application/x-gtar
Size: 24231 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/debian-science-maintainers/attachments/20110331/14d9c0ce/attachment-0003.tgz>
-------------- next part --------------
# On branch master
# Changes not staged for commit:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   debian/Makefile.inc
#	deleted:    debian/Makefile_int.inc
#	deleted:    debian/Makefile_int32.inc
#	deleted:    debian/Makefile_int64.inc
#	deleted:    debian/Makefile_long.inc
#	modified:   debian/changelog
#	modified:   debian/libptscotch-5.1.install
#	modified:   debian/libptscotch-dev.install
#	modified:   debian/libscotch-5.1.install
#	modified:   debian/libscotch-dev.install
#	modified:   debian/libscotchmetis-dev.install
#	modified:   debian/libscotchparmetis-dev.install
#	deleted:    debian/patches/esmumps-fix.patch
#	deleted:    debian/patches/fix_ftbfs_with_binutils_gold.patch
#	deleted:    debian/patches/install-libs.patch
#	deleted:    debian/patches/install.patch
#	deleted:    debian/patches/metis-header.patch
#	deleted:    debian/patches/mmkt-typo.patch
#	deleted:    debian/patches/ptscotch.patch
#	deleted:    debian/patches/scotch-include-mpi.patch
#	modified:   debian/patches/series
#	deleted:    debian/patches/shared-libs.patch
#	modified:   debian/rules
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	debian/Makefile_shlib_int.inc
#	debian/Makefile_shlib_int32.inc
#	debian/Makefile_shlib_int64.inc
#	debian/Makefile_shlib_long.inc
#	debian/Makefile_stlib_int.inc
#	debian/Makefile_stlib_int32.inc
#	debian/Makefile_stlib_int64.inc
#	debian/Makefile_stlib_long.inc
#	debian/patches/debian-changes-5.1.11.dfsg-5
no changes added to commit (use "git add" and/or "git commit -a")
-------------- next part --------------
diff --git a/debian/Makefile.inc b/debian/Makefile.inc
index 1976b06..83b7c11 100644
--- a/debian/Makefile.inc
+++ b/debian/Makefile.inc
@@ -6,11 +6,11 @@ MAKE	= make
 AR	= ar
 ARFLAGS	= -ruv
 CAT	= cat
-CCS	= gcc -I/usr/include/mpi -I/usr/include/lam
+CCS	= gcc -I/usr/include/mpi
 CCP     = mpicc
-CCD     = gcc -I/usr/include/mpi -I/usr/include/lam
-CFLAGS	= -O3 -I. -fPIC -I/usr/include/mpi -I/usr/include/lam -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME
-LDFLAGS	= -lz -lm -lrt
+CCD     = gcc -I/usr/include/mpi
+CFLAGS	= -O3 -I. -I/usr/include/mpi -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -Drestrict=__restrict 
+LDFLAGS	= -pthread -lz -lm -lrt
 CP	= cp
 LEX	= flex -Pscotchyy -olex.yy.c
 LN	= ln
diff --git a/debian/Makefile_int.inc b/debian/Makefile_int.inc
deleted file mode 100644
index afa4167..0000000
--- a/debian/Makefile_int.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-EXE	=
-LIB	= .a
-OBJ	= .o
-
-MAKE	= make
-AR	= ar
-ARFLAGS	= -ruv
-CAT	= cat
-CCS	= gcc -I/usr/include/mpi -I/usr/include/lam
-CCP     = mpicc
-CCD     = gcc -I/usr/include/mpi -I/usr/include/lam
-CFLAGS	= -O3 -I. -fPIC -I/usr/include/mpi -I/usr/include/lam -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_COLLECTIVE
-LDFLAGS	= -lz -lm -lrt
-CP	= cp
-LEX	= flex -Pscotchyy -olex.yy.c
-LN	= ln
-MKDIR	= mkdir
-MV	= mv
-RANLIB	= ranlib
-YACC	= bison -pscotchyy -y -b y
diff --git a/debian/Makefile_int32.inc b/debian/Makefile_int32.inc
deleted file mode 100644
index f13b2dc..0000000
--- a/debian/Makefile_int32.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-prefix  = ../int32
-EXE	=
-LIB	= .a
-OBJ	= .o
-
-MAKE	= make
-AR	= ar
-ARFLAGS	= -ruv
-CAT	= cat
-CCS	= gcc -I/usr/include/mpi -I/usr/include/lam
-CCP     = mpicc
-CCD     = gcc -I/usr/include/mpi -I/usr/include/lam
-CFLAGS	= -O3 -I. -fPIC -I/usr/include/mpi -I/usr/include/lam -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DINTSIZE32 -DSCOTCH_COLLECTIVE
-LDFLAGS	= -lz -lm -lrt
-CP	= cp
-LEX	= flex -Pscotchyy -olex.yy.c
-LN	= ln
-MKDIR	= mkdir
-MV	= mv
-RANLIB	= ranlib
-YACC	= bison -pscotchyy -y -b y
diff --git a/debian/Makefile_int64.inc b/debian/Makefile_int64.inc
deleted file mode 100644
index fb675cc..0000000
--- a/debian/Makefile_int64.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-EXE	=
-LIB	= .a
-OBJ	= .o
-
-MAKE	= make
-AR	= ar
-ARFLAGS	= -ruv
-CAT	= cat
-CCS	= gcc -I/usr/include/mpi -I/usr/include/lam
-CCP     = mpicc
-CCD     = gcc -I/usr/include/mpi -I/usr/include/lam
-CFLAGS	= -O3 -I. -fPIC -I/usr/include/mpi -I/usr/include/lam -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DINTSIZE64 -DSCOTCH_COLLECTIVE
-LDFLAGS	= -lz -lm -lrt
-CP	= cp
-LEX	= flex -Pscotchyy -olex.yy.c
-LN	= ln
-MKDIR	= mkdir
-MV	= mv
-RANLIB	= ranlib
-YACC	= bison -pscotchyy -y -b y
diff --git a/debian/Makefile_long.inc b/debian/Makefile_long.inc
deleted file mode 100644
index 195b85b..0000000
--- a/debian/Makefile_long.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-EXE	=
-LIB	= .a
-OBJ	= .o
-
-MAKE	= make
-AR	= ar
-ARFLAGS	= -ruv
-CAT	= cat
-CCS	= gcc -I/usr/include/mpi -I/usr/include/lam
-CCP     = mpicc
-CCD     = gcc -I/usr/include/mpi -I/usr/include/lam
-CFLAGS	= -O3 -I. -fPIC -I/usr/include/mpi -I/usr/include/lam -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DLONG -DSCOTCH_COLLECTIVE
-LDFLAGS	= -lz -lm -lrt
-CP	= cp
-LEX	= flex -Pscotchyy -olex.yy.c
-LN	= ln
-MKDIR	= mkdir
-MV	= mv
-RANLIB	= ranlib
-YACC	= bison -pscotchyy -y -b y
diff --git a/debian/changelog b/debian/changelog
index 3069912..c3a315b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
-scotch (5.1.11.dfsg-5) UNRELEASED; urgency=low
+scotch (5.1.11.dfsg-5) unstable; urgency=low
 
-  [Johannes Ring]
-  * Change -lscotch to $(LIBSCOTCHDEPS) to facilitate linking with libscotch
-    and libptscotch together (closes: #612621)
-  * Update Makefile.inc LEX and YACC commands based on
-    src/Make.inc/Makefile.inc.i686_pc_linux2 (closes: #619935)
+  [Pierre Saramito]
+  * Separate compilations for static & shared libs (closes: #612621)
+    Note: removing -DSCOTCH_PTHREAD was not sufficient
+  * Add flags to flex & bison & gcc -DSCOTCH_RENAME_PARSER (closes: #619935)
+  * All patches/* has been simplified & merged in one short file, for clarity
 
- -- "Adam C. Powell, IV" <hazelsct at debian.org>  Wed, 30 Mar 2011 09:46:48 -0400
+ -- "Adam C. Powell, IV" <hazelsct at debian.org>  Sun, 31 Mar 2011 06:12:03 -0400
 
 scotch (5.1.11.dfsg-4) unstable; urgency=low
 
diff --git a/debian/libptscotch-5.1.install b/debian/libptscotch-5.1.install
index d1861b5..7db66af 100644
--- a/debian/libptscotch-5.1.install
+++ b/debian/libptscotch-5.1.install
@@ -1,23 +1,4 @@
-int/lib/libptscotch-*.so /usr/lib
-int/lib/libptscotcherr-*.so /usr/lib
-int/lib/libptscotcherrexit-*.so /usr/lib
-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
-
-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
+int/lib/libpt*.so   /usr/lib
+long/lib/libpt*.so  /usr/lib/scotch_long
+int32/lib/libpt*.so /usr/lib/scotch_int32
+int64/lib/libpt*.so /usr/lib/scotch_int64
diff --git a/debian/libptscotch-dev.install b/debian/libptscotch-dev.install
index e9eea77..07f4f59 100644
--- a/debian/libptscotch-dev.install
+++ b/debian/libptscotch-dev.install
@@ -1,46 +1,22 @@
-int/include/ptscotch.h /usr/include/scotch
+int/include/ptscotch.h  /usr/include/scotch
 int/include/ptscotchf.h /usr/include/scotch
+int/lib/libptscotch*.a  /usr/lib
+int/lib/libptesmumps.a  /usr/lib
 
-int/lib/libptscotch*.a /usr/lib
-int/lib/libptscotch.so /usr/lib
-int/lib/libptscotcherr.so /usr/lib
-int/lib/libptscotcherrexit.so /usr/lib
-int/lib/libptscotchparmetis.so /usr/lib
-int/lib/libptesmumps.a /usr/lib
-int/lib/libptesmumps.so /usr/lib
-
-int32/include/ptscotch.h /usr/include/scotch-int32
+int32/include/ptscotch.h  /usr/include/scotch-int32
 int32/include/ptscotchf.h /usr/include/scotch-int32
+int32/lib/libptscotch*.a  /usr/lib/scotch-int32
+int32/lib/libptesmumps.a  /usr/lib/scotch-int32
 
-int32/lib/libptscotch*.a /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.a /usr/lib/scotch-int32
-int32/lib/libptesmumps.so /usr/lib/scotch-int32
-
-int64/include/ptscotch.h /usr/include/scotch-int64
+int64/include/ptscotch.h  /usr/include/scotch-int64
 int64/include/ptscotchf.h /usr/include/scotch-int64
+int64/lib/libptscotch*.a  /usr/lib/scotch-int64
+int64/lib/libptesmumps.a  /usr/lib/scotch-int64
 
-int64/lib/libptscotch*.a /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.a /usr/lib/scotch-int64
-int64/lib/libptesmumps.so /usr/lib/scotch-int64
-
-long/include/ptscotch.h /usr/include/scotch-long
+long/include/ptscotch.h  /usr/include/scotch-long
 long/include/ptscotchf.h /usr/include/scotch-long
-
-long/lib/libptscotch*.a /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.a /usr/lib/scotch-long
-long/lib/libptesmumps.so /usr/lib/scotch-long
+long/lib/libptscotch*.a  /usr/lib/scotch-long
+long/lib/libptesmumps.a  /usr/lib/scotch-long
 
 doc/CeCILL-C_V1-en.txt /usr/share/doc/libptscotch-dev
 doc/CeCILL-C_V1-fr.txt /usr/share/doc/libptscotch-dev
diff --git a/debian/libscotch-5.1.install b/debian/libscotch-5.1.install
index fbe2116..6a78d29 100644
--- a/debian/libscotch-5.1.install
+++ b/debian/libscotch-5.1.install
@@ -1,23 +1,11 @@
-int/lib/libscotch-*.so /usr/lib
-int/lib/libscotcherr-*.so /usr/lib
-int/lib/libscotcherrexit-*.so /usr/lib
-int/lib/libscotchmetis-*.so /usr/lib
-int/lib/libesmumps-*.so /usr/lib
+int/lib/libscotch*.so   /usr/lib
+int/lib/libes*.so       /usr/lib
 
-int32/lib/libscotch-*.so /usr/lib/scotch-int32
-int32/lib/libscotcherr-*.so /usr/lib/scotch-int32
-int32/lib/libscotcherrexit-*.so /usr/lib/scotch-int32
-int32/lib/libscotchmetis-*.so /usr/lib/scotch-int32
-int32/lib/libesmumps-*.so /usr/lib/scotch-int32
+long/lib/libscotch*.so  /usr/lib/scotch-long
+long/lib/libes*.so      /usr/lib/scotch-long
 
-int64/lib/libscotch-*.so /usr/lib/scotch-int64
-int64/lib/libscotcherr-*.so /usr/lib/scotch-int64
-int64/lib/libscotcherrexit-*.so /usr/lib/scotch-int64
-int64/lib/libscotchmetis-*.so /usr/lib/scotch-int64
-int64/lib/libesmumps-*.so /usr/lib/scotch-int64
+int32/lib/libscotch*.so /usr/lib/scotch-int32
+int32/lib/libes*.so     /usr/lib/scotch-int32
 
-long/lib/libscotch-*.so /usr/lib/scotch-long
-long/lib/libscotcherr-*.so /usr/lib/scotch-long
-long/lib/libscotcherrexit-*.so /usr/lib/scotch-long
-long/lib/libscotchmetis-*.so /usr/lib/scotch-long
-long/lib/libesmumps-*.so /usr/lib/scotch-long
+int64/lib/libscotch*.so /usr/lib/scotch-int64
+int64/lib/libes*.so     /usr/lib/scotch-int64
diff --git a/debian/libscotch-dev.install b/debian/libscotch-dev.install
index 1701640..b15169b 100644
--- a/debian/libscotch-dev.install
+++ b/debian/libscotch-dev.install
@@ -1,62 +1,38 @@
-int/include/esmumps.h    /usr/include/scotch
-int/include/scotch.h    /usr/include/scotch
-int/include/scotchf.h    /usr/include/scotch
-
-int/lib/libscotch.a /usr/lib
-int/lib/libscotcherr.a /usr/lib
+int/include/esmumps.h      /usr/include/scotch
+int/include/scotch.h       /usr/include/scotch
+int/include/scotchf.h      /usr/include/scotch
+int/lib/libscotch.a        /usr/lib
+int/lib/libscotcherr.a     /usr/lib
 int/lib/libscotcherrexit.a /usr/lib
-int/lib/libscotchmetis.a /usr/lib
-int/lib/libesmumps.a /usr/lib
-int/lib/libscotch.so /usr/lib
-int/lib/libscotcherr.so /usr/lib
-int/lib/libscotcherrexit.so /usr/lib
-int/lib/libscotchmetis.so /usr/lib
-int/lib/libesmumps.so /usr/lib
-
-int32/include/esmumps.h    /usr/include/scotch-int32
-int32/include/scotch.h    /usr/include/scotch-int32
-int32/include/scotchf.h    /usr/include/scotch-int32
-
-int32/lib/libscotch.a /usr/lib/scotch-int32
-int32/lib/libscotcherr.a /usr/lib/scotch-int32
+int/lib/libscotchmetis.a   /usr/lib
+int/lib/libesmumps.a       /usr/lib
+
+int32/include/esmumps.h      /usr/include/scotch-int32
+int32/include/scotch.h       /usr/include/scotch-int32
+int32/include/scotchf.h      /usr/include/scotch-int32
+int32/lib/libscotch.a        /usr/lib/scotch-int32
+int32/lib/libscotcherr.a     /usr/lib/scotch-int32
 int32/lib/libscotcherrexit.a /usr/lib/scotch-int32
-int32/lib/libscotchmetis.a /usr/lib/scotch-int32
-int32/lib/libesmumps.a /usr/lib/scotch-int32
-int32/lib/libscotch.so /usr/lib/scotch-int32
-int32/lib/libscotcherr.so /usr/lib/scotch-int32
-int32/lib/libscotcherrexit.so /usr/lib/scotch-int32
-int32/lib/libscotchmetis.so /usr/lib/scotch-int32
-int32/lib/libesmumps.so /usr/lib/scotch-int32
-
-int64/include/esmumps.h    /usr/include/scotch-int64
-int64/include/scotch.h    /usr/include/scotch-int64
-int64/include/scotchf.h    /usr/include/scotch-int64
-
-int64/lib/libscotch.a /usr/lib/scotch-int64
-int64/lib/libscotcherr.a /usr/lib/scotch-int64
+int32/lib/libscotchmetis.a   /usr/lib/scotch-int32
+int32/lib/libesmumps.a       /usr/lib/scotch-int32
+
+int64/include/esmumps.h      /usr/include/scotch-int64
+int64/include/scotch.h       /usr/include/scotch-int64
+int64/include/scotchf.h      /usr/include/scotch-int64
+int64/lib/libscotch.a        /usr/lib/scotch-int64
+int64/lib/libscotcherr.a     /usr/lib/scotch-int64
 int64/lib/libscotcherrexit.a /usr/lib/scotch-int64
-int64/lib/libscotchmetis.a /usr/lib/scotch-int64
-int64/lib/libesmumps.a /usr/lib/scotch-int64
-int64/lib/libscotch.so /usr/lib/scotch-int64
-int64/lib/libscotcherr.so /usr/lib/scotch-int64
-int64/lib/libscotcherrexit.so /usr/lib/scotch-int64
-int64/lib/libscotchmetis.so /usr/lib/scotch-int64
-int64/lib/libesmumps.so /usr/lib/scotch-int64
-
-long/include/esmumps.h    /usr/include/scotch-long
-long/include/scotch.h    /usr/include/scotch-long
-long/include/scotchf.h    /usr/include/scotch-long
-
-long/lib/libscotch.a /usr/lib/scotch-long
-long/lib/libscotcherr.a /usr/lib/scotch-long
+int64/lib/libscotchmetis.a   /usr/lib/scotch-int64
+int64/lib/libesmumps.a       /usr/lib/scotch-int64
+
+long/include/esmumps.h      /usr/include/scotch-long
+long/include/scotch.h       /usr/include/scotch-long
+long/include/scotchf.h      /usr/include/scotch-long
+long/lib/libscotch.a        /usr/lib/scotch-long
+long/lib/libscotcherr.a     /usr/lib/scotch-long
 long/lib/libscotcherrexit.a /usr/lib/scotch-long
-long/lib/libscotchmetis.a /usr/lib/scotch-long
-long/lib/libesmumps.a /usr/lib/scotch-long
-long/lib/libscotch.so /usr/lib/scotch-long
-long/lib/libscotcherr.so /usr/lib/scotch-long
-long/lib/libscotcherrexit.so /usr/lib/scotch-long
-long/lib/libscotchmetis.so /usr/lib/scotch-long
-long/lib/libesmumps.so /usr/lib/scotch-long
+long/lib/libscotchmetis.a   /usr/lib/scotch-long
+long/lib/libesmumps.a       /usr/lib/scotch-long
 
 doc/CeCILL-C_V1-en.txt /usr/share/doc/libscotch-dev
 doc/CeCILL-C_V1-fr.txt /usr/share/doc/libscotch-dev
diff --git a/debian/libscotchmetis-dev.install b/debian/libscotchmetis-dev.install
index efd6b7d..df935d9 100644
--- a/debian/libscotchmetis-dev.install
+++ b/debian/libscotchmetis-dev.install
@@ -1,18 +1,18 @@
 int/include/metis.h /usr/include/metis
+int/lib/libmetis.a  /usr/lib
 int/lib/libmetis.so /usr/lib
-int/lib/libmetis.a /usr/lib
+
+long/include/metis.h /usr/include/metis-long
+long/lib/libmetis.a  /usr/lib/metis-long
+long/lib/libmetis.so /usr/lib/metis-long
 
 int32/include/metis.h /usr/include/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.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
 
 doc/CeCILL-C_V1-en.txt /usr/share/doc/libscotchmetis-dev
 doc/CeCILL-C_V1-fr.txt /usr/share/doc/libscotchmetis-dev
diff --git a/debian/libscotchparmetis-dev.install b/debian/libscotchparmetis-dev.install
index b3b0828..16803d6 100644
--- a/debian/libscotchparmetis-dev.install
+++ b/debian/libscotchparmetis-dev.install
@@ -1,18 +1,18 @@
 int/include/parmetis.h /usr/include/parmetis
+int/lib/libparmetis.a  /usr/lib
 int/lib/libparmetis.so /usr/lib
-int/lib/libparmetis.a /usr/lib
+
+long/include/parmetis.h /usr/include/parmetis-long
+long/lib/libparmetis.a  /usr/lib/parmetis-long
+long/lib/libparmetis.so /usr/lib/parmetis-long
 
 int32/include/parmetis.h /usr/include/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.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
 
 doc/CeCILL-C_V1-en.txt /usr/share/doc/libscotchparmetis-dev
 doc/CeCILL-C_V1-fr.txt /usr/share/doc/libscotchparmetis-dev
diff --git a/debian/patches/esmumps-fix.patch b/debian/patches/esmumps-fix.patch
deleted file mode 100644
index e649239..0000000
--- a/debian/patches/esmumps-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: scotch-5.1.11.dfsg/src/esmumps/Makefile
-===================================================================
---- scotch-5.1.11.dfsg.orig/src/esmumps/Makefile	2011-01-27 08:56:18.000000000 +0100
-+++ scotch-5.1.11.dfsg/src/esmumps/Makefile	2011-01-27 09:03:20.000000000 +0100
-@@ -55,24 +55,26 @@
- scotch				:	clean
- 					$(MAKE) CC="$(CCS)" CCD="$(CCS)" SCOTCHLIB=scotch ESMUMPSLIB=esmumps	\
- 					libesmumps$(LIB)							\
--					main_esmumps$(EXE)
-+					scotch_esmumps$(EXE)
- 
- ptscotch			:	clean
- 					$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps	\
- 					LD_LIBRARY_PATH=$(libdir)		\
- 					libesmumps$(LIB)										\
--					main_esmumps$(EXE)
-+					ptscotch_esmumps$(EXE)
- 
- install				:
- 					-$(CP) esmumps.h $(includedir)
--					-$(CP) libesmumps$(LIB) $(libdir)
-+					-$(CP) -a libesmumps$(LIB) libesmumps*.so $(libdir)
-+					-$(CP) scotch_esmumps$(EXE) $(bindir)
- 
- ptinstall			:
- 					-$(CP) esmumps.h $(includedir)
--					-$(CP) libptesmumps$(LIB) $(libdir)
-+					-$(CP) -a libptesmumps$(LIB) libptesmumps*.so $(libdir)
-+					-$(CP) ptscotch_esmumps$(EXE) $(bindir)
- 
- clean				:
--					-$(RM) *~ common.h *$(OBJ) lib*$(LIB) main_esmumps$(EXE)
-+					-$(RM) *~ common.h *$(OBJ) lib*$(LIB) lib*.so main_esmumps$(EXE) scotch_esmumps$(EXE) ptscotch_esmumps$(EXE)
- 
- realclean			:	clean
- 
-@@ -166,3 +168,9 @@
- 					lib$(ESMUMPSLIB)$(LIB)			\
- 					$(libdir)/lib$(SCOTCHLIB)$(LIB)		\
- 					$(libdir)/lib$(SCOTCHLIB)errexit$(LIB)
-+
-+scotch_esmumps$(EXE): main_esmumps$(EXE)
-+	mv $< $@
-+
-+ptscotch_esmumps$(EXE): main_esmumps$(EXE)
-+	mv $< $@
diff --git a/debian/patches/fix_ftbfs_with_binutils_gold.patch b/debian/patches/fix_ftbfs_with_binutils_gold.patch
deleted file mode 100644
index 8aac7e8..0000000
--- a/debian/patches/fix_ftbfs_with_binutils_gold.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Reorder LDFLAGS and add -lscotch-5.1 to fix ftbfs with binutils-gold
-Author: Angel Abad <angelabad at ubuntu.com>
-Bug-Debian: http://bugs.debian.org/612170
-
---- a/src/esmumps/Makefile
-+++ b/src/esmumps/Makefile
-@@ -44,7 +44,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) $(LDFLAGS) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit
-+		 		$(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -lscotch-5.1
- 
- ##
- ##  Project rules.
---- a/src/scotch/Makefile
-+++ b/src/scotch/Makefile
-@@ -47,7 +47,7 @@
- 				$(CC) $(CFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -lscotch-5.1
- 
- ##
- ##  Project rules.
diff --git a/debian/patches/install-libs.patch b/debian/patches/install-libs.patch
deleted file mode 100644
index e44c5eb..0000000
--- a/debian/patches/install-libs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Install shared libraries properly
-
-Index: scotch-5.1.11.dfsg/src/libscotchmetis/Makefile
-===================================================================
---- scotch-5.1.11.dfsg.orig/src/libscotchmetis/Makefile	2011-01-27 08:12:17.000000000 +0100
-+++ scotch-5.1.11.dfsg/src/libscotchmetis/Makefile	2011-01-27 08:14:44.000000000 +0100
-@@ -61,15 +61,15 @@
- 					libptscotchparmetis$(LIB)
- 
- install				:	scotch
--					-$(CP) metis.h $(includedir)
--					-$(CP) libscotchmetis$(LIB) $(libdir)
-+					$(CP) -a metis.h $(includedir)
-+					$(CP) -a libscotchmetis$(LIB) libscotchmetis*so $(libdir)
- 
- ptinstall			:	ptscotch
--					-$(CP) parmetis.h $(includedir)
--					-$(CP) libptscotchparmetis$(LIB) $(libdir)
-+					$(CP) -a parmetis.h $(includedir)
-+					$(CP) -a libptscotchparmetis$(LIB) libptscotchparmetis*so $(libdir)
- 
- clean				:
--					-$(RM) *~ *$(OBJ) lib*$(LIB)
-+					-$(RM) *~ *$(OBJ) lib*$(LIB) lib*.so
- 
- realclean			:	clean
- 
-Index: scotch-5.1.11.dfsg/src/libscotch/Makefile
-===================================================================
---- scotch-5.1.11.dfsg.orig/src/libscotch/Makefile	2011-01-27 08:12:17.000000000 +0100
-+++ scotch-5.1.11.dfsg/src/libscotch/Makefile	2011-01-27 08:17:54.000000000 +0100
-@@ -69,16 +69,16 @@
- 					libptscotcherrexit$(LIB)
- 
- install				:
--					-$(CP) scotch.h scotchf.h $(includedir)
--					-$(CP) libscotch$(LIB) libscotcherr*$(LIB) $(libdir)
-+					$(CP) -a scotch.h scotchf.h $(includedir)
-+					$(CP) -a libscotch$(LIB) libscotcherr*$(LIB) libscotch*.so $(libdir)
- 
- ptinstall			:
--					-$(CP) scotch.h $(includedir)/ptscotch.h
--					-$(CP) scotchf.h $(includedir)/ptscotchf.h
--					-$(CP) libptscotch*$(LIB) $(libdir)
-+					$(CP) -a scotch.h $(includedir)/ptscotch.h
-+					$(CP) -a scotchf.h $(includedir)/ptscotchf.h
-+					$(CP) -a libptscotch*$(LIB) libptscotch*.so $(libdir)
- 
- clean				:
--					-$(RM) *~ *$(OBJ) lib*$(LIB) parser_yy.c parser_ly.h parser_ll.c *scotch.h *scotchf.h y.output dummysizes$(EXE)
-+					-$(RM) *~ *$(OBJ) lib*$(LIB) lib*.so parser_yy.c parser_ly.h parser_ll.c *scotch.h *scotchf.h y.output dummysizes$(EXE)
- 
- realclean			:	clean
- 
diff --git a/debian/patches/install.patch b/debian/patches/install.patch
deleted file mode 100644
index f75c555..0000000
--- a/debian/patches/install.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: scotch-5.1.11.dfsg/src/Makefile
-===================================================================
---- scotch-5.1.11.dfsg.orig/src/Makefile	2011-01-27 09:04:02.000000000 +0100
-+++ scotch-5.1.11.dfsg/src/Makefile	2011-01-27 09:19:42.000000000 +0100
-@@ -103,8 +103,16 @@
- 
- install				:	required	$(bindir)	$(includedir)	$(libdir)	$(mandir)/man1
- 					-$(CP) -f ../bin/[agm]*$(EXE) $(bindir)
-+					-$(CP) -f ../bin/dg*$(EXE) $(bindir)
-+					-$(CP) -f ../bin/*scotch_esmumps$(EXE) $(bindir)
- 					-$(CP) -f ../include/*scotch*.h $(includedir)
--					-$(CP) -f ../lib/*scotch*$(LIB) $(libdir)
-+					-$(CP) -f ../include/*metis*.h $(includedir)
-+					-$(CP) -f ../include/*esmumps*.h $(includedir)
-+					-$(CP) -af ../lib/*scotch*$(LIB) $(libdir)
-+					-$(CP) -af ../lib/*scotch*.so $(libdir)
-+					-$(CP) -af ../lib/*esmumps*$(LIB) $(libdir)
-+					-$(CP) -af ../lib/*esmumps*.so $(libdir)
-+					-$(CP) -af ../lib/*metis*.so $(libdir)
- 					-$(CP) -Rf ../man/* $(mandir)
- 
- clean				:	required
diff --git a/debian/patches/metis-header.patch b/debian/patches/metis-header.patch
deleted file mode 100644
index 9429c8b..0000000
--- a/debian/patches/metis-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: scotch-5.1.10b.dfsg/src/libscotchmetis/metis.h
-===================================================================
---- scotch-5.1.10b.dfsg.orig/src/libscotchmetis/metis.h	2010-10-18 17:08:25.000000000 +0200
-+++ scotch-5.1.10b.dfsg/src/libscotchmetis/metis.h	2010-10-18 17:08:52.000000000 +0200
-@@ -82,6 +82,8 @@
- #define METISNAME4(p,s)             p##s
- #endif /* METISNAMEL */
- 
-+typedef int idxtype;
-+
- /*
- **  The function prototypes.
- */
diff --git a/debian/patches/mmkt-typo.patch b/debian/patches/mmkt-typo.patch
deleted file mode 100644
index e08e3ef..0000000
--- a/debian/patches/mmkt-typo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scotch-5.0.6.dfsg/src/libscotch/library_graph_io_mmkt_f.c~	2008-03-14 18:15:59.000000000 +0000
-+++ scotch-5.0.6.dfsg/src/libscotch/library_graph_io_mmkt_f.c	2008-07-21 15:12:48.000000000 +0000
-@@ -121,7 +121,7 @@
- */
- 
- FORTRAN (                                             \
--SCOTCHFGRAPHGEOMSAVEMMKT, scotchfgraphgeomsavechac, ( \
-+SCOTCHFGRAPHGEOMSAVEMMKT, scotchfgraphgeomsavemmkt, ( \
- const SCOTCH_Graph * const  grafptr,                  \
- const SCOTCH_Geom * const   geomptr,                  \
- const int * const           filegrfptr,               \
diff --git a/debian/patches/ptscotch.patch b/debian/patches/ptscotch.patch
deleted file mode 100644
index a8a6eb1..0000000
--- a/debian/patches/ptscotch.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Add PT-SCOTCH support.
-
-Index: scotch-5.1.10b.dfsg/src/Makefile
-===================================================================
---- scotch-5.1.10b.dfsg.orig/src/Makefile	2010-10-18 17:10:37.000000000 +0200
-+++ scotch-5.1.10b.dfsg/src/Makefile	2010-10-18 17:10:41.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- .PHONY				:	clean	default	install	ptscotch	realclean	required	scotch
- 
--default				:	scotch
-+default				:	scotch ptscotch
- 
- required			:	Makefile.inc	../bin	../include	../lib
- 
diff --git a/debian/patches/scotch-include-mpi.patch b/debian/patches/scotch-include-mpi.patch
deleted file mode 100644
index b58aa37..0000000
--- a/debian/patches/scotch-include-mpi.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-library.h (and scotch.h generated from it) uses MPI types, so include mpi.h.
-
-Index: scotch-5.1.7.dfsg/src/libscotch/library.h
-===================================================================
---- scotch-5.1.7.dfsg.orig/src/libscotch/library.h	2010-03-15 15:06:36.000000000 -0400
-+++ scotch-5.1.7.dfsg/src/libscotch/library.h	2010-03-15 15:07:06.000000000 -0400
-@@ -72,6 +72,8 @@
- 
- #define SCOTCH_NUMMAX               DUMMYMAXINT
- 
-+#include <mpi/mpi.h>
-+
- /*+ Opaque objects. The dummy sizes of these objects,
- computed at compile-time by program "dummysizes",
- are given as double values for proper padding +*/
diff --git a/debian/patches/series b/debian/patches/series
index b6cbb0f..fb3f172 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1 @@
-fix_ftbfs_with_binutils_gold.patch
-shared-libs.patch
-metis-header.patch
-ptscotch.patch
-esmumps-fix.patch
-#scotch-include-mpi.patch
-install-libs.patch
-install.patch
+debian-changes-5.1.11.dfsg-5
diff --git a/debian/patches/shared-libs.patch b/debian/patches/shared-libs.patch
deleted file mode 100644
index 48a70b3..0000000
--- a/debian/patches/shared-libs.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Add proper shared libraries.
-
-Index: scotch/src/libscotchmetis/Makefile
-===================================================================
---- scotch.orig/src/libscotchmetis/Makefile
-+++ scotch/src/libscotchmetis/Makefile
-@@ -129,6 +129,8 @@
- 					parmetis_dgraph_order_f$(OBJ)		\
- 					parmetis_dgraph_part$(OBJ)		\
- 					parmetis_dgraph_part_f$(OBJ)
-+					$(CC) -shared -Wl,-soname,libptscotchparmetis-5.1.so $^ -L../libscotch -lptscotch -lscotch -o libptscotchparmetis-5.1.so
-+					ln -s libptscotchparmetis-5.1.so libptscotchparmetis.so
- 					$(AR) $(ARFLAGS) $(@) $(^)
- 					-$(RANLIB) $(@)
- 
-@@ -136,5 +138,7 @@
- 					metis_graph_order_f$(OBJ)		\
- 					metis_graph_part$(OBJ)			\
- 					metis_graph_part_f$(OBJ)
-+					$(CC) -shared -Wl,-soname,libscotchmetis-5.1.so $^ -L../libscotch -lscotch -o libscotchmetis-5.1.so
-+					ln -s libscotchmetis-5.1.so libscotchmetis.so
- 					$(AR) $(ARFLAGS) $(@) $(^)
- 					-$(RANLIB) $(@)
-Index: scotch/src/libscotch/Makefile
-===================================================================
---- scotch.orig/src/libscotch/Makefile
-+++ scotch/src/libscotch/Makefile
-@@ -2525,26 +2525,38 @@
- 					libraryf.h
- 					./dummysizes$(EXE) libraryf.h scotchf.h
- 
--libptscotch$(LIB)		:	$(LIBPTSCOTCHDEPS) $(LIBSCOTCHDEPS)
-+libptscotch$(LIB)               :       $(LIBPTSCOTCHDEPS) $(LIBSCOTCHDEPS) libptscotcherr$(LIB)
-+					$(CC) -shared -Wl,-soname,libptscotch-5.1.so $(LIBPTSCOTCHDEPS) $(LIBSCOTCHDEPS) -L. -lptscotcherr -lpthread $(LDFLAGS) -o libptscotch-5.1.so
-+					ln -s libptscotch-5.1.so libptscotch.so
- 					$(AR) $(ARFLAGS) $(@) $(?)
- 					-$(RANLIB) $(@)
- 
--libscotch$(LIB)			:	$(LIBSCOTCHDEPS)
-+libscotch$(LIB)                 :       $(LIBSCOTCHDEPS) libscotcherr$(LIB)
-+					$(CC) -shared -Wl,-soname,libscotch-5.1.so $(LIBSCOTCHDEPS) -L. -lscotcherr -lpthread $(LDFLAGS) -o libscotch-5.1.so
-+					ln -s libscotch-5.1.so libscotch.so
- 					$(AR) $(ARFLAGS) $(@) $(?)
- 					-$(RANLIB) $(@)
- 
- libptscotcherr$(LIB)		:	library_error$(OBJ)
-+					$(CC) -shared -Wl,-soname,libptscotcherr-5.1.so $^ -o libptscotcherr-5.1.so
-+					ln -s libptscotcherr-5.1.so libptscotcherr.so
- 					$(AR) $(ARFLAGS) $(@) $(?)
- 					-$(RANLIB) $(@)
- 
- libptscotcherrexit$(LIB)	:	library_error_exit$(OBJ)
-+					$(CC) -shared -Wl,-soname,libptscotcherrexit-5.1.so $^ -o libptscotcherrexit-5.1.so
-+					ln -s libptscotcherrexit-5.1.so libptscotcherrexit.so
- 					$(AR) $(ARFLAGS) $(@) $(?)
- 					-$(RANLIB) $(@)
- 
- libscotcherr$(LIB)		:	library_error$(OBJ)
-+					$(CC) -shared -Wl,-soname,libscotcherr-5.1.so $^ -o libscotcherr-5.1.so
-+					ln -s libscotcherr-5.1.so libscotcherr.so
- 					$(AR) $(ARFLAGS) $(@) $(?)
- 					-$(RANLIB) $(@)
- 
- libscotcherrexit$(LIB)		:	library_error_exit$(OBJ)
-+					$(CC) -shared -Wl,-soname,libscotcherrexit-5.1.so $^ -o libscotcherrexit-5.1.so
-+					ln -s libscotcherrexit-5.1.so libscotcherrexit.so
- 					$(AR) $(ARFLAGS) $(@) $(?)
- 					-$(RANLIB) $(@)
-Index: scotch/src/esmumps/Makefile
-===================================================================
---- scotch.orig/src/esmumps/Makefile
-+++ scotch/src/esmumps/Makefile
-@@ -59,6 +59,7 @@
- 
- ptscotch			:	clean
- 					$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps	\
-+					LD_LIBRARY_PATH=$(libdir)		\
- 					libesmumps$(LIB)										\
- 					main_esmumps$(EXE)
- 
-@@ -151,6 +152,8 @@
- 					esmumps$(OBJ)				\
- 					esmumps_f$(OBJ)				\
- 					esmumps_strats$(OBJ)
-+					$(CC) -shared -Wl,-soname,lib$(ESMUMPSLIB)-5.1.so $^ -L../libscotch -lscotch -lscotcherr -o lib$(ESMUMPSLIB)-5.1.so
-+					ln -s lib$(ESMUMPSLIB)-5.1.so lib$(ESMUMPSLIB).so
- 					$(AR) $(ARFLAGS) lib$(ESMUMPSLIB)$(LIB) $(?)
- 					-$(RANLIB) lib$(ESMUMPSLIB)$(LIB)
- 
-Index: scotch/src/scotch/Makefile
-===================================================================
---- scotch.orig/src/scotch/Makefile
-+++ scotch/src/scotch/Makefile
-@@ -88,6 +88,7 @@
- 
- ptscotch			:	clean
- 					$(MAKE) CC="$(CCP)" SCOTCHLIB=ptscotch	\
-+					LD_LIBRARY_PATH=$(libdir)		\
- 					dggath$(EXE)				\
- 					dgmap$(EXE)				\
- 					dgord$(EXE)				\
diff --git a/debian/rules b/debian/rules
index e951186..b6de452 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ endif
 DEB_SRCDIR = $(CURDIR)/src
 
 CCP=mpicc
-CFLAGS=-g -O3 -I. -fPIC -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_COLLECTIVE
+CFLAGS=-g -O3 -I. -fPIC -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME
 LDFLAGS=-lz -lm -lrt
 
 DEB_DBG_PACKAGE_scotch = scotch-dbg
@@ -28,7 +28,8 @@ DEB_DBG_PACKAGE_libptscotch-5.1 = libptscotch-dbg
 DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
 SCOTCH_VERSION=$(DEB_STRIPPED_UPSTREAM_VERSION)
 
-INTSIZE_VERS := $(shell echo "int int32 int64 long")
+INTSIZE_VERS := $(shell echo "int long int32 int64")
+SXXXLIB_VERS := $(shell echo "stlib shlib")
 
 get-orig-source:
 	mkdir tmp; \
@@ -37,51 +38,60 @@ get-orig-source:
 	tar xzf scotch_$(SCOTCH_VERSION)_esmumps.tar.gz; \
 	mv scotch_5.1_esmumps scotch-$(SCOTCH_VERSION).dfsg;\
 	cd scotch-$(SCOTCH_VERSION).dfsg;\
-	rm doc/ptscotch_user5.1.pdf doc/scotch_user5.1.ps.gz doc/ptscotch_user5.1.ps.gz  doc/scotch_user5.1.pdf; \
+	rm -f doc/ptscotch_user5.1.pdf doc/scotch_user5.1.ps.gz doc/ptscotch_user5.1.ps.gz  doc/scotch_user5.1.pdf; \
 	cd .. ; \
 	tar czf ../scotch_$(SCOTCH_VERSION).dfsg.orig.tar.gz scotch-$(SCOTCH_VERSION).dfsg; \
 	cd ..; rm -rf tmp
 
 patch-stamp:
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	touch $@
 
 build: patch-stamp build-stamp
 build-stamp:
 	dh_testdir
 	dh_prep
-	
 	for v in $(INTSIZE_VERS); do \
-	   mkdir -p $(CURDIR)/$$v; \
-	   mkdir -p $(CURDIR)/$$v/bin; \
-	   mkdir -p $(CURDIR)/$$v/lib; \
-	   mkdir -p $(CURDIR)/$$v/include; \
+	   mkdir -p $(CURDIR)/$$v               && \
+	   mkdir -p $(CURDIR)/$$v/bin           && \
+	   mkdir -p $(CURDIR)/$$v/lib           && \
+	   mkdir -p $(CURDIR)/$$v/include       && \
 	   mkdir -p $(CURDIR)/$$v/share/man/man1; \
 	done
-	
 	for v in $(INTSIZE_VERS); do \
-	   cp debian/Makefile_$$v.inc src/Makefile.inc; \
-	   (cd src && $(MAKE) realclean prefix=$(CURDIR)/$$v); \
-	   (cd src && $(MAKE) scotch ptscotch prefix=$(CURDIR)/$$v); \
-	   (cd src && $(MAKE) install prefix=$(CURDIR)/$$v); \
-	   mv $$v/bin/gbase $$v/bin/scotch_gbase; \
-	   rm -rf lib; \
-	   rm src/Makefile.inc; \
-	done
-
-	find . -name \*-5.1.so | xargs chrpath --delete
-
-	touch $@
-	
+	for w in $(SXXXLIB_VERS); do \
+	   x="$${w}_$${v}"; \
+	   cp debian/Makefile_$$x.inc src/Makefile.inc; \
+	   (cd src && $(MAKE) realclean       prefix=$(CURDIR)/$$v)  && \
+	   (cd src && $(MAKE) scotch          prefix=$(CURDIR)/$$v)  && \
+	   (cd src && $(MAKE) ptscotch        prefix=$(CURDIR)/$$v)  && \
+	   (cd src && $(MAKE) install         prefix=$(CURDIR)/$$v)  && \
+	   mv $(CURDIR)/$$v/bin/gbase $(CURDIR)/$$v/bin/scotch_gbase && \
+	   rm -rf lib                                                && \
+	   rm -f src/Makefile.inc                                    ; \
+	done; done
+	touch $@main_esmumps
 
 install: build
-	for v in $(INTSIZE_VERS); do \
-	   (cd $$v/lib && ln -s libscotchmetis.a libmetis.a); \
-	   (cd $$v/lib && ln -s libscotchmetis.so libmetis.so); \
-	   (cd $$v/lib && ln -s libptscotchparmetis.a libparmetis.a); \
-	   (cd $$v/lib && ln -s libptscotchparmetis.so libparmetis.so); \
+	# symblink libscotch.so -> libscotch-5.1.so and such
+	for x in $(INTSIZE_VERS); do \
+	   cd $$x/lib && \
+	   for lib in *.so; do \
+	      libname=`expr $$lib : '\(.*\).so'` && \
+	      soname="$${libname}-5.1"           && \
+	      mv $${lib} $${soname}.so           && \
+	      ln -s $${soname}.so $${lib}; \
+           done && \
+	   cd ../.. ; \
+        done
+	# symblink libXXXmetis.* -> libscotchXXXmetis.*
+	for x in $(INTSIZE_VERS); do \
+	   (cd $$x/lib && ln -s libscotchmetis.a       libmetis.a)   && \
+	   (cd $$x/lib && ln -s libscotchmetis.so      libmetis.so)  && \
+	   (cd $$x/lib && ln -s libptscotchparmetis.a  libparmetis.a)&& \
+	   (cd $$x/lib && ln -s libptscotchparmetis.so libparmetis.so); \
 	done
-	
+	# add suffix to {int32,int64,long}/bin/*
 	for file in $(shell ls int32/bin); do \
 	   (cd int32/bin && mv $$file $$file-int32); \
 	done
@@ -91,48 +101,41 @@ install: build
 	for file in $(shell ls long/bin); do \
 	   (cd long/bin && mv $$file $$file-long); \
 	done
-
-	# Fix lintian macro `brol2-0'' not defined
+	# fix lintian macro `brol2-0'' not defined
 	cp -f debian/dgscat.1 int/share/man/man1
-		
-	# Fix lintian  macro `-':' not defined
+	# fix lintian  macro `-':' not defined
 	cp -f debian/gout.1 int/share/man/man1
-		
-	# Fix lintian warnings for undefined macro in man pages
-	perl -pi -e 's|\.\"|\.\\\"|' int/share/man/man1/*.1
+	# fix lintian warnings for undefined macro in man pages
+	perl -pi -e 's|\.\"|\.\\\"|'  int/share/man/man1/*.1
 	mv int/share/man/man1/gbase.1 int/share/man/man1/scotch_gbase.1
-
-	# Fix lintian missing man pages
-	cp debian/scotch_esmumps.1 int/share/man/man1	
+	# fix lintian missing man pages
+	cp debian/scotch_esmumps.1   int/share/man/man1	
 	cp debian/ptscotch_esmumps.1 int/share/man/man1	
-	
-	# Fix lintian warnings
+	# fix lintian warnings
 	for file in $(shell ls int/bin); do \
 	   (cd int/share/man/man1 && gzip -9 $$file.1); \
 	done
-	
 	for file in $(shell ls int/bin); do \
 	   (cd int/share/man/man1 && ln -sf $$file.1.gz $$file-int32.1.gz); \
 	   (cd int/share/man/man1 && ln -sf $$file.1.gz $$file-int64.1.gz); \
 	   (cd int/share/man/man1 && ln -sf $$file.1.gz $$file-long.1.gz); \
 	done
 
-
 clean:
 	dh_testdir
 	dh_clean
-	for v in $(INTSIZE_VERS); do \
-	   (if [ -d $$v ]; then rm -rf $$v; fi); \
+	for x in $(INTSIZE_VERS); do \
+	   (if [ -d $$x ]; then rm -rf $$x; fi); \
 	done
 	cp debian/Makefile.inc src/
 	make -C src clean
 	rm -f src/Makefile.inc
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	rm -rf .pc bin include
-	-rm patch-stamp
-	-rm build-stamp
+	- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -f patch-stamp
+	rm -f build-stamp
+	rm -rf .pc lib bin include
+	find src -name \*.a  | xargs -r rm
 	find src -name \*.so | xargs -r rm
-	find src -name \*.a | xargs -r rm
 
 binary-indep: install
 	dh_testdir -i
@@ -148,25 +151,28 @@ binary-indep: install
 	dh_md5sums -i
 	dh_builddeb -i
 
+OPT_A = -a
+#OPT_A = 
+
 binary-arch: install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdirs -a
-	dh_install -a
-	dh_installdocs -a
-	dh_installchangelogs -a
+	dh_testdir $(OPT_A)
+	dh_testroot $(OPT_A)
+	dh_installdirs $(OPT_A)
+	dh_install $(OPT_A)
+	dh_installdocs $(OPT_A)
+	dh_installchangelogs $(OPT_A)
 	dh_strip -pscotch --dbg-package=scotch-dbg
 	dh_strip -pptscotch --dbg-package=ptscotch-dbg
 	dh_strip -plibscotch-5.1 --dbg-package=libscotch-dbg
 	dh_strip -plibptscotch-5.1 --dbg-package=libptscotch-dbg
-	dh_makeshlibs -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+	dh_makeshlibs $(OPT_A)
+	dh_compress $(OPT_A)
+	dh_fixperms $(OPT_A)
+	dh_installdeb $(OPT_A)
+	dh_shlibdeps $(OPT_A)
+	dh_gencontrol $(OPT_A)
+	dh_md5sums $(OPT_A)
+	dh_builddeb $(OPT_A)
 
 binary: binary-indep binary-arch
 


More information about the debian-science-maintainers mailing list