Bug#669479: ppl: diff for NMU version 0.11.2-6.1
tags 669479 pending
tags 680896 patch pending
tags 670024 fixed pending
tags 670025 fixed pending
thanks
Dear maintainers,
I've prepared an NMU for ppl (versioned as 0.11.2-6.1), following the
thread at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=669479#22.
Thijs Kinkhorst <thijs@debian.org>, mentoring my DD candidature, may
upload it to DELAYED/5. Please feel free to tell us if we should delay
it longer or cancel the upload.
Concerning 670024: usr/bin/ppl_pl is removed from libppl-swi, but
README.swiprolog explains how to have the same effect with one Prolog
line loading the dynamic library. This short wrapper was only
documented in the source tree, so anyone using it should be able to
rebuild it against libppl.a from libppl0.11-dev. However, you may want
to provide it in a separate libppl-swi-tool package.
Concerning 670025: libppl0.11-dev cannot be Multi-Arch: same because
it contains arch-dependent headers. Though, you may want to move
ppl-config from usr/bin to an usr/lib arch-dependent subdirectory.
Both changes are more intrusive than the work-arounds introduced by
the NMU, and I believe that they should wait wheezy release.
Regards.
diff -Nru ppl-0.11.2/debian/changelog ppl-0.11.2/debian/changelog
--- ppl-0.11.2/debian/changelog 2011-10-11 12:15:19.000000000 +0200
+++ ppl-0.11.2/debian/changelog 2012-07-17 23:28:23.000000000 +0200
@@ -1,3 +1,21 @@
+ppl (0.11.2-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ [ Artur Rona <ari-tczew@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@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 -Nru ppl-0.11.2/debian/control ppl-0.11.2/debian/control
--- ppl-0.11.2/debian/control 2011-10-11 12:14:41.000000000 +0200
+++ ppl-0.11.2/debian/control 2012-07-17 20:04:09.000000000 +0200
@@ -4,7 +4,8 @@
Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
Uploaders: Michael Tautschnig <mt@debian.org>, Arthur Loiret <aloiret@debian.org>, Matthias Klose <doko@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 @@
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 -Nru ppl-0.11.2/debian/libppl9.docs ppl-0.11.2/debian/libppl9.docs
--- ppl-0.11.2/debian/libppl9.docs 2009-10-16 11:46:58.000000000 +0200
+++ ppl-0.11.2/debian/libppl9.docs 2012-07-17 19:50:38.000000000 +0200
@@ -2,3 +2,5 @@
NEWS
README
CREDITS
+
+interfaces/Prolog/SWI/README.swiprolog
diff -Nru ppl-0.11.2/debian/libppl-swi.dirs ppl-0.11.2/debian/libppl-swi.dirs
--- ppl-0.11.2/debian/libppl-swi.dirs 2009-10-17 13:57:31.000000000 +0200
+++ ppl-0.11.2/debian/libppl-swi.dirs 2012-07-17 19:45:23.000000000 +0200
@@ -1,2 +1 @@
usr/lib/ppl
-usr/bin
diff -Nru ppl-0.11.2/debian/libppl-swi.install ppl-0.11.2/debian/libppl-swi.install
--- ppl-0.11.2/debian/libppl-swi.install 2011-10-10 19:41:32.000000000 +0200
+++ ppl-0.11.2/debian/libppl-swi.install 2012-07-17 20:00:56.000000000 +0200
@@ -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 -Nru ppl-0.11.2/debian/patches/avoid_obsolete_installdox.patch ppl-0.11.2/debian/patches/avoid_obsolete_installdox.patch
--- ppl-0.11.2/debian/patches/avoid_obsolete_installdox.patch 1970-01-01 01:00:00.000000000 +0100
+++ ppl-0.11.2/debian/patches/avoid_obsolete_installdox.patch 2012-07-19 02:19:01.000000000 +0200
@@ -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@../$(USER_CORE_HTML_DIR))
+
+ ppl-devref-c-interface-@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@../$(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@../$(USER_CORE_HTML_DIR))
+
+ ppl-devref-prolog-interface-@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@../$(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@../$(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@../$(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@../$(USER_CORE_HTML_DIR))
+
+ ppl-devref-java-interface-@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@../$(DEVREF_CORE_HTML_DIR))
+ # FIXME add generated files
+
+ @BUILD_C_INTERFACE_TRUE@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
+-@BUILD_C_INTERFACE_TRUE@ (cd $@; $(INSTALLDOX) \
+-@BUILD_C_INTERFACE_TRUE@ -l $(USER_CORE_HTML_DIR).tag@../$(USER_CORE_HTML_DIR))
+
+ @BUILD_C_INTERFACE_TRUE@ppl-devref-configured-c-interface-@VERSION@-html: \
+ @BUILD_C_INTERFACE_TRUE@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
+-@BUILD_C_INTERFACE_TRUE@ (cd $@; $(INSTALLDOX) \
+-@BUILD_C_INTERFACE_TRUE@ -l $(DEVREF_CORE_HTML_DIR).tag@../$(DEVREF_CORE_HTML_DIR))
+ # FIXME: add appropriate generated files.
+
+ @BUILD_SOME_PROLOG_INTERFACES_TRUE@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
+-@BUILD_SOME_PROLOG_INTERFACES_TRUE@ (cd $@; $(INSTALLDOX) \
+-@BUILD_SOME_PROLOG_INTERFACES_TRUE@ -l $(USER_CORE_HTML_DIR).tag@../$(USER_CORE_HTML_DIR))
+
+ @BUILD_SOME_PROLOG_INTERFACES_TRUE@ppl-devref-configured-prolog-interface-@VERSION@-html: \
+ @BUILD_SOME_PROLOG_INTERFACES_TRUE@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
+-@BUILD_SOME_PROLOG_INTERFACES_TRUE@ (cd $@; $(INSTALLDOX) \
+-@BUILD_SOME_PROLOG_INTERFACES_TRUE@ -l $(DEVREF_CORE_HTML_DIR).tag@../$(DEVREF_CORE_HTML_DIR))
+
+ @BUILD_OCAML_INTERFACE_TRUE@user-configured-ocaml-interface.latex-dir: \
+ @BUILD_OCAML_INTERFACE_TRUE@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
+-@BUILD_OCAML_INTERFACE_TRUE@ (cd $@; $(INSTALLDOX) \
+-@BUILD_OCAML_INTERFACE_TRUE@ -l $(USER_CORE_HTML_DIR).tag@../$(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
+-@BUILD_OCAML_INTERFACE_TRUE@ (cd $@; $(INSTALLDOX) \
+-@BUILD_OCAML_INTERFACE_TRUE@ -l $(DEVREF_CORE_HTML_DIR).tag@../$(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
+-@BUILD_JAVA_INTERFACE_TRUE@ (cd $@; $(INSTALLDOX) \
+-@BUILD_JAVA_INTERFACE_TRUE@ -l $(USER_CORE_HTML_DIR).tag@../$(USER_CORE_HTML_DIR))
+
+ @BUILD_JAVA_INTERFACE_TRUE@ppl-devref-configured-java-interface-@VERSION@-html: \
+ @BUILD_JAVA_INTERFACE_TRUE@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
+-@BUILD_JAVA_INTERFACE_TRUE@ (cd $@; $(INSTALLDOX) \
+-@BUILD_JAVA_INTERFACE_TRUE@ -l $(DEVREF_CORE_HTML_DIR).tag@../$(DEVREF_CORE_HTML_DIR))
+
+ ############################################################################
+
diff -Nru ppl-0.11.2/debian/patches/series ppl-0.11.2/debian/patches/series
--- ppl-0.11.2/debian/patches/series 2011-10-10 20:04:55.000000000 +0200
+++ ppl-0.11.2/debian/patches/series 2012-07-19 02:08:02.000000000 +0200
@@ -1 +1,2 @@
local_changes.diff
+avoid_obsolete_installdox.patch
Reply to: