[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1011323: lablgtk2: Please remove the obsolete gtkgl/glarea component



I have just uploaded a NMU with the attached debdiff to fix this.
diff -Nru lablgtk2-2.18.13/debian/changelog lablgtk2-2.18.13/debian/changelog
--- lablgtk2-2.18.13/debian/changelog	2023-01-21 08:58:55.000000000 +0100
+++ lablgtk2-2.18.13/debian/changelog	2023-06-18 19:12:29.000000000 +0200
@@ -1,3 +1,12 @@
+lablgtk2 (2.18.13-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+
+  [ Nicolas Boulenguez ]
+  * Remove the gtkgl/glarea component (Closes: #1011323)
+
+ -- Bastian Germann <bage@debian.org>  Sun, 18 Jun 2023 19:12:29 +0200
+
 lablgtk2 (2.18.13-1) unstable; urgency=medium
 
   [ Stéphane Glondu ]
diff -Nru lablgtk2-2.18.13/debian/control lablgtk2-2.18.13/debian/control
--- lablgtk2-2.18.13/debian/control	2023-01-21 08:58:55.000000000 +0100
+++ lablgtk2-2.18.13/debian/control	2023-06-18 19:09:25.000000000 +0200
@@ -10,10 +10,8 @@
  dh-ocaml,
  ocaml,
  libcamlp-streams-ocaml-dev,
- liblablgl-ocaml-dev,
- libncurses5-dev,
+ libncurses-dev,
  libgtk2.0-dev,
- libgtkgl2.0-dev,
  librsvg2-dev,
  libgtkspell-dev,
  ocaml-findlib
@@ -36,19 +34,6 @@
  This package include only the dynamic libraries needed for running dynamic
  bytecode executables.
 
-Package: liblablgtk2-gl-ocaml
-Architecture: any
-Depends:
- ${ocaml:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Provides: ${ocaml:Provides}
-Description: runtime libraries for OCaml bindings to GtkGL
- lablgtk2 contains bindings for GTK+ 2.x and Objective Caml.
- .
- This package include only the dynamic libraries needed for running dynamic
- bytecode executables using GtkGL functionalities.
-
 Package: liblablgtk2-gnome-ocaml
 Architecture: any
 Depends:
@@ -64,7 +49,7 @@
 
 Package: liblablgtk2-ocaml-dev
 Architecture: any
-Suggests: liblablgtk2-gl-ocaml-dev, liblablgtk2-gnome-ocaml-dev
+Suggests: liblablgtk2-gnome-ocaml-dev
 Depends:
  libgtk2.0-dev,
  libgtkspell-dev,
@@ -78,22 +63,6 @@
  .
  This package contains the development files of lablgtk.
 
-Package: liblablgtk2-gl-ocaml-dev
-Architecture: any
-Suggests: liblablgtk2-gnome-ocaml-dev
-Depends:
- libgtkgl2.0-dev,
- ${ocaml:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Provides: ${ocaml:Provides}
-Recommends: liblablgtk2-ocaml-doc
-Description: OCaml bindings to GtkGL
- lablgtk2 contains bindings for GTK+ 2.x and OCaml.
- .
- This package contains the development files of lablgtk for libraries using
- GtkGL.
-
 Package: liblablgtk2-gnome-ocaml-dev
 Architecture: any
 Depends:
@@ -115,7 +84,6 @@
 Depends: ${misc:Depends}
 Enhances:
  liblablgtk2-ocaml-dev,
- liblablgtk2-gl-ocaml-dev,
  liblablgtk2-gnome-ocaml-dev,
 Multi-Arch: foreign
 Description: OCaml bindings to Gtk+ version 2 (documentation)
diff -Nru lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml-dev.docs lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml-dev.docs
--- lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml-dev.docs	2023-01-21 08:58:55.000000000 +0100
+++ lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml-dev.docs	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-README
diff -Nru lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml-dev.install.in lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml-dev.install.in
--- lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml-dev.install.in	2023-01-21 08:58:55.000000000 +0100
+++ lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml-dev.install.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-@OCamlStdlibDir@/lablgtk2/glGtk.*
-@OCamlStdlibDir@/lablgtk2/liblablgtkgl2*
-OPT: @OCamlStdlibDir@/lablgtk2/lablgtkgl.a
-OPT: @OCamlStdlibDir@/lablgtk2/lablgtkgl.cmxa
diff -Nru lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml.docs lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml.docs
--- lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml.docs	2023-01-21 08:58:55.000000000 +0100
+++ lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml.docs	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-README
diff -Nru lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml.install.in lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml.install.in
--- lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml.install.in	2023-01-21 08:58:55.000000000 +0100
+++ lablgtk2-2.18.13/debian/liblablgtk2-gl-ocaml.install.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-debian/META.lablgtk2-gl                    @OCamlStdlibDir@/METAS
-@OCamlStdlibDir@/lablgtk2/dlllablgtkgl2.so @OCamlDllDir@
-@OCamlStdlibDir@/lablgtk2/lablgtkgl.cma
-DYN: @OCamlStdlibDir@/lablgtk2/lablgtkgl.cmxs
diff -Nru lablgtk2-2.18.13/debian/liblablgtk2-ocaml-dev.install.in lablgtk2-2.18.13/debian/liblablgtk2-ocaml-dev.install.in
--- lablgtk2-2.18.13/debian/liblablgtk2-ocaml-dev.install.in	2023-01-21 08:58:55.000000000 +0100
+++ lablgtk2-2.18.13/debian/liblablgtk2-ocaml-dev.install.in	2023-06-18 19:07:11.000000000 +0200
@@ -43,7 +43,6 @@
 @OCamlStdlibDir@/lablgtk2/gtkEdit.*
 @OCamlStdlibDir@/lablgtk2/gtkEnums.*
 @OCamlStdlibDir@/lablgtk2/gtkFile.*
-@OCamlStdlibDir@/lablgtk2/gtkgl_tags.h
 @OCamlStdlibDir@/lablgtk2/gtkInit.*
 @OCamlStdlibDir@/lablgtk2/gtkList.*
 @OCamlStdlibDir@/lablgtk2/gtkMain.*
diff -Nru lablgtk2-2.18.13/debian/liblablgtk2-ocaml-doc.ocamldoc.in lablgtk2-2.18.13/debian/liblablgtk2-ocaml-doc.ocamldoc.in
--- lablgtk2-2.18.13/debian/liblablgtk2-ocaml-doc.ocamldoc.in	2023-01-21 08:58:55.000000000 +0100
+++ lablgtk2-2.18.13/debian/liblablgtk2-ocaml-doc.ocamldoc.in	2023-06-18 19:07:11.000000000 +0200
@@ -1,4 +1,3 @@
 -I src
--I @OCamlStdlibDir@/lablgl
 -I @OCamlStdlibDir@/threads
 --include debian/tmp@OCamlStdlibDir@/lablgtk2
diff -Nru lablgtk2-2.18.13/debian/META.lablgtk2-gl lablgtk2-2.18.13/debian/META.lablgtk2-gl
--- lablgtk2-2.18.13/debian/META.lablgtk2-gl	2023-01-21 08:58:55.000000000 +0100
+++ lablgtk2-2.18.13/debian/META.lablgtk2-gl	1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-version="2.18.5"
-directory="+lablgtk2"
-requires = "lablgtk2"
-
-package "gtkgl" (
-  requires = "lablgtk2 lablgl"
-  archive(byte) = "lablgtkgl.cma"
-  archive(native) = "lablgtkgl.cmxa"
-)
diff -Nru lablgtk2-2.18.13/debian/rules lablgtk2-2.18.13/debian/rules
--- lablgtk2-2.18.13/debian/rules	2023-01-21 08:58:55.000000000 +0100
+++ lablgtk2-2.18.13/debian/rules	2023-06-18 19:07:11.000000000 +0200
@@ -15,7 +15,7 @@
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
 	cp  src/.depend debian/src.depend.backup
-	dh_auto_configure -- --with-gl --without-glade --with-rsvg	\
+	dh_auto_configure -- --without-gl --without-glade --with-rsvg	\
 	--without-gnomecanvas --with-gtkspell --without-gnomeui \
 	--without-gtksourceview2
 
@@ -55,6 +55,8 @@
 	rm debian/tmp/usr/lib/ocaml/lablgtk2/gnoCanvas.mli
 # remove files related to libglade2 (see #895517)
 	rm debian/tmp/usr/lib/ocaml/lablgtk2/glade.mli
+# remove files related to gtkgl (see #967808)
+	rm debian/tmp/usr/lib/ocaml/lablgtk2/glGtk.mli
 # FIXME: we should use upstream META file
 	rm debian/tmp/usr/lib/ocaml/lablgtk2/META
 

Reply to: