[Pkg-ocaml-maint-commits] r908 - packages/lablgtk/branches/split-gnome/debian

[Samuel Mimram]

Author: smimram-guest
Date: 2005-01-18 11:20:50 +0100 (Tue, 18 Jan 2005)
New Revision: 908

Added:
   packages/lablgtk/branches/split-gnome/debian/META.lablgtk2-gnome
Removed:
   packages/lablgtk/branches/split-gnome/debian/META.gnome
   packages/lablgtk/branches/split-gnome/debian/META.gtkgl
   packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.override
Modified:
   packages/lablgtk/branches/split-gnome/debian/META
   packages/lablgtk/branches/split-gnome/debian/control
   packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml-dev.dirs
   packages/lablgtk/branches/split-gnome/debian/rules
Log:
Some more corrections to the package.

Modified: packages/lablgtk/branches/split-gnome/debian/META
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/META	2005-01-17 22:29:17 UTC (rev 907)
+++ packages/lablgtk/branches/split-gnome/debian/META	2005-01-18 10:20:50 UTC (rev 908)
@@ -20,14 +20,14 @@
   archive(native) = "lablglade.cmxa"
 )
 
-package "gnomecanvas" (
-  requires = "lablgtk2"
-  archive(byte)	= "lablgnomecanvas.cma"
-  archive(native) = "lablgnomecanvas.cmxa"
-)
-
 package "gtkgl" (
   requires = "lablgtk2 lablgl"
   archive(byte)	= "lablgtkgl.cma"
   archive(native) = "lablgtkgl.cmxa"
 )
+
+package "gtkspell" (
+  requires = "lablgtk2"
+  archive(byte) = "lablgtkspell.cma"
+  archive(native) = "lablgtkspell.cmxa"
+)

Deleted: packages/lablgtk/branches/split-gnome/debian/META.gnome
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/META.gnome	2005-01-17 22:29:17 UTC (rev 907)
+++ packages/lablgtk/branches/split-gnome/debian/META.gnome	2005-01-18 10:20:50 UTC (rev 908)
@@ -1,39 +0,0 @@
-version="2.40"
-requires(mt) = "threads"
-requires(mt,mt_vm) = "threads.vm"
-requires(mt,mt_posix) = "threads.posix"
-directory="+lablgtk2"
-archive(byte) = "lablgtk.cma"
-archive(native) = "lablgtk.cmxa"
-archive(byte,mt) += "gtkThread.cmo"
-archive(native,mt) += "gtkThread.cmx"
-
-package "init" (
-  requires = "lablgtk2"
-  archive(byte) = "gtkInit.cmo"
-  archive(native) = "gtkInit.cmx"
-)
-
-package "glade" (
-  requires = "lablgtk2"
-  archive(byte)	= "lablglade.cma"
-  archive(native) = "lablglade.cmxa"
-)
-
-package "gnomecanvas" (
-  requires = "lablgtk2"
-  archive(byte)	= "lablgnomecanvas.cma"
-  archive(native) = "lablgnomecanvas.cmxa"
-)
-
-package "gtkgl" (
-  requires = "lablgtk2 lablgl"
-  archive(byte)	= "lablgtkgl.cma"
-  archive(native) = "lablgtkgl.cmxa"
-)
-
-package "rsvg" (
-  requires = "lablgtk2"
-  archive(byte)	= "lablrsvg.cma"
-  archive(native) = "labrsvg.cmxa"
-)

Deleted: packages/lablgtk/branches/split-gnome/debian/META.gtkgl
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/META.gtkgl	2005-01-17 22:29:17 UTC (rev 907)
+++ packages/lablgtk/branches/split-gnome/debian/META.gtkgl	2005-01-18 10:20:50 UTC (rev 908)
@@ -1,7 +0,0 @@
-requires="lablgl lablgtk2"
-version="2.2.0"
-directory="+lablgtk2"
-
-archive(native)="lablgtkgl.cmxa"
-archive(byte)="lablgtkgl.cma"
-

Added: packages/lablgtk/branches/split-gnome/debian/META.lablgtk2-gnome
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/META.lablgtk2-gnome	2005-01-17 22:29:17 UTC (rev 907)
+++ packages/lablgtk/branches/split-gnome/debian/META.lablgtk2-gnome	2005-01-18 10:20:50 UTC (rev 908)
@@ -0,0 +1,24 @@
+version="2.40"
+directory="+lablgtk2"
+requires = "lablgtk2"
+
+package "gnomecanvas" (
+  archive(byte)	= "lablgnomecanvas.cma"
+  archive(native) = "lablgnomecanvas.cmxa"
+)
+
+package "gnomeui" (
+  archive(byte) = "lablgnomeui.cma"
+  archive(native) = "lablgnomeui.cmxa"
+)
+
+package "panel" (
+  archive(byte) = "lablpanel.cma"
+  archive(native) = "lablpanel.cmxa"
+)
+
+package "rsvg" (
+  archive(byte) = "lablrsvg.cma"
+  archive(native) = "lablrsvg.cmxa"
+)
+

Modified: packages/lablgtk/branches/split-gnome/debian/control
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/control	2005-01-17 22:29:17 UTC (rev 907)
+++ packages/lablgtk/branches/split-gnome/debian/control	2005-01-18 10:20:50 UTC (rev 908)
@@ -24,11 +24,13 @@
  lablgtk2 contains bindings for gtk+ 2.x and OCaml.
  .
  This package include only the dynamic libraries needed for running dynamic
- bytecode executables using gnome functionalities.
+ bytecode executables using gnome functionalities (panel-appel, gnomeui,
+ gnome-canvas, rsvg).
 
 Package: liblablgtk2-ocaml-dev
 Section: libdevel
 Architecture: any
+Suggests: liblablgtk2-gnome-ocaml-dev
 Depends: liblablgtk2-ocaml (= ${Source-Version}), ocaml-3.08, libgtk2.0-dev, libgtkgl2.0-dev, libglade2-dev, liblablgl-ocaml-dev (>= 1.01-1), libgtkspell-dev
 Conflicts: findlib (<< 1.0.2)
 Description: OCaml bindings to Gtk+ version 2
@@ -45,4 +47,4 @@
  lablgtk2 contains bindings for gtk+ 2.x and OCaml.
  .
  This package contains the development files of lablgtk for libraries using
- gnome functionalities.
+ gnome functionalities (panel-appel, gnomeui, gnome-canvas, rsvg).

Modified: packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml-dev.dirs
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml-dev.dirs	2005-01-17 22:29:17 UTC (rev 907)
+++ packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml-dev.dirs	2005-01-18 10:20:50 UTC (rev 908)
@@ -1 +1,2 @@
+usr/lib/ocaml/3.08/METAS
 usr/lib/ocaml/3.08/lablgtk2

Deleted: packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.override
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.override	2005-01-17 22:29:17 UTC (rev 907)
+++ packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.override	2005-01-18 10:20:50 UTC (rev 908)
@@ -1,2 +0,0 @@
-liblablgtk2-ocaml-dev: binary-without-manpage lablgladecc2
-liblablgtk2-ocaml-dev: binary-without-manpage lablgtk2

Modified: packages/lablgtk/branches/split-gnome/debian/rules
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/rules	2005-01-17 22:29:17 UTC (rev 907)
+++ packages/lablgtk/branches/split-gnome/debian/rules	2005-01-18 10:20:50 UTC (rev 908)
@@ -77,13 +77,13 @@
 	cp debian/META $(CURDIR)/debian/liblablgtk2-ocaml-dev$(OCAML_LIBDIR)/lablgtk2
 
 	# TODO !!!!!!!!!
-	cp debian/META.gnome $(CURDIR)/debian/liblablgtk2-gnome-ocaml-dev$(OCAML_LIBDIR)/lablgtk2
+	cp debian/META.lablgtk2-gnome $(CURDIR)/debian/liblablgtk2-gnome-ocaml-dev$(OCAML_LIBDIR)/METAS
 
 	# This file is needed by lablgtk2-doc
 	cp src/gnomeDruid.cmi $(CURDIR)/debian/liblablgtk2-gnome-ocaml-dev$(OCAML_LIBDIR)/lablgtk2
 	
-	install -m 644 debian/liblablgtk2-ocaml-dev.override \
-		$(CURDIR)/debian/liblablgtk2-ocaml-dev/usr/share/lintian/overrides/liblablgtk2-ocaml-dev
+	#install -m 644 debian/liblablgtk2-ocaml-dev.override \
+	#	$(CURDIR)/debian/liblablgtk2-ocaml-dev/usr/share/lintian/overrides/liblablgtk2-ocaml-dev
 
 # Build architecture-independent files here.
 binary-indep: build install