[SCM] libzn-poly: library for polynomial arithmetic in Z/nZ[x] branch, master, updated. upstream/0.9-23-g0c2a347

[Tobias Hansen]

The following commit has been merged in the master branch:
commit d9a40360b0bd3d46f641c90e5d91e425b759a510
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Sun Dec 23 13:16:36 2012 +0100

    Prepare multiarch support.

diff --git a/debian/control b/debian/control
index 805e2ab..33e60aa 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Package: libzn-poly-0.9
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Description: Library for polynomial arithmetic in Z/nZ[x]
  zn_poly is a C library for polynomial arithmetic in Z/nZ[x], where n
  is any modulus that fits into an unsigned long.
@@ -21,6 +22,7 @@ Package: libzn-poly-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libzn-poly-0.9 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
 Description: Library for polynomial arithmetic in Z/nZ[x]
  zn_poly is a C library for polynomial arithmetic in Z/nZ[x], where n
  is any modulus that fits into an unsigned long.
diff --git a/debian/libzn-poly-0.9.install b/debian/libzn-poly-0.9.install
index 0e2a162..07e3cf9 100644
--- a/debian/libzn-poly-0.9.install
+++ b/debian/libzn-poly-0.9.install
@@ -1 +1 @@
-usr/lib/libzn_poly-*.so
+usr/lib/*/libzn_poly-*.so
diff --git a/debian/libzn-poly-dev.install b/debian/libzn-poly-dev.install
index 38066b9..cbe9e53 100644
--- a/debian/libzn-poly-dev.install
+++ b/debian/libzn-poly-dev.install
@@ -1,2 +1,2 @@
 usr/include/*
-usr/lib/libzn_poly.so
+usr/lib/*/libzn_poly.so
diff --git a/debian/patches/zn_poly_soname.patch b/debian/patches/zn_poly_soname.patch
index f90f03e..8abeed3 100644
--- a/debian/patches/zn_poly_soname.patch
+++ b/debian/patches/zn_poly_soname.patch
@@ -6,17 +6,36 @@ Author: Tobias Hansen <thansen at debian.org>
 
 --- a/makemakefile.py
 +++ b/makemakefile.py
-@@ -160,7 +160,8 @@
+@@ -75,6 +75,7 @@
+ parser.add_option("--prefix", dest="prefix", default="/usr/local")
+ parser.add_option("--cflags", dest="cflags", default="-O2")
+ parser.add_option("--ldflags", dest="ldflags", default="")
++parser.add_option("--triplet", dest="triplet", default="")
+ parser.add_option("--gmp-prefix", dest="gmp_prefix", default="/usr/local")
+ parser.add_option("--ntl-prefix", dest="ntl_prefix", default="/usr/local")
+ parser.add_option("--use-flint", dest="use_flint", action="store_true",
+@@ -96,6 +97,7 @@
+ 
+ cflags = options.cflags
+ ldflags = options.ldflags
++triplet = options.triplet
+ prefix = options.prefix
+ 
+ includes = "-I" + gmp_include_dir + " -I./include"
+@@ -159,8 +161,10 @@
+ print
  print "install:"
  print "\tmkdir -p %s/include/zn_poly" % prefix
- print "\tmkdir -p %s/lib" % prefix
+-print "\tmkdir -p %s/lib" % prefix
 -print "\tcp libzn_poly.a %s/lib" % prefix
-+print "\tcp libzn_poly-*.so %s/lib" % prefix
-+print "\tln -s %s/lib/lib`cat DIRNAME`.so %s/lib/libzn_poly.so" % (prefix, prefix)
++print "\tmkdir -p %s/lib/%s" % (prefix, triplet)
++print "\tcp libzn_poly-*.so %s/lib/%s" % (prefix, triplet)
++print "\tln -s %s/lib/%s/lib`cat DIRNAME`.so %s/lib/%s/libzn_poly.so" % \
++      (prefix, triplet, prefix, triplet)
  print "\tcp include/zn_poly.h %s/include/zn_poly" % prefix
  print "\tcp include/wide_arith.h %s/include/zn_poly" % prefix
  print
-@@ -181,7 +182,9 @@
+@@ -181,7 +185,9 @@
     print "\trm -f " + x + "-ntl"
  for x in demo_progs:
     print "\trm -f " + x
@@ -27,7 +46,7 @@ Author: Tobias Hansen <thansen at debian.org>
  
  print
  print
-@@ -203,7 +206,7 @@
+@@ -203,7 +209,7 @@
  print "\t$(CC) -shared -o libzn_poly.so $(LIBOBJS) $(LIBS)"
  print
  print "libzn_poly-%s.so: $(LIBOBJS)" % version
diff --git a/debian/rules b/debian/rules
index 36d7d73..0fcb7e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ override_dh_auto_clean:
 	rm -f makefile
 
 override_dh_auto_configure:
-	./configure --gmp-prefix="/usr" --ntl-prefix="/usr" \
+	./configure --gmp-prefix="/usr" --ntl-prefix="/usr" --triplet="$(DEB_HOST_MULTIARCH)" \
             --prefix="$(CURDIR)/debian/tmp/usr" --cflags="$(CFLAGS) $(CPPFLAGS) -fPIC" --ldflags="$(LDFLAGS)"
 
 override_dh_auto_build:

-- 
libzn-poly: library for polynomial arithmetic in Z/nZ[x]