[Pkg-ocaml-maint-commits] r2716 - /trunk/packages/lablgtk/trunk/debian/

zack at users.alioth.debian.org zack at users.alioth.debian.org
Wed May 17 01:01:12 UTC 2006


Author: zack
Date: Wed May 17 01:01:10 2006
New Revision: 2716

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2716
Log:
toward 3.09.2 release

Added:
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install
Removed:
    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
Modified:
    trunk/packages/lablgtk/trunk/debian/changelog
    trunk/packages/lablgtk/trunk/debian/control
    trunk/packages/lablgtk/trunk/debian/control.in
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs.in
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files.in
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs.in
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files.in
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs.in
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install.in
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs.in
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install.in
    trunk/packages/lablgtk/trunk/debian/rules

Modified: trunk/packages/lablgtk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/changelog?rev=2716&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/changelog (original)
+++ trunk/packages/lablgtk/trunk/debian/changelog Wed May 17 01:01:10 2006
@@ -1,3 +1,15 @@
+lablgtk2 (2.6.0-5) UNRELEASED; urgency=low
+
+  * Rebuilt against ocaml 3.09.2 (bumped deps accordingly).
+  * debian/control
+    - bumped Standards-Version to 3.7.2 (no changes needed)
+  * debian/*
+    - ported .in handling to the more "standard" why, avoiding the risk of
+      (re-)generating debian/control during the build
+    - removed -gl stuff, we don't have a package for that
+
+ -- Stefano Zacchiroli <zack at debian.org>  Wed, 17 May 2006 00:32:44 +0000
+
 lablgtk2 (2.6.0-4) unstable; urgency=low
 
   * Split opengl-specific parts of the package in liblablgtk2-gl-ocaml(-dev),

Modified: trunk/packages/lablgtk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/control?rev=2716&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/control (original)
+++ trunk/packages/lablgtk/trunk/debian/control Wed May 17 01:01:10 2006
@@ -3,7 +3,7 @@
 Priority: optional
 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
+Build-Depends: debhelper (>> 3.0.0), ocaml (>= 3.09.2), 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.7.2
 
 Package: liblablgtk2-ocaml
@@ -16,17 +16,6 @@
  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
@@ -36,31 +25,19 @@
  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 (panel-applet, gnomeui,
+ bytecode executables using gnome functionalities (panel-appel, gnomeui,
  gnome-canvas, rsvg).
 
 Package: liblablgtk2-ocaml-dev
 Section: libdevel
 Architecture: any
-Suggests: liblablgtk2-gl-ocaml-dev, liblablgtk2-gnome-ocaml-dev
-Depends: liblablgtk2-ocaml (= ${Source-Version}), ocaml-${F:OCamlABI}, libgtk2.0-dev, libglade2-dev, libgtkspell-dev
+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
 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

Modified: trunk/packages/lablgtk/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/control.in?rev=2716&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/control.in (original)
+++ trunk/packages/lablgtk/trunk/debian/control.in Wed May 17 01:01:10 2006
@@ -3,8 +3,8 @@
 Priority: optional
 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 (>= #OcamlABI#), 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
+Build-Depends: debhelper (>> 3.0.0), ocaml (>= @OCamlABI@), 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.7.2
 
 Package: liblablgtk2-ocaml
 Section: libs

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs?rev=2716&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs (added)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs Wed May 17 01:01:10 2006
@@ -1,0 +1,3 @@
+usr/lib/ocaml/3.09.2/METAS
+usr/lib/ocaml/3.09.2/lablgtk2
+usr/share/doc/liblablgtk2-gnome-ocaml-dev/examples

Modified: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs.in?rev=2716&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs.in (original)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs.in Wed May 17 01:01:10 2006
@@ -1,3 +1,3 @@
-usr/lib/ocaml/#OcamlABI#/METAS
-usr/lib/ocaml/#OcamlABI#/lablgtk2
+usr/lib/ocaml/@OCamlABI@/METAS
+usr/lib/ocaml/@OCamlABI@/lablgtk2
 usr/share/doc/liblablgtk2-gnome-ocaml-dev/examples

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files?rev=2716&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files (added)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files Wed May 17 01:01:10 2006
@@ -1,0 +1,16 @@
+usr/lib/ocaml/3.09.2/lablgtk2/rsvg.*
+usr/lib/ocaml/3.09.2/lablgtk2/gnomeCanvas.*
+usr/lib/ocaml/3.09.2/lablgtk2/gnoCanvas.*
+usr/lib/ocaml/3.09.2/lablgtk2/gnomeDruid.*
+usr/lib/ocaml/3.09.2/lablgtk2/gnoDruid.*
+usr/lib/ocaml/3.09.2/lablgtk2/panel.*
+usr/lib/ocaml/3.09.2/lablgtk2/lablgnomecanvas.*
+usr/lib/ocaml/3.09.2/lablgtk2/lablgnomeui.*
+usr/lib/ocaml/3.09.2/lablgtk2/lablpanel.*
+usr/lib/ocaml/3.09.2/lablgtk2/lablrsvg.*
+usr/lib/ocaml/3.09.2/lablgtk2/liblablgnomecanvas.*
+usr/lib/ocaml/3.09.2/lablgtk2/liblablgnomeui.*
+usr/lib/ocaml/3.09.2/lablgtk2/liblablpanel.*
+usr/lib/ocaml/3.09.2/lablgtk2/liblablrsvg.*
+usr/lib/ocaml/3.09.2/lablgtk2/gnomeui_tags.h
+usr/lib/ocaml/3.09.2/lablgtk2/panel_tags.h

Modified: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files.in?rev=2716&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files.in (original)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files.in Wed May 17 01:01:10 2006
@@ -1,16 +1,16 @@
-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/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

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs?rev=2716&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs (added)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs Wed May 17 01:01:10 2006
@@ -1,0 +1,1 @@
+usr/lib/ocaml/3.09.2/stublibs

Modified: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs.in?rev=2716&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs.in (original)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs.in Wed May 17 01:01:10 2006
@@ -1,1 +1,1 @@
-usr/lib/ocaml/#OcamlABI#/stublibs
+usr/lib/ocaml/@OCamlABI@/stublibs

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files?rev=2716&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files (added)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files Wed May 17 01:01:10 2006
@@ -1,0 +1,4 @@
+usr/lib/ocaml/3.09.2/stublibs/dlllablgnomecanvas.so
+usr/lib/ocaml/3.09.2/stublibs/dlllablgnomeui.so
+usr/lib/ocaml/3.09.2/stublibs/dlllablpanel.so
+usr/lib/ocaml/3.09.2/stublibs/dlllablrsvg.so

Modified: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files.in?rev=2716&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files.in (original)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files.in Wed May 17 01:01:10 2006
@@ -1,4 +1,4 @@
-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/dlllablgnomecanvas.so
+usr/lib/ocaml/@OCamlABI@/stublibs/dlllablgnomeui.so
+usr/lib/ocaml/@OCamlABI@/stublibs/dlllablpanel.so
+usr/lib/ocaml/@OCamlABI@/stublibs/dlllablrsvg.so

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs?rev=2716&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs (added)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs Wed May 17 01:01:10 2006
@@ -1,0 +1,4 @@
+usr/bin
+usr/lib/ocaml/3.09.2/lablgtk2
+usr/lib/ocaml/3.09.2/lablgtkgl2
+usr/share/lintian/overrides

Modified: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs.in?rev=2716&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs.in (original)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs.in Wed May 17 01:01:10 2006
@@ -1,4 +1,4 @@
 usr/bin
-usr/lib/ocaml/#OcamlABI#/lablgtk2
-usr/lib/ocaml/#OcamlABI#/lablgtkgl2
+usr/lib/ocaml/@OCamlABI@/lablgtk2
+usr/lib/ocaml/@OCamlABI@/lablgtkgl2
 usr/share/lintian/overrides

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install?rev=2716&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install (added)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install Wed May 17 01:01:10 2006
@@ -1,0 +1,13 @@
+usr/bin/*
+usr/lib/ocaml/3.09.2/lablgtk2/*.mli
+usr/lib/ocaml/3.09.2/lablgtk2/*.ml
+usr/lib/ocaml/3.09.2/lablgtk2/*.cmi
+usr/lib/ocaml/3.09.2/lablgtk2/*.cma
+usr/lib/ocaml/3.09.2/lablgtk2/*.cmo
+usr/lib/ocaml/3.09.2/lablgtk2/*.cmx
+usr/lib/ocaml/3.09.2/lablgtk2/*.cmxa
+usr/lib/ocaml/3.09.2/lablgtk2/*.a
+usr/lib/ocaml/3.09.2/lablgtk2/*.h
+usr/lib/ocaml/3.09.2/lablgtk2/*.o
+usr/lib/ocaml/3.09.2/lablgtk2/varcc
+usr/lib/ocaml/3.09.2/lablgtk2/propcc

Modified: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install.in?rev=2716&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install.in (original)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install.in Wed May 17 01:01:10 2006
@@ -1,13 +1,13 @@
 usr/bin/*
-usr/lib/ocaml/#OcamlABI#/lablgtk2/*.mli
-usr/lib/ocaml/#OcamlABI#/lablgtk2/*.ml
-usr/lib/ocaml/#OcamlABI#/lablgtk2/*.cmi
-usr/lib/ocaml/#OcamlABI#/lablgtk2/*.cma
-usr/lib/ocaml/#OcamlABI#/lablgtk2/*.cmo
-usr/lib/ocaml/#OcamlABI#/lablgtk2/*.cmx
-usr/lib/ocaml/#OcamlABI#/lablgtk2/*.cmxa
-usr/lib/ocaml/#OcamlABI#/lablgtk2/*.a
-usr/lib/ocaml/#OcamlABI#/lablgtk2/*.h
-usr/lib/ocaml/#OcamlABI#/lablgtk2/*.o
-usr/lib/ocaml/#OcamlABI#/lablgtk2/varcc
-usr/lib/ocaml/#OcamlABI#/lablgtk2/propcc
+usr/lib/ocaml/@OCamlABI@/lablgtk2/*.mli
+usr/lib/ocaml/@OCamlABI@/lablgtk2/*.ml
+usr/lib/ocaml/@OCamlABI@/lablgtk2/*.cmi
+usr/lib/ocaml/@OCamlABI@/lablgtk2/*.cma
+usr/lib/ocaml/@OCamlABI@/lablgtk2/*.cmo
+usr/lib/ocaml/@OCamlABI@/lablgtk2/*.cmx
+usr/lib/ocaml/@OCamlABI@/lablgtk2/*.cmxa
+usr/lib/ocaml/@OCamlABI@/lablgtk2/*.a
+usr/lib/ocaml/@OCamlABI@/lablgtk2/*.h
+usr/lib/ocaml/@OCamlABI@/lablgtk2/*.o
+usr/lib/ocaml/@OCamlABI@/lablgtk2/varcc
+usr/lib/ocaml/@OCamlABI@/lablgtk2/propcc

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs?rev=2716&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs (added)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs Wed May 17 01:01:10 2006
@@ -1,0 +1,1 @@
+usr/lib/ocaml/3.09.2/stublibs

Modified: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs.in?rev=2716&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs.in (original)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs.in Wed May 17 01:01:10 2006
@@ -1,1 +1,1 @@
-usr/lib/ocaml/#OcamlABI#/stublibs
+usr/lib/ocaml/@OCamlABI@/stublibs

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install?rev=2716&op=file
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install (added)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install Wed May 17 01:01:10 2006
@@ -1,0 +1,1 @@
+usr/lib/ocaml/3.09.2/stublibs

Modified: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install.in?rev=2716&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install.in (original)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install.in Wed May 17 01:01:10 2006
@@ -1,1 +1,1 @@
-usr/lib/ocaml/#OcamlABI#/stublibs
+usr/lib/ocaml/@OCamlABI@/stublibs

Modified: trunk/packages/lablgtk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/rules?rev=2716&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/rules (original)
+++ trunk/packages/lablgtk/trunk/debian/rules Wed May 17 01:01:10 2006
@@ -5,7 +5,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-OCAMLABI = ${shell ocamlc -version}
+OCAMLABI = $(shell ocamlc -version)
+OFILES = $(patsubst %.in,%,$(shell ls debian/*.in))
 export OCAML_LIBDIR=`ocamlc -where`
 
 DESTDIR = $(CURDIR)/debian/tmp
@@ -22,15 +23,11 @@
 	INSTALL_PROGRAM += -s
 endif
 
-
-debian/control:
-	sed -e 's%#OcamlABI#%$(OCAMLABI)%' $@.in > $@
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
 
 configure: configure-stamp
 configure-stamp:
-	for t in `find debian/ -name \*.in | grep -v debian/control.in`; do \
-		sed -e 's%#OcamlABI#%$(OCAMLABI)%' $$t >$${t%.in}; \
-	done
 
 	dh_testdir
 
@@ -74,14 +71,12 @@
 
 	# 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/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




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