diff -Nru lablgtk2-2.18.5+dfsg/debian/changelog lablgtk2-2.18.5+dfsg/debian/changelog --- lablgtk2-2.18.5+dfsg/debian/changelog 2018-10-16 16:20:37.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/changelog 2018-12-24 17:06:23.000000000 +0000 @@ -1,3 +1,9 @@ +lablgtk2 (2.18.5+dfsg-2+rpi1) buster-staging; urgency=medium + + * Re-enable gtksourceview2 support for now. Currently coq still needs it. + + -- Peter Michael Green Mon, 24 Dec 2018 17:06:23 +0000 + lablgtk2 (2.18.5+dfsg-2) unstable; urgency=medium * Build without gtksourceview2 and gnomecanvas (Closes: #885677) diff -Nru lablgtk2-2.18.5+dfsg/debian/control lablgtk2-2.18.5+dfsg/debian/control --- lablgtk2-2.18.5+dfsg/debian/control 2018-10-16 16:18:07.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/control 2018-12-24 17:05:02.000000000 +0000 @@ -19,6 +19,7 @@ libglade2-dev, librsvg2-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/ @@ -64,6 +65,22 @@ This package include only the dynamic libraries needed for running dynamic bytecode executables using GNOME functionalities (rsvg). +Package: liblablgtksourceview2-ocaml +Architecture: any +Depends: + ${ocaml:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Provides: ${ocaml:Provides} +Replaces: liblablgtksourceview-ocaml +Breaks: liblablgtksourceview-ocaml (<< 2.14.0+dfsg-1~) +Description: OCaml bindings for libgtksourceview2 (runtime) + This is the OCaml binding for the GtkSourceView2 widget, a text widget that + extends the standard GTK+ 2.x text widget with syntax highlighting and other + features typical of a source editor. + . + This package contains the shared runtime stub libraries. + Package: liblablgtk2-ocaml-dev Architecture: any Suggests: liblablgtk2-gl-ocaml-dev, liblablgtk2-gnome-ocaml-dev @@ -112,6 +129,24 @@ This package contains the development files of lablgtk for libraries using GNOME functionalities (rsvg). +Package: liblablgtksourceview2-ocaml-dev +Architecture: any +Depends: + libgtksourceview2.0-dev, + ${ocaml:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Provides: ${ocaml:Provides} +Recommends: liblablgtk2-ocaml-doc +Replaces: liblablgtksourceview-ocaml-dev +Breaks: liblablgtksourceview-ocaml-dev (<< 2.14.0+dfsg-1~) +Description: OCaml bindings for libgtksourceview2, a source editor GTK+ widget + This is the OCaml binding for the GtkSourceView2 widget, a text widget that + extends the standard GTK+ 2.x text widget with syntax highlighting and other + features typical of a source editor. + . + This package contains the development part of the lablgtksourceview2 package. + Package: liblablgtk2-ocaml-doc Section: doc Architecture: all @@ -120,6 +155,7 @@ liblablgtk2-ocaml-dev, liblablgtk2-gl-ocaml-dev, liblablgtk2-gnome-ocaml-dev, + liblablgtksourceview2-ocaml-dev Description: OCaml bindings to Gtk+ version 2 (documentation) LablGTK2 contains bindings for GTK+ 2.x and OCaml. . diff -Nru lablgtk2-2.18.5+dfsg/debian/liblablgtksourceview2-ocaml-dev.install.in lablgtk2-2.18.5+dfsg/debian/liblablgtksourceview2-ocaml-dev.install.in --- lablgtk2-2.18.5+dfsg/debian/liblablgtksourceview2-ocaml-dev.install.in 1970-01-01 00:00:00.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/liblablgtksourceview2-ocaml-dev.install.in 2018-12-24 17:05:02.000000000 +0000 @@ -0,0 +1,6 @@ +@OCamlStdlibDir@/lablgtk2/sourceView* +@OCamlStdlibDir@/lablgtk2/gSourceView* +@OCamlStdlibDir@/lablgtk2/gtkSourceView* +@OCamlStdlibDir@/lablgtk2/liblablgtksourceview* +OPT: @OCamlStdlibDir@/lablgtk2/lablgtksourceview2.a +OPT: @OCamlStdlibDir@/lablgtk2/lablgtksourceview2.cmxa diff -Nru lablgtk2-2.18.5+dfsg/debian/liblablgtksourceview2-ocaml.install.in lablgtk2-2.18.5+dfsg/debian/liblablgtksourceview2-ocaml.install.in --- lablgtk2-2.18.5+dfsg/debian/liblablgtksourceview2-ocaml.install.in 1970-01-01 00:00:00.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/liblablgtksourceview2-ocaml.install.in 2018-12-24 17:05:02.000000000 +0000 @@ -0,0 +1,3 @@ +@OCamlStdlibDir@/lablgtk2/dlllablgtksourceview2.so @OCamlDllDir@ +@OCamlStdlibDir@/lablgtk2/lablgtksourceview2.cma +DYN: @OCamlStdlibDir@/lablgtk2/lablgtksourceview2.cmxs diff -Nru lablgtk2-2.18.5+dfsg/debian/META lablgtk2-2.18.5+dfsg/debian/META --- lablgtk2-2.18.5+dfsg/debian/META 2018-10-16 15:17:54.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/META 2018-12-24 17:05:02.000000000 +0000 @@ -25,3 +25,11 @@ archive(byte) = "lablgtkspell.cma" archive(native) = "lablgtkspell.cmxa" ) + +package "sourceview2" ( + exists_if = "lablgtksourceview2.cma,lablgtksourceview2.cmxa,lablgtksourceview2.cmxs" + description = "Bindings for gtksourceview2" + requires = "lablgtk2" + archive(byte) = "lablgtksourceview2.cma" + archive(native) = "lablgtksourceview2.cmxa" +) diff -Nru lablgtk2-2.18.5+dfsg/debian/rules lablgtk2-2.18.5+dfsg/debian/rules --- lablgtk2-2.18.5+dfsg/debian/rules 2018-10-16 16:18:01.000000000 +0000 +++ lablgtk2-2.18.5+dfsg/debian/rules 2018-12-24 17:05:54.000000000 +0000 @@ -17,7 +17,7 @@ cp src/.depend debian/src.depend.backup dh_auto_configure -- --with-gl --with-glade --with-rsvg \ --without-gnomecanvas --with-gtkspell --without-gnomeui \ - --without-gtksourceview2 + --with-gtksourceview2 .PHONY: override_dh_auto_build override_dh_auto_build: @@ -43,10 +43,6 @@ rm \ debian/tmp/usr/lib/ocaml/lablgtk2/gtkSourceView_types.mli \ debian/tmp/usr/lib/ocaml/lablgtk2/gSourceView.mli -# remove files related to gtksourceview2 (see #885677) - rm \ - debian/tmp/usr/lib/ocaml/lablgtk2/gtkSourceView2_types.mli \ - debian/tmp/usr/lib/ocaml/lablgtk2/gSourceView2.mli # remove files related to uncompiled gnome-panel (see #638133) rm debian/tmp/usr/lib/ocaml/lablgtk2/panel.mli # remove files related to libgnomeui (see #868392)