[Pkg-ocaml-maint-commits] [lablgtk2] 06/07: Build without libgnomeui (Closes: #868392)

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository lablgtk2.

commit 95fdd6b7aa658cd70ef6f6d35dda0bc8838abf2c
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Jul 17 22:42:26 2017 +0200

    Build without libgnomeui (Closes: #868392)
---
 debian/META.lablgtk2-gnome                    | 5 -----
 debian/control                                | 8 +++-----
 debian/liblablgtk2-gnome-ocaml-dev.install.in | 6 ------
 debian/liblablgtk2-gnome-ocaml.install.in     | 3 ---
 debian/rules                                  | 4 +++-
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/debian/META.lablgtk2-gnome b/debian/META.lablgtk2-gnome
index d9ed436..cebed75 100644
--- a/debian/META.lablgtk2-gnome
+++ b/debian/META.lablgtk2-gnome
@@ -7,11 +7,6 @@ package "gnomecanvas" (
   archive(native) = "lablgnomecanvas.cmxa"
 )
 
-package "gnomeui" (
-  archive(byte) = "lablgnomeui.cma"
-  archive(native) = "lablgnomeui.cmxa"
-)
-
 package "panel" (
   archive(byte) = "lablpanel.cma"
   archive(native) = "lablpanel.cmxa"
diff --git a/debian/control b/debian/control
index 9649d3f..b11675e 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,6 @@ Build-Depends:
  librsvg2-dev,
  libgnomecanvas2-dev,
  libgtkspell-dev,
- libgnomeui-dev,
  libgtksourceview2.0-dev (>= 2.10),
  ocaml-findlib (>= 1.3.2)
 Standards-Version: 3.9.8
@@ -65,8 +64,8 @@ Description: runtime libraries for OCaml bindings to GNOME
  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 (gnomeui,
- gnome-canvas, rsvg).
+ dynamic bytecode executables using GNOME functionalities (gnome-canvas,
+ rsvg).
 
 Package: liblablgtksourceview2-ocaml
 Architecture: any
@@ -122,7 +121,6 @@ Architecture: any
 Depends:
  librsvg2-dev,
  libgnomecanvas2-dev,
- libgnomeui-dev,
  ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
@@ -132,7 +130,7 @@ Description: OCaml bindings to GNOME
  lablgtk2 contains bindings for GTK+ 2.x and Objective Caml.
  .
  This package contains the development files of lablgtk for libraries using
- GNOME functionalities (gnomeui, gnome-canvas, rsvg).
+ GNOME functionalities (gnome-canvas, rsvg).
 
 Package: liblablgtksourceview2-ocaml-dev
 Architecture: any
diff --git a/debian/liblablgtk2-gnome-ocaml-dev.install.in b/debian/liblablgtk2-gnome-ocaml-dev.install.in
index 17b8eb5..f2033f8 100644
--- a/debian/liblablgtk2-gnome-ocaml-dev.install.in
+++ b/debian/liblablgtk2-gnome-ocaml-dev.install.in
@@ -1,15 +1,9 @@
 @OCamlStdlibDir@/lablgtk2/rsvg.*
 @OCamlStdlibDir@/lablgtk2/gnomeCanvas.*
 @OCamlStdlibDir@/lablgtk2/gnoCanvas.*
- at OCamlStdlibDir@/lablgtk2/gnomeDruid.*
- at OCamlStdlibDir@/lablgtk2/gnoDruid.*
 @OCamlStdlibDir@/lablgtk2/liblablgnomecanvas.*
- at OCamlStdlibDir@/lablgtk2/liblablgnomeui.*
 @OCamlStdlibDir@/lablgtk2/liblablrsvg.*
- at OCamlStdlibDir@/lablgtk2/gnomeui_tags.h
 OPT: @OCamlStdlibDir@/lablgtk2/lablgnomecanvas.a
 OPT: @OCamlStdlibDir@/lablgtk2/lablgnomecanvas.cmxa
-OPT: @OCamlStdlibDir@/lablgtk2/lablgnomeui.a
-OPT: @OCamlStdlibDir@/lablgtk2/lablgnomeui.cmxa
 OPT: @OCamlStdlibDir@/lablgtk2/lablrsvg.a
 OPT: @OCamlStdlibDir@/lablgtk2/lablrsvg.cmxa
diff --git a/debian/liblablgtk2-gnome-ocaml.install.in b/debian/liblablgtk2-gnome-ocaml.install.in
index 538c9ac..449845c 100644
--- a/debian/liblablgtk2-gnome-ocaml.install.in
+++ b/debian/liblablgtk2-gnome-ocaml.install.in
@@ -1,10 +1,7 @@
 debian/META.lablgtk2-gnome                        @OCamlStdlibDir@/METAS
 @OCamlStdlibDir@/lablgtk2/dlllablgnomecanvas.so   @OCamlDllDir@
- at OCamlStdlibDir@/lablgtk2/dlllablgnomeui.so       @OCamlDllDir@
 @OCamlStdlibDir@/lablgtk2/dlllablrsvg.so          @OCamlDllDir@
 @OCamlStdlibDir@/lablgtk2/lablgnomecanvas.cma
- at OCamlStdlibDir@/lablgtk2/lablgnomeui.cma
 @OCamlStdlibDir@/lablgtk2/lablrsvg.cma
 DYN: @OCamlStdlibDir@/lablgtk2/lablgnomecanvas.cmxs
-DYN: @OCamlStdlibDir@/lablgtk2/lablgnomeui.cmxs
 DYN: @OCamlStdlibDir@/lablgtk2/lablrsvg.cmxs
diff --git a/debian/rules b/debian/rules
index 1b53a85..a223cd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ export OCAMLFIND_LDCONF=ignore
 override_dh_auto_configure:
 	cp  src/.depend debian/src.depend.backup
 	dh_auto_configure -- --with-gl --with-glade --with-rsvg		\
-	--with-gnomecanvas --with-gtkspell --with-gnomeui \
+	--with-gnomecanvas --with-gtkspell --without-gnomeui \
 	--with-gtksourceview2
 
 .PHONY: override_dh_auto_build
@@ -45,6 +45,8 @@ override_dh_auto_install:
 	  debian/tmp/usr/lib/ocaml/lablgtk2/gSourceView.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)
+	rm debian/tmp/usr/lib/ocaml/lablgtk2/gnoDruid.mli
 # FIXME: we should use upstream META file
 	rm debian/tmp/usr/lib/ocaml/lablgtk2/META
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git