[ppl] 43/68: Imported Debian patch 0.11.2-6.1
Andreas Tille
tille at debian.org
Sat Nov 12 08:41:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository ppl.
commit 49f842a5bd2aa2875682dd9c6429ed5e68852621
Author: Nicolas Boulenguez <nicolas.boulenguez at free.fr>
Date: Tue Jul 17 23:26:41 2012 +0200
Imported Debian patch 0.11.2-6.1
---
debian/changelog | 18 +++
debian/control | 4 +-
debian/libppl-swi.dirs | 1 -
debian/libppl-swi.install | 1 -
debian/libppl9.docs | 2 +
debian/patches/avoid_obsolete_installdox.patch | 168 +++++++++++++++++++++++++
debian/patches/series | 1 +
7 files changed, 191 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 81e1a52..9b98bdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+ppl (0.11.2-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ [ Artur Rona <ari-tczew at tlen.pl> ]
+ * debian/control: Add libncursesw5-dev to Build-Depends due to
+ missing library, fixes FTBFS. (Closes: #669479)
+
+ [ Nicolas Boulenguez ]
+ * Remove usr/bin/ppl_pl from libppl-swi multiarch package (see #670024).
+ Document equivalent functionality with the shared library.
+ * control: libppl0.11-dev cannot be Multi-Arch: same because it contains
+ arch-dependent headers (see #670025).
+ * avoid_obsolete_installdox.patch: backport part of an upstream commit.
+ Doxygen 1.8 does not use installdox anymore. (Closes: #680896)
+
+ -- Nicolas Boulenguez <nicolas.boulenguez at free.fr> Tue, 17 Jul 2012 23:26:41 +0200
+
ppl (0.11.2-6) unstable; urgency=low
* Build-depend on libncurses5-dev, until swi-prolog-nox depends on it.
diff --git a/debian/control b/debian/control
index 7aaac97..a745804 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ 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>
Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 6.0.7~), libgmp-dev, autoconf, libtool, autotools-dev, swi-prolog [!hurd-i386 !mips], chrpath, libncurses5-dev
+Build-Depends: debhelper (>= 6.0.7~), libgmp-dev, autoconf, libtool, autotools-dev, swi-prolog [!hurd-i386 !mips], chrpath,
+ libncurses5-dev, libncursesw5-dev
Build-Depends-Indep: doxygen-latex, graphviz, poppler-utils, ghostscript, texlive-math-extra
Homepage: http://www.cs.unipr.it/ppl/
@@ -26,7 +27,6 @@ Description: Parma Polyhedra Library (runtime library)
Package: libppl0.11-dev
Architecture: any
-Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Section: libdevel
Depends: libppl9 (= ${binary:Version}), libppl-c4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/libppl-swi.dirs b/debian/libppl-swi.dirs
index 0f2e1c8..4422028 100644
--- a/debian/libppl-swi.dirs
+++ b/debian/libppl-swi.dirs
@@ -1,2 +1 @@
usr/lib/ppl
-usr/bin
diff --git a/debian/libppl-swi.install b/debian/libppl-swi.install
index d1af09e..4c9ed6f 100644
--- a/debian/libppl-swi.install
+++ b/debian/libppl-swi.install
@@ -1,4 +1,3 @@
usr/lib/*/ppl/libppl_swiprolog.so
usr/lib/*/ppl/libppl_swiprolog.a
usr/lib/*/ppl/ppl_swiprolog.*
-usr/bin/ppl_pl
diff --git a/debian/libppl9.docs b/debian/libppl9.docs
index 0363680..cf38778 100644
--- a/debian/libppl9.docs
+++ b/debian/libppl9.docs
@@ -2,3 +2,5 @@ BUGS
NEWS
README
CREDITS
+
+interfaces/Prolog/SWI/README.swiprolog
diff --git a/debian/patches/avoid_obsolete_installdox.patch b/debian/patches/avoid_obsolete_installdox.patch
new file mode 100644
index 0000000..75cadb4
--- /dev/null
+++ b/debian/patches/avoid_obsolete_installdox.patch
@@ -0,0 +1,168 @@
+Description: installdox removed from doxygen
+ Allthough described in doxygen 1.8 documentation, the installdox
+ command is neither generated nor needed anymore by doxygen 1.8.
+ .
+ Current Debian build system does not refresh Makefile.in from Makefile.am,
+ so we only change the latter to minimize the changeset.
+ .
+ Next upstream version updates Makefile.am anyway.
+Origin: commit:http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=daeeb34660099b742150e96df970e3b1a6a882da
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=680896
+Applied-Upstream: commit:http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=daeeb34660099b742150e96df970e3b1a6a882da
+
+Index: b/doc/Makefile.in
+===================================================================
+--- a/doc/Makefile.in 2012-07-17 18:57:00.000000000 +0200
++++ b/doc/Makefile.in 2012-07-19 02:10:03.000000000 +0200
+@@ -340,7 +340,6 @@
+ yap_prolog = @yap_prolog@
+ txtdir = $(docdir)
+ DOXYGEN = doxygen
+-INSTALLDOX = ./installdox -q
+ PDF_LICENSES = \
+ gpl.pdf \
+ fdl.pdf
+@@ -1695,8 +1694,6 @@
+ -e 's|<PPL_SED_INPUT>|'"$(SED_C_INPUT_USER)"'|' \
+ $< > Doxyfile.user-c-interface-html
+ $(TEX_ENV) $(DOXYGEN) Doxyfile.user-c-interface-html
+- (cd $@; $(INSTALLDOX) \
+- -l $(USER_CORE_HTML_DIR).tag at ../$(USER_CORE_HTML_DIR))
+
+ ppl-devref-c-interface- at VERSION@-html: \
+ devref-language-interface.doxyconf \
+@@ -1709,8 +1706,6 @@
+ -e 's|<PPL_SED_INPUT>|'"$(SED_C_INPUT_DEVREF)"'|' \
+ $< > Doxyfile.devref-c-interface-html
+ $(TEX_ENV) $(DOXYGEN) Doxyfile.devref-c-interface-html
+- (cd $@; $(INSTALLDOX) \
+- -l $(DEVREF_CORE_HTML_DIR).tag at ../$(DEVREF_CORE_HTML_DIR))
+
+ user-prolog-interface.latex-dir: \
+ user-language-interface.doxyconf \
+@@ -1753,8 +1748,6 @@
+ -e 's|<PPL_SED_INPUT>|'"$(SED_PROLOG_INPUT_USER)"'|' \
+ $< > Doxyfile.user-prolog-interface-html
+ $(TEX_ENV) $(DOXYGEN) Doxyfile.user-prolog-interface-html
+- (cd $@; $(INSTALLDOX) \
+- -l $(USER_CORE_HTML_DIR).tag at ../$(USER_CORE_HTML_DIR))
+
+ ppl-devref-prolog-interface- at VERSION@-html: \
+ devref-language-interface.doxyconf \
+@@ -1767,8 +1760,6 @@
+ -e 's|<PPL_SED_INPUT>|'"$(SED_PROLOG_INPUT_DEVREF)"'|' \
+ $< > Doxyfile.devref-prolog-interface-html
+ $(TEX_ENV) $(DOXYGEN) Doxyfile.devref-prolog-interface-html
+- (cd $@; $(INSTALLDOX) \
+- -l $(DEVREF_CORE_HTML_DIR).tag at ../$(DEVREF_CORE_HTML_DIR))
+
+ user-ocaml-interface.latex-dir: \
+ user-language-interface.doxyconf \
+@@ -1815,8 +1806,6 @@
+ -e 's|<PPL_SED_INPUT>|'"$(SED_OCAML_INPUT_USER)"'|' \
+ $< > Doxyfile.user-ocaml-interface-html
+ $(TEX_ENV) $(DOXYGEN) Doxyfile.user-ocaml-interface-html
+- (cd $@; $(INSTALLDOX) \
+- -l $(USER_CORE_HTML_DIR).tag at ../$(USER_CORE_HTML_DIR))
+ mkdir $@/ocamldoc
+ $(OCAMLDOC) $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \
+ $(srcdir)/../interfaces/OCaml/ppl_ocaml_globals.mli
+@@ -1832,8 +1821,6 @@
+ -e 's|<PPL_SED_INPUT>|'"$(SED_OCAML_INPUT_DEVREF)"'|' \
+ $< > Doxyfile.devref-ocaml-interface-html
+ $(TEX_ENV) $(DOXYGEN) Doxyfile.devref-ocaml-interface-html
+- (cd $@; $(INSTALLDOX) \
+- -l $(DEVREF_CORE_HTML_DIR).tag at ../$(DEVREF_CORE_HTML_DIR))
+ mkdir $@/ocamldoc
+ $(OCAMLDOC) $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \
+ $(srcdir)/../interfaces/OCaml/ppl_ocaml_globals.mli
+@@ -1879,8 +1866,6 @@
+ -e 's|<PPL_SED_INPUT>|'"$(SED_JAVA_INPUT_USER)"'|' \
+ $< > Doxyfile.user-java-interface-html
+ $(TEX_ENV) $(DOXYGEN) Doxyfile.user-java-interface-html
+- (cd $@; $(INSTALLDOX) \
+- -l $(USER_CORE_HTML_DIR).tag at ../$(USER_CORE_HTML_DIR))
+
+ ppl-devref-java-interface- at VERSION@-html: \
+ devref-language-interface.doxyconf \
+@@ -1893,8 +1878,6 @@
+ -e 's|<PPL_SED_INPUT>|'"$(SED_JAVA_INPUT_DEVREF)"'|' \
+ $< > Doxyfile.devref-java-interface-html
+ $(TEX_ENV) $(DOXYGEN) Doxyfile.devref-java-interface-html
+- (cd $@; $(INSTALLDOX) \
+- -l $(DEVREF_CORE_HTML_DIR).tag at ../$(DEVREF_CORE_HTML_DIR))
+ # FIXME add generated files
+
+ @BUILD_C_INTERFACE_TRUE at user-configured-c-interface.latex-dir: \
+@@ -1940,8 +1923,6 @@
+ @BUILD_C_INTERFACE_TRUE@ -e 's|<PPL_SED_INPUT>|'"$(SED_CONFIGURED_C_INPUT_USER)"'|' \
+ @BUILD_C_INTERFACE_TRUE@ $< > Doxyfile.user-configured-c-interface-html
+ @BUILD_C_INTERFACE_TRUE@ $(TEX_ENV) $(DOXYGEN) Doxyfile.user-configured-c-interface-html
+- at BUILD_C_INTERFACE_TRUE@ (cd $@; $(INSTALLDOX) \
+- at BUILD_C_INTERFACE_TRUE@ -l $(USER_CORE_HTML_DIR).tag at ../$(USER_CORE_HTML_DIR))
+
+ @BUILD_C_INTERFACE_TRUE at ppl-devref-configured-c-interface-@VERSION at -html: \
+ @BUILD_C_INTERFACE_TRUE at devref-language-interface.doxyconf \
+@@ -1954,8 +1935,6 @@
+ @BUILD_C_INTERFACE_TRUE@ -e 's|<PPL_SED_INPUT>|'"$(SED_CONFIGURED_C_INPUT_DEVREF)"'|' \
+ @BUILD_C_INTERFACE_TRUE@ $< > Doxyfile.devref-configured-c-interface-html
+ @BUILD_C_INTERFACE_TRUE@ $(TEX_ENV) $(DOXYGEN) Doxyfile.devref-configured-c-interface-html
+- at BUILD_C_INTERFACE_TRUE@ (cd $@; $(INSTALLDOX) \
+- at BUILD_C_INTERFACE_TRUE@ -l $(DEVREF_CORE_HTML_DIR).tag at ../$(DEVREF_CORE_HTML_DIR))
+ # FIXME: add appropriate generated files.
+
+ @BUILD_SOME_PROLOG_INTERFACES_TRUE at user-configured-prolog-interface.latex-dir: \
+@@ -2001,8 +1980,6 @@
+ @BUILD_SOME_PROLOG_INTERFACES_TRUE@ -e 's|<PPL_SED_INPUT>|'"$(SED_CONFIGURED_PROLOG_INPUT_USER)"'|' \
+ @BUILD_SOME_PROLOG_INTERFACES_TRUE@ $< > Doxyfile.user-configured-prolog-interface-html
+ @BUILD_SOME_PROLOG_INTERFACES_TRUE@ $(TEX_ENV) $(DOXYGEN) Doxyfile.user-configured-prolog-interface-html
+- at BUILD_SOME_PROLOG_INTERFACES_TRUE@ (cd $@; $(INSTALLDOX) \
+- at BUILD_SOME_PROLOG_INTERFACES_TRUE@ -l $(USER_CORE_HTML_DIR).tag at ../$(USER_CORE_HTML_DIR))
+
+ @BUILD_SOME_PROLOG_INTERFACES_TRUE at ppl-devref-configured-prolog-interface-@VERSION at -html: \
+ @BUILD_SOME_PROLOG_INTERFACES_TRUE at devref-language-interface.doxyconf \
+@@ -2015,8 +1992,6 @@
+ @BUILD_SOME_PROLOG_INTERFACES_TRUE@ -e 's|<PPL_SED_INPUT>|'"$(SED_CONFIGURED_PROLOG_INPUT_DEVREF)"'|' \
+ @BUILD_SOME_PROLOG_INTERFACES_TRUE@ $< > Doxyfile.devref-configured-prolog-interface-html
+ @BUILD_SOME_PROLOG_INTERFACES_TRUE@ $(TEX_ENV) $(DOXYGEN) Doxyfile.devref-configured-prolog-interface-html
+- at BUILD_SOME_PROLOG_INTERFACES_TRUE@ (cd $@; $(INSTALLDOX) \
+- at BUILD_SOME_PROLOG_INTERFACES_TRUE@ -l $(DEVREF_CORE_HTML_DIR).tag at ../$(DEVREF_CORE_HTML_DIR))
+
+ @BUILD_OCAML_INTERFACE_TRUE at user-configured-ocaml-interface.latex-dir: \
+ @BUILD_OCAML_INTERFACE_TRUE at user-language-interface.doxyconf \
+@@ -2065,8 +2040,6 @@
+ @BUILD_OCAML_INTERFACE_TRUE@ -e 's|<PPL_SED_INPUT>|'"$(SED_CONFIGURED_OCAML_INPUT_USER)"'|' \
+ @BUILD_OCAML_INTERFACE_TRUE@ $< > Doxyfile.user-configured-ocaml-interface-html
+ @BUILD_OCAML_INTERFACE_TRUE@ $(TEX_ENV) $(DOXYGEN) Doxyfile.user-configured-ocaml-interface-html
+- at BUILD_OCAML_INTERFACE_TRUE@ (cd $@; $(INSTALLDOX) \
+- at BUILD_OCAML_INTERFACE_TRUE@ -l $(USER_CORE_HTML_DIR).tag at ../$(USER_CORE_HTML_DIR))
+ @BUILD_OCAML_INTERFACE_TRUE@ mkdir $@/ocamldoc
+ @BUILD_OCAML_INTERFACE_TRUE@ $(OCAMLDOC) $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \
+ @BUILD_OCAML_INTERFACE_TRUE@ ../interfaces/OCaml/ppl_ocaml.mli
+@@ -2082,8 +2055,6 @@
+ @BUILD_OCAML_INTERFACE_TRUE@ -e 's|<PPL_SED_INPUT>|'"$(SED_CONFIGURED_OCAML_INPUT_DEVREF)"'|' \
+ @BUILD_OCAML_INTERFACE_TRUE@ $< > Doxyfile.devref-configured-ocaml-interface-html
+ @BUILD_OCAML_INTERFACE_TRUE@ $(TEX_ENV) $(DOXYGEN) Doxyfile.devref-configured-ocaml-interface-html
+- at BUILD_OCAML_INTERFACE_TRUE@ (cd $@; $(INSTALLDOX) \
+- at BUILD_OCAML_INTERFACE_TRUE@ -l $(DEVREF_CORE_HTML_DIR).tag at ../$(DEVREF_CORE_HTML_DIR))
+ @BUILD_OCAML_INTERFACE_TRUE@ mkdir $@/ocamldoc
+ @BUILD_OCAML_INTERFACE_TRUE@ $(OCAMLDOC) $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \
+ @BUILD_OCAML_INTERFACE_TRUE@ ../interfaces/OCaml/ppl_ocaml.mli
+@@ -2147,8 +2118,6 @@
+ @BUILD_JAVA_INTERFACE_TRUE@ echo "EXCLUDE_PATTERNS = */Fake_Class_for_Doxygen*" \
+ @BUILD_JAVA_INTERFACE_TRUE@ >> Doxyfile.user-configured-java-interface-html
+ @BUILD_JAVA_INTERFACE_TRUE@ $(TEX_ENV) $(DOXYGEN) Doxyfile.user-configured-java-interface-html
+- at BUILD_JAVA_INTERFACE_TRUE@ (cd $@; $(INSTALLDOX) \
+- at BUILD_JAVA_INTERFACE_TRUE@ -l $(USER_CORE_HTML_DIR).tag at ../$(USER_CORE_HTML_DIR))
+
+ @BUILD_JAVA_INTERFACE_TRUE at ppl-devref-configured-java-interface-@VERSION at -html: \
+ @BUILD_JAVA_INTERFACE_TRUE at devref-language-interface.doxyconf \
+@@ -2163,8 +2132,6 @@
+ @BUILD_JAVA_INTERFACE_TRUE@ echo "EXCLUDE_PATTERNS = */Fake_Class_for_Doxygen*" \
+ @BUILD_JAVA_INTERFACE_TRUE@ >> Doxyfile.devref-configured-java-interface-html
+ @BUILD_JAVA_INTERFACE_TRUE@ $(TEX_ENV) $(DOXYGEN) Doxyfile.devref-configured-java-interface-html
+- at BUILD_JAVA_INTERFACE_TRUE@ (cd $@; $(INSTALLDOX) \
+- at BUILD_JAVA_INTERFACE_TRUE@ -l $(DEVREF_CORE_HTML_DIR).tag at ../$(DEVREF_CORE_HTML_DIR))
+
+ ############################################################################
+
diff --git a/debian/patches/series b/debian/patches/series
index 9d53034..a846982 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
local_changes.diff
+avoid_obsolete_installdox.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ppl.git
More information about the debian-science-commits
mailing list