[ppl] 61/68: Imported Debian patch 1:1.1-3

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository ppl.

commit 15d74c35cfe9a1d39a3a528a8381f4a3f2bc376a
Author: Matthias Klose <doko at debian.org>
Date:   Fri Jul 25 10:55:11 2014 +0200

    Imported Debian patch 1:1.1-3
---
 debian/changelog                           |  8 ++++++++
 debian/control                             |  5 +++--
 debian/patches/latex-header.diff           | 26 ++++++++++++++++++++++++++
 debian/patches/link-tests-with-libmpq.diff | 28 ++++++++++++++++++++++++++++
 debian/patches/series                      |  2 ++
 debian/rules                               |  7 ++-----
 6 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa9bc95..2ad4c53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ppl (1:1.1-3) unstable; urgency=medium
+
+  * Build using dh-autoreconf instead of autotools-dev. Closes: #755959.
+  * Define our own \+ latex command. Closes: #751355.
+  * Fix linking of libppl_tests.
+
+ -- Matthias Klose <doko at debian.org>  Fri, 25 Jul 2014 10:55:11 +0200
+
 ppl (1:1.1-2) unstable; urgency=medium
 
   * Work around GCC PR target/60609 to avoid the build failure
diff --git a/debian/control b/debian/control
index f768759..e29fc87 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,10 @@ Source: ppl
 Section: libs
 Priority: optional
 Maintainer: Debian GCC Maintainers <debian-gcc at lists.debian.org>
-Uploaders: Michael Tautschnig <mt at debian.org>, Arthur Loiret <aloiret at debian.org>, Matthias Klose <doko at debian.org>
+Uploaders: Michael Tautschnig <mt at debian.org>, Matthias Klose <doko at debian.org>
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 6.0.7~), libgmp-dev, autoconf, libtool, autotools-dev, swi-prolog [!hurd-i386], chrpath,
+Build-Depends: debhelper (>= 6.0.7~), dh-autoreconf,
+ libgmp-dev, swi-prolog [!hurd-i386], chrpath,
  libncurses5-dev, libncursesw5-dev
 Build-Depends-Indep: doxygen-latex, graphviz, poppler-utils, ghostscript, texlive-math-extra
 Homepage: http://www.cs.unipr.it/ppl/
diff --git a/debian/patches/latex-header.diff b/debian/patches/latex-header.diff
new file mode 100644
index 0000000..3c7e2f8
--- /dev/null
+++ b/debian/patches/latex-header.diff
@@ -0,0 +1,26 @@
+Index: b/doc/devref-language-interface.tex
+===================================================================
+--- a/doc/devref-language-interface.tex
++++ b/doc/devref-language-interface.tex
+@@ -72,6 +72,8 @@
+ 
+ \setlength{\headheight}{24pt}
+ 
++\newcommand{\+}{\discretionary{\mbox{\scriptsize$\hookleftarrow$}}{}{}}
++
+ \begin{document}
+ \title{
+ \includegraphics[height=9cm]{ppl_logo.pdf} \\
+Index: b/doc/user-language-interface.tex
+===================================================================
+--- a/doc/user-language-interface.tex
++++ b/doc/user-language-interface.tex
+@@ -72,6 +72,8 @@
+ 
+ \setlength{\headheight}{24pt}
+ 
++\newcommand{\+}{\discretionary{\mbox{\scriptsize$\hookleftarrow$}}{}{}}
++
+ \begin{document}
+ \title{
+ \includegraphics[height=9cm]{ppl_logo.pdf} \\
diff --git a/debian/patches/link-tests-with-libmpq.diff b/debian/patches/link-tests-with-libmpq.diff
new file mode 100644
index 0000000..74e41c9
--- /dev/null
+++ b/debian/patches/link-tests-with-libmpq.diff
@@ -0,0 +1,28 @@
+Index: b/tests/Makefile.am
+===================================================================
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -45,6 +45,9 @@ files.hh \
+ files.cc \
+ ppl_test.cc
+ 
++libppl_tests_a_DEPENDENCIES = \
++ at extra_libraries@
++
+ LDADD = \
+ $(top_builddir)/src/libppl.la \
+ libppl_tests.a \
+Index: b/tests/Watchdog/Makefile.am
+===================================================================
+--- a/tests/Watchdog/Makefile.am
++++ b/tests/Watchdog/Makefile.am
+@@ -46,7 +46,8 @@ AM_CPPFLAGS = \
+ 
+ LDADD = \
+ $(top_builddir)/tests/libppl_tests.a \
+-$(top_builddir)/src/libppl.la
++$(top_builddir)/src/libppl.la \
++ at extra_libraries@
+ 
+ EXTRA_DIST =
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1bb8bf6..ccdb225 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 # empty
+latex-header.diff
+link-tests-with-libmpq.diff
diff --git a/debian/rules b/debian/rules
index 16e121b..0964668 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,11 +70,9 @@ else
   CHECK_ENV :=
 endif
 
-configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	cp -f /usr/share/misc/config.sub config.sub
-	cp -f /usr/share/misc/config.guess config.guess
+	dh_autoreconf
 	./configure $(confflags) \
 		--prefix=/usr \
 		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
@@ -117,8 +115,7 @@ clean:
 	rm -f configure-stamp build-stamp
 	rm -f build-arch-stamp build-indep-stamp
 	[ ! -e Makefile ] || $(MAKE) distclean
-	rm -f config.sub
-	rm -f config.guess
+	dh_autoreconf_clean
 	dh_clean
 
 install: install-indep install-arch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ppl.git