[Pkg-ocaml-maint-commits] r2670 - in /trunk/packages/lablgtk:
branches/ trunk/debian/
smimram at users.alioth.debian.org
smimram at users.alioth.debian.org
Wed May 10 17:05:50 UTC 2006
Author: smimram
Date: Wed May 10 17:05:47 2006
New Revision: 2670
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2670
Log:
Splitting the GL parts away.
Added:
trunk/packages/lablgtk/trunk/debian/META.lablgtk2-gl
trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.dirs.in
trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.docs
trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.files.in
trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.dirs.in
trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.docs
trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.files.in
Removed:
trunk/packages/lablgtk/branches/
trunk/packages/lablgtk/trunk/debian/README.Debian
Modified:
trunk/packages/lablgtk/trunk/debian/META
trunk/packages/lablgtk/trunk/debian/changelog
trunk/packages/lablgtk/trunk/debian/control
trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.override
trunk/packages/lablgtk/trunk/debian/rules
Modified: trunk/packages/lablgtk/trunk/debian/META
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/META?rev=2670&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/META (original)
+++ trunk/packages/lablgtk/trunk/debian/META Wed May 10 17:05:47 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"
Added: trunk/packages/lablgtk/trunk/debian/META.lablgtk2-gl
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/META.lablgtk2-gl?rev=2670&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/META.lablgtk2-gl (added)
+++ trunk/packages/lablgtk/trunk/debian/META.lablgtk2-gl Wed May 10 17:05:47 2006
@@ -1,0 +1,9 @@
+version="2.6.0"
+directory="+lablgtk2"
+requires = "lablgtk2"
+
+package "gtkgl" (
+ requires = "lablgtk2 lablgl"
+ archive(byte) = "lablgtkgl.cma"
+ archive(native) = "lablgtkgl.cmxa"
+)
Modified: trunk/packages/lablgtk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/changelog?rev=2670&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/changelog (original)
+++ trunk/packages/lablgtk/trunk/debian/changelog Wed May 10 17:05:47 2006
@@ -1,3 +1,12 @@
+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.
+ * Updated standards version to 3.7.2, no changes needed.
+
+ -- Samuel Mimram <smimram at debian.org> Wed, 10 May 2006 11:23:21 +0000
+
lablgtk2 (2.6.0-3) unstable; urgency=low
[ Samuel Mimram ]
Modified: trunk/packages/lablgtk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/control?rev=2670&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/control (original)
+++ trunk/packages/lablgtk/trunk/debian/control Wed May 10 17:05:47 2006
@@ -4,7 +4,7 @@
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Sven Luther <luther at debian.org>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>
Build-Depends: debhelper (>> 3.0.0), ocaml (>= 3.09.1), libncurses5-dev, xlibs|xlib6g, debhelper, libgtk2.0-dev, libgtkgl2.0-dev, libglade2-dev, liblablgl-ocaml-dev (>= 1.02-1), librsvg2-dev, libgnomecanvas2-dev, libgtkspell-dev, libgnomeui-dev, libpanel-applet2-dev, dpatch, chrpath
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
Package: liblablgtk2-ocaml
Section: libs
@@ -15,6 +15,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
@@ -31,13 +42,25 @@
Package: liblablgtk2-ocaml-dev
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
+Suggests: liblablgtk2-gl-ocaml-dev, liblablgtk2-gnome-ocaml-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
Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.dirs.in?rev=2670&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.dirs.in (added)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.dirs.in Wed May 10 17:05:47 2006
@@ -1,0 +1,3 @@
+usr/lib/ocaml/#OcamlABI#/METAS
+usr/lib/ocaml/#OcamlABI#/lablgtk2
+usr/share/doc/liblablgtk2-gl-ocaml-dev/examples
Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.docs?rev=2670&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.docs (added)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.docs Wed May 10 17:05:47 2006
@@ -1,0 +1,1 @@
+README
Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.files.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.files.in?rev=2670&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.files.in (added)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml-dev.files.in Wed May 10 17:05:47 2006
@@ -1,0 +1,3 @@
+usr/lib/ocaml/#OcamlABI#/lablgtk2/glGtk.*
+usr/lib/ocaml/#OcamlABI#/lablgtk2/lablgtkgl.*
+usr/lib/ocaml/#OcamlABI#/lablgtk2/liblablgtkgl2*
Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.dirs.in?rev=2670&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.dirs.in (added)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.dirs.in Wed May 10 17:05:47 2006
@@ -1,0 +1,1 @@
+usr/lib/ocaml/#OcamlABI#/stublibs
Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.docs?rev=2670&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.docs (added)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.docs Wed May 10 17:05:47 2006
@@ -1,0 +1,1 @@
+README
Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.files.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.files.in?rev=2670&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.files.in (added)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gl-ocaml.files.in Wed May 10 17:05:47 2006
@@ -1,0 +1,1 @@
+usr/lib/ocaml/#OcamlABI#/stublibs/dlllablgtkgl2.so
Modified: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.override
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.override?rev=2670&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.override (original)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.override Wed May 10 17:05:47 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/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/rules?rev=2670&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/rules (original)
+++ trunk/packages/lablgtk/trunk/debian/rules Wed May 10 17:05:47 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