diff -Nru lablgtk2-2.18.5+dfsg/debian/changelog lablgtk2-2.18.5+dfsg/debian/changelog --- lablgtk2-2.18.5+dfsg/debian/changelog 2017-10-28 11:35:44.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/changelog 2019-02-13 11:50:30.000000000 +0000 @@ -1,8 +1,17 @@ -lablgtk2 (2.18.5+dfsg-1build1) bionic; urgency=medium +lablgtk2 (2.18.5+dfsg-3) unstable; urgency=medium - * Rebuild against new OCAML ABIs. + * Add liblablgtksourceview2-ocaml{,-dev} back + * Update version in META files (Closes: #822949) - -- Gianfranco Costamagna Sat, 28 Oct 2017 13:35:44 +0200 + -- Stéphane Glondu Wed, 13 Feb 2019 12:50:30 +0100 + +lablgtk2 (2.18.5+dfsg-2) unstable; urgency=medium + + * Build without gtksourceview2 and gnomecanvas (Closes: #885677) + * Remove findlib package lablgtk2-gnome.panel + * Switch Vcs-* to salsa and other minor changes + + -- Stéphane Glondu Tue, 16 Oct 2018 18:20:37 +0200 lablgtk2 (2.18.5+dfsg-1) unstable; urgency=medium @@ -199,7 +208,7 @@ * Recompiled for ocaml 3.10.2. * Added myself to Uploaders. * Capitalization errors in package descriptions. - + [ Samuel Mimram ] * New upstream release. * Builds with OCaml 3.10.2, closes: #472994. @@ -208,7 +217,7 @@ [ Stefano Zacchiroli ] * fix vcs-svn field to point just above the debian/ dir * fix "GNOME" spelling in package descriptions - + -- Ralf Treinen Mon, 07 Apr 2008 21:15:55 +0200 lablgtk2 (2.10.0-4) unstable; urgency=low @@ -485,13 +494,13 @@ * Modified sections. liblablgtk2-ocaml is section libs, liblablgkt2-ocaml-dev is libdevel. - * Fixed description type. (Closes: #184926) + * Fixed description type. (Closes: #184926) -- Sven Luther Wed, 23 Apr 2003 10:29:20 +0200 lablgtk2 (0.beta.20030423-1) unstable; urgency=low - * New upstream release. + * New upstream release. -- Sven Luther Wed, 23 Apr 2003 09:49:45 +0200 diff -Nru lablgtk2-2.18.5+dfsg/debian/control lablgtk2-2.18.5+dfsg/debian/control --- lablgtk2-2.18.5+dfsg/debian/control 2017-07-17 20:54:05.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/control 2019-02-13 11:43:51.000000000 +0000 @@ -18,14 +18,13 @@ libgtkgl2.0-dev, libglade2-dev, librsvg2-dev, - libgnomecanvas2-dev, libgtkspell-dev, libgtksourceview2.0-dev (>= 2.10), ocaml-findlib (>= 1.3.2) Standards-Version: 3.9.8 Homepage: http://forge.ocamlcore.org/projects/lablgtk/ -Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ocaml-maint/packages/lablgtk2.git +Vcs-Git: https://salsa.debian.org/ocaml-team/lablgtk2.git +Vcs-Browser: https://salsa.debian.org/ocaml-team/lablgtk2 Package: liblablgtk2-ocaml Architecture: any @@ -64,8 +63,7 @@ lablgtk2 contains bindings for GTK+ 2.x and Objective Caml. . This package include only the dynamic libraries needed for running - dynamic bytecode executables using GNOME functionalities (gnome-canvas, - rsvg). + dynamic bytecode executables using GNOME functionalities (rsvg). Package: liblablgtksourceview2-ocaml Architecture: any @@ -120,7 +118,6 @@ Architecture: any Depends: librsvg2-dev, - libgnomecanvas2-dev, ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends} @@ -130,7 +127,7 @@ lablgtk2 contains bindings for GTK+ 2.x and Objective Caml. . This package contains the development files of lablgtk for libraries using - GNOME functionalities (gnome-canvas, rsvg). + GNOME functionalities (rsvg). Package: liblablgtksourceview2-ocaml-dev Architecture: any diff -Nru lablgtk2-2.18.5+dfsg/debian/copyright lablgtk2-2.18.5+dfsg/debian/copyright --- lablgtk2-2.18.5+dfsg/debian/copyright 2017-07-17 19:58:39.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/copyright 2019-02-13 11:42:35.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: lablgtk2 Upstream-Contact: Jacques Garrigue Source: http://forge.ocamlcore.org/projects/lablgtk/ diff -Nru lablgtk2-2.18.5+dfsg/debian/liblablgtk2-gnome-ocaml-dev.install.in lablgtk2-2.18.5+dfsg/debian/liblablgtk2-gnome-ocaml-dev.install.in --- lablgtk2-2.18.5+dfsg/debian/liblablgtk2-gnome-ocaml-dev.install.in 2017-07-17 20:54:05.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/liblablgtk2-gnome-ocaml-dev.install.in 2019-02-13 11:42:35.000000000 +0000 @@ -1,9 +1,4 @@ @OCamlStdlibDir@/lablgtk2/rsvg.* -@OCamlStdlibDir@/lablgtk2/gnomeCanvas.* -@OCamlStdlibDir@/lablgtk2/gnoCanvas.* -@OCamlStdlibDir@/lablgtk2/liblablgnomecanvas.* @OCamlStdlibDir@/lablgtk2/liblablrsvg.* -OPT: @OCamlStdlibDir@/lablgtk2/lablgnomecanvas.a -OPT: @OCamlStdlibDir@/lablgtk2/lablgnomecanvas.cmxa OPT: @OCamlStdlibDir@/lablgtk2/lablrsvg.a OPT: @OCamlStdlibDir@/lablgtk2/lablrsvg.cmxa diff -Nru lablgtk2-2.18.5+dfsg/debian/liblablgtk2-gnome-ocaml.install.in lablgtk2-2.18.5+dfsg/debian/liblablgtk2-gnome-ocaml.install.in --- lablgtk2-2.18.5+dfsg/debian/liblablgtk2-gnome-ocaml.install.in 2017-07-17 20:54:05.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/liblablgtk2-gnome-ocaml.install.in 2019-02-13 11:42:35.000000000 +0000 @@ -1,7 +1,4 @@ debian/META.lablgtk2-gnome @OCamlStdlibDir@/METAS -@OCamlStdlibDir@/lablgtk2/dlllablgnomecanvas.so @OCamlDllDir@ @OCamlStdlibDir@/lablgtk2/dlllablrsvg.so @OCamlDllDir@ -@OCamlStdlibDir@/lablgtk2/lablgnomecanvas.cma @OCamlStdlibDir@/lablgtk2/lablrsvg.cma -DYN: @OCamlStdlibDir@/lablgtk2/lablgnomecanvas.cmxs DYN: @OCamlStdlibDir@/lablgtk2/lablrsvg.cmxs diff -Nru lablgtk2-2.18.5+dfsg/debian/META lablgtk2-2.18.5+dfsg/debian/META --- lablgtk2-2.18.5+dfsg/debian/META 2017-07-17 19:58:38.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/META 2019-02-13 11:50:30.000000000 +0000 @@ -1,4 +1,4 @@ -version="2.16.0" +version="2.18.5" requires(mt) = "threads" requires(mt,mt_vm) = "threads.vm" requires(mt,mt_posix) = "threads.posix" diff -Nru lablgtk2-2.18.5+dfsg/debian/META.lablgtk2-gl lablgtk2-2.18.5+dfsg/debian/META.lablgtk2-gl --- lablgtk2-2.18.5+dfsg/debian/META.lablgtk2-gl 2017-07-17 19:58:38.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/META.lablgtk2-gl 2019-02-13 11:50:30.000000000 +0000 @@ -1,4 +1,4 @@ -version="2.16.0" +version="2.18.5" directory="+lablgtk2" requires = "lablgtk2" diff -Nru lablgtk2-2.18.5+dfsg/debian/META.lablgtk2-gnome lablgtk2-2.18.5+dfsg/debian/META.lablgtk2-gnome --- lablgtk2-2.18.5+dfsg/debian/META.lablgtk2-gnome 2017-07-17 20:54:05.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/META.lablgtk2-gnome 2019-02-13 11:50:30.000000000 +0000 @@ -1,17 +1,7 @@ -version="2.16.0" +version="2.18.5" directory="+lablgtk2" requires = "lablgtk2" -package "gnomecanvas" ( - archive(byte) = "lablgnomecanvas.cma" - archive(native) = "lablgnomecanvas.cmxa" -) - -package "panel" ( - archive(byte) = "lablpanel.cma" - archive(native) = "lablpanel.cmxa" -) - package "rsvg" ( archive(byte) = "lablrsvg.cma" archive(native) = "lablrsvg.cmxa" diff -Nru lablgtk2-2.18.5+dfsg/debian/rules lablgtk2-2.18.5+dfsg/debian/rules --- lablgtk2-2.18.5+dfsg/debian/rules 2017-07-17 20:54:05.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/rules 2019-02-13 11:44:34.000000000 +0000 @@ -16,7 +16,7 @@ override_dh_auto_configure: cp src/.depend debian/src.depend.backup dh_auto_configure -- --with-gl --with-glade --with-rsvg \ - --with-gnomecanvas --with-gtkspell --without-gnomeui \ + --without-gnomecanvas --with-gtkspell --without-gnomeui \ --with-gtksourceview2 .PHONY: override_dh_auto_build @@ -47,6 +47,8 @@ rm debian/tmp/usr/lib/ocaml/lablgtk2/panel.mli # remove files related to libgnomeui (see #868392) rm debian/tmp/usr/lib/ocaml/lablgtk2/gnoDruid.mli +# remove files related to libgnomecanvas (see #885677) + rm debian/tmp/usr/lib/ocaml/lablgtk2/gnoCanvas.mli # FIXME: we should use upstream META file rm debian/tmp/usr/lib/ocaml/lablgtk2/META