[Pkg-ocaml-maint-commits] r2654 - in /trunk/packages/lablgtk/branches: split_gl/debian/ upstream/

smimram at users.alioth.debian.org smimram at users.alioth.debian.org
Sat Apr 29 14:14:01 UTC 2006 

Author: smimram
Date: Sat Apr 29 14:13:59 2006
New Revision: 2654

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2654
Log:
Finished the GL split.

Added:
    trunk/packages/lablgtk/branches/split_gl/debian/META.lablgtk2-gl
      - copied, changed from r2653, trunk/packages/lablgtk/branches/split_gl/debian/META
    trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml-dev.dirs.in
      - copied, changed from r2653, trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gnome-ocaml-dev.dirs.in
    trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml-dev.docs
      - copied unchanged from r2653, trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gnome-ocaml-dev.docs
    trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml-dev.files.in
      - copied, changed from r2653, trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gnome-ocaml-dev.files.in
    trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml.dirs.in
      - copied unchanged from r2653, trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gnome-ocaml.dirs.in
    trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml.docs
      - copied unchanged from r2653, trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gnome-ocaml.docs
    trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml.files.in
      - copied, changed from r2653, trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gnome-ocaml.files.in
    trunk/packages/lablgtk/branches/upstream/
      - copied from r2568, trunk/packages/lablgtk/upstream/
Removed:
    trunk/packages/lablgtk/branches/split_gl/debian/README.Debian
    trunk/packages/lablgtk/branches/split_gl/debian/control.in
Modified:
    trunk/packages/lablgtk/branches/split_gl/debian/META
    trunk/packages/lablgtk/branches/split_gl/debian/changelog
    trunk/packages/lablgtk/branches/split_gl/debian/control
    trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-ocaml-dev.override
    trunk/packages/lablgtk/branches/split_gl/debian/rules

Modified: trunk/packages/lablgtk/branches/split_gl/debian/META
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/branches/split_gl/debian/META?rev=2654&op=diff
==============================================================================
--- trunk/packages/lablgtk/branches/split_gl/debian/META (original)
+++ trunk/packages/lablgtk/branches/split_gl/debian/META Sat Apr 29 14:13:59 2006
@@ -20,12 +20,6 @@
   archive(native) = "lablglade.cmxa"
 )
 
-package "gtkgl" (
-  requires = "lablgtk2 lablgl"
-  archive(byte) = "lablgtkgl.cma"
-  archive(native) = "lablgtkgl.cmxa"
-)
-
 package "gtkspell" (
   requires = "lablgtk2"
   archive(byte) = "lablgtkspell.cma"

Copied: trunk/packages/lablgtk/branches/split_gl/debian/META.lablgtk2-gl (from r2653, trunk/packages/lablgtk/branches/split_gl/debian/META)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/branches/split_gl/debian/META.lablgtk2-gl?rev=2654&op=diff
==============================================================================
--- trunk/packages/lablgtk/branches/split_gl/debian/META (original)
+++ trunk/packages/lablgtk/branches/split_gl/debian/META.lablgtk2-gl Sat Apr 29 14:13:59 2006
@@ -1,33 +1,9 @@
 version="2.6.0"
-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"
-)
+requires = "lablgtk2"
 
 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"
-)

Modified: trunk/packages/lablgtk/branches/split_gl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/branches/split_gl/debian/changelog?rev=2654&op=diff
==============================================================================
--- trunk/packages/lablgtk/branches/split_gl/debian/changelog (original)
+++ trunk/packages/lablgtk/branches/split_gl/debian/changelog Sat Apr 29 14:13:59 2006
@@ -1,3 +1,11 @@
+lablgtk2 (2.6.0-4) unstable; urgency=low
+
+  * Split opengl-specific parts of the package in liblablgtk2-gl-ocaml(-dev),
+    closes: #365317.
+  * Removed the outdated README.Debian.
+
+ -- Samuel Mimram <smimram at debian.org>  Sat, 29 Apr 2006 11:54:44 +0000
+
 lablgtk2 (2.6.0-3) unstable; urgency=low
 
   [ Samuel Mimram ]

Modified: trunk/packages/lablgtk/branches/split_gl/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/branches/split_gl/debian/control?rev=2654&op=diff
==============================================================================
--- trunk/packages/lablgtk/branches/split_gl/debian/control (original)
+++ trunk/packages/lablgtk/branches/split_gl/debian/control Sat Apr 29 14:13:59 2006
@@ -16,6 +16,17 @@
  This package include only the dynamic libraries needed for running dynamic
  bytecode executables.
 
+Package: liblablgtk2-gl-ocaml
+Section: libs
+Architecture: any
+Depends: liblablgtk2-ocaml (= ${Source-Version}), ${shlibs:Depends}
+Replaces: liblablgtk2-ocaml (<= 2.6.0-3)
+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
 Section: libs
 Architecture: any
@@ -32,12 +43,24 @@
 Section: libdevel
 Architecture: any
 Suggests: liblablgtk2-gnome-ocaml-dev
-Depends: liblablgtk2-ocaml (= ${Source-Version}), ocaml-${F:OCamlABI}, libgtk2.0-dev, libgtkgl2.0-dev, libglade2-dev, liblablgl-ocaml-dev (>= 1.02-1), libgtkspell-dev
+Depends: liblablgtk2-ocaml (= ${Source-Version}), ocaml-${F:OCamlABI}, libgtk2.0-dev, libglade2-dev, libgtkspell-dev
 Conflicts: findlib (<< 1.0.2)
 Description: OCaml bindings to Gtk+ version 2
  lablgtk2 contains bindings for gtk+ 2.x and OCaml.
  .
  This package contains the development files of lablgtk.
+
+Package: liblablgtk2-gl-ocaml-dev
+Section: libdevel
+Architecture: any
+Suggests: liblablgtk2-gnome-ocaml-dev
+Depends: liblablgtk2-ocaml-dev (= ${Source-Version}), liblablgtk2-gl-ocaml (= ${Source-Version}), ocaml-${F:OCamlABI}, libgtkgl2.0-dev, liblablgl-ocaml-dev (>= 1.02-1)
+Replaces: liblablgtk2-ocaml-dev (<= 2.6.0-3)
+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
 Section: libdevel

Copied: trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml-dev.dirs.in (from r2653, trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gnome-ocaml-dev.dirs.in)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml-dev.dirs.in?rev=2654&op=diff
==============================================================================
--- trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gnome-ocaml-dev.dirs.in (original)
+++ trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml-dev.dirs.in Sat Apr 29 14:13:59 2006
@@ -1,3 +1,3 @@
 usr/lib/ocaml/#OcamlABI#/METAS
 usr/lib/ocaml/#OcamlABI#/lablgtk2
-usr/share/doc/liblablgtk2-gnome-ocaml-dev/examples
+usr/share/doc/liblablgtk2-gl-ocaml-dev/examples

Copied: trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml-dev.files.in (from r2653, trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gnome-ocaml-dev.files.in)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml-dev.files.in?rev=2654&op=diff
==============================================================================
--- trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gnome-ocaml-dev.files.in (original)
+++ trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml-dev.files.in Sat Apr 29 14:13:59 2006
@@ -1,16 +1,3 @@
-usr/lib/ocaml/#OcamlABI#/lablgtk2/rsvg.*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/gnomeCanvas.*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/gnoCanvas.*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/gnomeDruid.*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/gnoDruid.*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/panel.*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/lablgnomecanvas.*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/lablgnomeui.*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/lablpanel.*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/lablrsvg.*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/liblablgnomecanvas.*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/liblablgnomeui.*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/liblablpanel.*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/liblablrsvg.*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/gnomeui_tags.h
-usr/lib/ocaml/#OcamlABI#/lablgtk2/panel_tags.h
+usr/lib/ocaml/#OcamlABI#/lablgtk2/glGtk.*
+usr/lib/ocaml/#OcamlABI#/lablgtk2/lablgtkgl.*
+usr/lib/ocaml/#OcamlABI#/lablgtk2/liblablgtkgl2*

Copied: trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml.files.in (from r2653, trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gnome-ocaml.files.in)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml.files.in?rev=2654&op=diff
==============================================================================
--- trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gnome-ocaml.files.in (original)
+++ trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-gl-ocaml.files.in Sat Apr 29 14:13:59 2006
@@ -1,4 +1,1 @@
-usr/lib/ocaml/#OcamlABI#/stublibs/dlllablgnomecanvas.so
-usr/lib/ocaml/#OcamlABI#/stublibs/dlllablgnomeui.so
-usr/lib/ocaml/#OcamlABI#/stublibs/dlllablpanel.so
-usr/lib/ocaml/#OcamlABI#/stublibs/dlllablrsvg.so
+usr/lib/ocaml/#OcamlABI#/stublibs/dlllablgtkgl2.so

Modified: trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-ocaml-dev.override
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-ocaml-dev.override?rev=2654&op=diff
==============================================================================
--- trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-ocaml-dev.override (original)
+++ trunk/packages/lablgtk/branches/split_gl/debian/liblablgtk2-ocaml-dev.override Sat Apr 29 14:13:59 2006
@@ -1,2 +1,3 @@
 liblablgtk2-ocaml-dev: binary-without-manpage lablgladecc2
 liblablgtk2-ocaml-dev: binary-without-manpage lablgtk2
+liblablgtk2-ocaml-dev: binary-without-manpage gdk-pixbuf-mlsource

Modified: trunk/packages/lablgtk/branches/split_gl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/branches/split_gl/debian/rules?rev=2654&op=diff
==============================================================================
--- trunk/packages/lablgtk/branches/split_gl/debian/rules (original)
+++ trunk/packages/lablgtk/branches/split_gl/debian/rules Sat Apr 29 14:13:59 2006
@@ -22,14 +22,6 @@
 	INSTALL_PROGRAM += -s
 endif
 
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
 debian/control:
 	sed -e 's%#OcamlABI#%$(OCAMLABI)%' $@.in > $@
@@ -82,13 +74,15 @@
 
 	# Install METAs
 	cp debian/META $(CURDIR)/debian/liblablgtk2-ocaml-dev$(OCAML_LIBDIR)/lablgtk2
+	cp debian/META.lablgtk2-gl $(CURDIR)/debian/liblablgtk2-gl-ocaml-dev$(OCAML_LIBDIR)/METAS
 	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
 
 	# Examples
-	cp -r examples/rsvg examples/panel examples/canvas $(CURDIR)/debian/liblablgtk2-gnome-ocaml-dev/usr/share/doc/liblablgtk2-gnome-ocaml-dev/examples
+	cp -r examples/GL/*  $(CURDIR)/debian/liblablgtk2-gl-ocaml-dev/usr/share/doc/liblablgtk2-gl-ocaml-dev/examples/
+	cp -r examples/rsvg examples/panel examples/canvas $(CURDIR)/debian/liblablgtk2-gnome-ocaml-dev/usr/share/doc/liblablgtk2-gnome-ocaml-dev/examples/
 
 	# Lintian override
 	install -m 644 debian/liblablgtk2-ocaml-dev.override $(CURDIR)/debian/liblablgtk2-ocaml-dev/usr/share/lintian/overrides/liblablgtk2-ocaml-dev
@@ -104,7 +98,7 @@
 
 #	dh_installdebconf -s
 	dh_installdocs -s
-	dh_installexamples -s --exclude='.cvsignore' --exclude='rsvg' --exclude='panel' --exclude='canvas'
+	dh_installexamples -s --exclude='.cvsignore' --exclude='rsvg' --exclude='panel' --exclude='canvas' --exclude='GL'
 	dh_installmenu -s
 	dh_movefiles -s
 	dh_install -s --sourcedir=$(DESTDIR) --list-missing

More information about the Pkg-ocaml-maint-commits mailing list