[SCM] Packaging for ratpoints branch, master, updated. debian/2.1.3+dfsg-1-3-g973fbd9

[Tobias Hansen]

The following commit has been merged in the master branch:
commit e8074d44a16e1fe14ca0cd57637b08b3a4f19c40
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Mon Jul 29 00:24:28 2013 +0200

    Fix build after GMP changed location of its header, don't ship a copy of the GPL.

diff --git a/debian/changelog b/debian/changelog
index 1885fb1..0316286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ratpoints (2.1.3+dfsg-2) UNRELEASED; urgency=low
+
+  * Fix build with changed location of gmp header. (Closes: #717533)
+  * Don't ship a copy of the GPL.
+
+ -- Tobias Hansen <thansen at debian.org>  Sun, 28 Jul 2013 23:52:07 +0200
+
 ratpoints (2.1.3+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #700184)
diff --git a/debian/libratpoints-dev.docs b/debian/libratpoints-dev.docs
deleted file mode 100644
index 4d1854e..0000000
--- a/debian/libratpoints-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-gpl-2.0.txt
diff --git a/debian/patches/automake.patch b/debian/patches/automake.patch
index 93d4603..ff35ebe 100644
--- a/debian/patches/automake.patch
+++ b/debian/patches/automake.patch
@@ -224,7 +224,7 @@ Subject: Switch to automake, build a shared library using libtool
 +	cmp -s $(top_srcdir)/testbase $(top_builddir)/rptest.out || echo "Test failed!"
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,68 @@
+@@ -0,0 +1,75 @@
 +AC_INIT(ratpoints, 2.1.3)
 +AC_CANONICAL_TARGET
 +
@@ -269,10 +269,17 @@ Subject: Switch to automake, build a shared library using libtool
 +	with_gmp_dir="$withval",
 +	with_gmp_dir="/usr")
 +
++dnl allow for GMP headers in a non-standard location
++AC_ARG_WITH(gmp-headers,
++	[AS_HELP_STRING([--with-gmp-headers=<path>],
++			[location of the GMP headers, the default is ${gmp_dir}/include])],
++	with_gmp_header_dir="$withval",
++	with_gmp_header_dir="${with_gmp_dir}/include")
++
 +dnl see if the header is available
-+AC_MSG_CHECKING(for GMP includes in ${with_gmp_dir}/include/)
-+if test -f ${with_gmp_dir}/include/gmp.h; then
-+  GMP_CFLAGS="-I{$with_gmp_dir}/include"
++AC_MSG_CHECKING(for GMP includes in ${with_gmp_header_dir}/)
++if test -f ${with_gmp_header_dir}/gmp.h; then
++  GMP_CFLAGS="-I${with_gmp_header_dir}"
 +  AC_MSG_RESULT(found)
 +else
 +  AC_MSG_RESULT(not found)
diff --git a/debian/rules b/debian/rules
index 8070c12..f1aba04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@ --parallel --with autoreconf
 
@@ -9,4 +11,4 @@ override_dh_autoreconf:
 	rm -f NEWS README AUTHORS ChangeLog
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-silent-rules
+	dh_auto_configure -- --disable-silent-rules --with-gmp-headers=/usr/include/$(DEB_HOST_MULTIARCH)

-- 
Packaging for ratpoints