[Pkg-ocaml-maint-commits] r1901 -
trunk/packages/lablgtk/trunk/debian
Sven Luther
luther at costa.debian.org
Wed Nov 2 15:14:00 UTC 2005
Author: luther
Date: 2005-11-02 15:13:59 +0000 (Wed, 02 Nov 2005)
New Revision: 1901
Added:
trunk/packages/lablgtk/trunk/debian/compat
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
Removed:
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
Modified:
trunk/packages/lablgtk/trunk/debian/control
trunk/packages/lablgtk/trunk/debian/rules
Log:
Adapted to new no-hardcoded ocaml abi scheme.
Added: trunk/packages/lablgtk/trunk/debian/compat
===================================================================
--- trunk/packages/lablgtk/trunk/debian/compat 2005-11-02 15:08:24 UTC (rev 1900)
+++ trunk/packages/lablgtk/trunk/debian/compat 2005-11-02 15:13:59 UTC (rev 1901)
@@ -0,0 +1 @@
+4
Modified: trunk/packages/lablgtk/trunk/debian/control
===================================================================
--- trunk/packages/lablgtk/trunk/debian/control 2005-11-02 15:08:24 UTC (rev 1900)
+++ trunk/packages/lablgtk/trunk/debian/control 2005-11-02 15:13:59 UTC (rev 1901)
@@ -3,13 +3,13 @@
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.08.3, libncurses5-dev, xlibs|xlib6g, debhelper, libgtk2.0-dev, libgtkgl2.0-dev, libglade2-dev, liblablgl-ocaml-dev (>= 1.01-1), librsvg2-dev, libgnomecanvas2-dev, libgtkspell-dev, libgnomeui-dev, libpanel-applet2-dev, dpatch, chrpath
+Build-Depends: debhelper (>> 3.0.0), ocaml (>= 3.09.0), libncurses5-dev, xlibs|xlib6g, debhelper, libgtk2.0-dev, libgtkgl2.0-dev, libglade2-dev, liblablgl-ocaml-dev (>= 1.01-1), librsvg2-dev, libgnomecanvas2-dev, libgtkspell-dev, libgnomeui-dev, libpanel-applet2-dev, dpatch, chrpath
Standards-Version: 3.6.1.1
Package: liblablgtk2-ocaml
Section: libs
Architecture: any
-Depends: ocaml-base-3.08.3, ${shlibs:Depends}
+Depends: ocaml-base-${F:OcamlABI}, ${shlibs:Depends}
Description: runtime libraries for OCaml bindings for Gtk+ version 2
lablgtk2 contains bindings for gtk+ 2.x and OCaml.
.
@@ -32,7 +32,7 @@
Section: libdevel
Architecture: any
Suggests: liblablgtk2-gnome-ocaml-dev
-Depends: liblablgtk2-ocaml (= ${Source-Version}), ocaml-3.08.3, libgtk2.0-dev, libgtkgl2.0-dev, libglade2-dev, liblablgl-ocaml-dev (>= 1.01-1), libgtkspell-dev
+Depends: liblablgtk2-ocaml (= ${Source-Version}), ocaml-${F:OcamlABI}, 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
lablgtk2 contains bindings for gtk+ 2.x and OCaml.
@@ -42,7 +42,7 @@
Package: liblablgtk2-gnome-ocaml-dev
Section: libdevel
Architecture: any
-Depends: liblablgtk2-ocaml-dev (= ${Source-Version}), liblablgtk2-gnome-ocaml (= ${Source-Version}), ocaml-3.08.3, librsvg2-dev, libgnomecanvas2-dev, libgnomeui-dev, libpanel-applet2-dev
+Depends: liblablgtk2-ocaml-dev (= ${Source-Version}), liblablgtk2-gnome-ocaml (= ${Source-Version}), ocaml-${F:OcamlABI}, librsvg2-dev, libgnomecanvas2-dev, libgnomeui-dev, libpanel-applet2-dev
Replaces: liblablgtk2-ocaml-dev (<= 2.4.0+2005.02.18-1)
Description: OCaml bindings to Gnome
lablgtk2 contains bindings for gtk+ 2.x and Objective Caml.
Deleted: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs 2005-11-02 15:08:24 UTC (rev 1900)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs 2005-11-02 15:13:59 UTC (rev 1901)
@@ -1,3 +0,0 @@
-usr/lib/ocaml/3.08.3/METAS
-usr/lib/ocaml/3.08.3/lablgtk2
-usr/share/doc/liblablgtk2-gnome-ocaml-dev/examples
Copied: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs.in (from rev 1849, trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs)
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs 2005-10-25 08:03:49 UTC (rev 1849)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs.in 2005-11-02 15:13:59 UTC (rev 1901)
@@ -0,0 +1,3 @@
+usr/lib/ocaml/#OcamlABI#/METAS
+usr/lib/ocaml/#OcamlABI#/lablgtk2
+usr/share/doc/liblablgtk2-gnome-ocaml-dev/examples
Deleted: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files 2005-11-02 15:08:24 UTC (rev 1900)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files 2005-11-02 15:13:59 UTC (rev 1901)
@@ -1,16 +0,0 @@
-usr/lib/ocaml/3.08.3/lablgtk2/rsvg.*
-usr/lib/ocaml/3.08.3/lablgtk2/gnomeCanvas.*
-usr/lib/ocaml/3.08.3/lablgtk2/gnoCanvas.*
-usr/lib/ocaml/3.08.3/lablgtk2/gnomeDruid.*
-usr/lib/ocaml/3.08.3/lablgtk2/gnoDruid.*
-usr/lib/ocaml/3.08.3/lablgtk2/panel.*
-usr/lib/ocaml/3.08.3/lablgtk2/lablgnomecanvas.*
-usr/lib/ocaml/3.08.3/lablgtk2/lablgnomeui.*
-usr/lib/ocaml/3.08.3/lablgtk2/lablpanel.*
-usr/lib/ocaml/3.08.3/lablgtk2/lablrsvg.*
-usr/lib/ocaml/3.08.3/lablgtk2/liblablgnomecanvas.*
-usr/lib/ocaml/3.08.3/lablgtk2/liblablgnomeui.*
-usr/lib/ocaml/3.08.3/lablgtk2/liblablpanel.*
-usr/lib/ocaml/3.08.3/lablgtk2/liblablrsvg.*
-usr/lib/ocaml/3.08.3/lablgtk2/gnomeui_tags.h
-usr/lib/ocaml/3.08.3/lablgtk2/panel_tags.h
Copied: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files.in (from rev 1849, trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files)
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files 2005-10-25 08:03:49 UTC (rev 1849)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files.in 2005-11-02 15:13:59 UTC (rev 1901)
@@ -0,0 +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
Deleted: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs 2005-11-02 15:08:24 UTC (rev 1900)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs 2005-11-02 15:13:59 UTC (rev 1901)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3/stublibs
Copied: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs.in (from rev 1849, trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs)
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs 2005-10-25 08:03:49 UTC (rev 1849)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs.in 2005-11-02 15:13:59 UTC (rev 1901)
@@ -0,0 +1 @@
+usr/lib/ocaml/#OcamlABI#/stublibs
Deleted: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files 2005-11-02 15:08:24 UTC (rev 1900)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files 2005-11-02 15:13:59 UTC (rev 1901)
@@ -1,4 +0,0 @@
-usr/lib/ocaml/3.08.3/stublibs/dlllablgnomecanvas.so
-usr/lib/ocaml/3.08.3/stublibs/dlllablgnomeui.so
-usr/lib/ocaml/3.08.3/stublibs/dlllablpanel.so
-usr/lib/ocaml/3.08.3/stublibs/dlllablrsvg.so
Copied: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files.in (from rev 1849, trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files)
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files 2005-10-25 08:03:49 UTC (rev 1849)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files.in 2005-11-02 15:13:59 UTC (rev 1901)
@@ -0,0 +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
Deleted: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs 2005-11-02 15:08:24 UTC (rev 1900)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs 2005-11-02 15:13:59 UTC (rev 1901)
@@ -1,4 +0,0 @@
-usr/bin
-usr/lib/ocaml/3.08.3/lablgtk2
-usr/lib/ocaml/3.08.3/lablgtkgl2
-usr/share/lintian/overrides
Copied: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs.in (from rev 1849, trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs)
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs 2005-10-25 08:03:49 UTC (rev 1849)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs.in 2005-11-02 15:13:59 UTC (rev 1901)
@@ -0,0 +1,4 @@
+usr/bin
+usr/lib/ocaml/#OcamlABI#/lablgtk2
+usr/lib/ocaml/#OcamlABI#/lablgtkgl2
+usr/share/lintian/overrides
Deleted: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install 2005-11-02 15:08:24 UTC (rev 1900)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install 2005-11-02 15:13:59 UTC (rev 1901)
@@ -1,13 +0,0 @@
-usr/bin/*
-usr/lib/ocaml/3.08.3/lablgtk2/*.mli
-usr/lib/ocaml/3.08.3/lablgtk2/*.ml
-usr/lib/ocaml/3.08.3/lablgtk2/*.cmi
-usr/lib/ocaml/3.08.3/lablgtk2/*.cma
-usr/lib/ocaml/3.08.3/lablgtk2/*.cmo
-usr/lib/ocaml/3.08.3/lablgtk2/*.cmx
-usr/lib/ocaml/3.08.3/lablgtk2/*.cmxa
-usr/lib/ocaml/3.08.3/lablgtk2/*.a
-usr/lib/ocaml/3.08.3/lablgtk2/*.h
-usr/lib/ocaml/3.08.3/lablgtk2/*.o
-usr/lib/ocaml/3.08.3/lablgtk2/varcc
-usr/lib/ocaml/3.08.3/lablgtk2/propcc
Copied: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install.in (from rev 1849, trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install)
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install 2005-10-25 08:03:49 UTC (rev 1849)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install.in 2005-11-02 15:13:59 UTC (rev 1901)
@@ -0,0 +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
Deleted: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs 2005-11-02 15:08:24 UTC (rev 1900)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs 2005-11-02 15:13:59 UTC (rev 1901)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3/stublibs
Copied: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs.in (from rev 1849, trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs)
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs 2005-10-25 08:03:49 UTC (rev 1849)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs.in 2005-11-02 15:13:59 UTC (rev 1901)
@@ -0,0 +1 @@
+usr/lib/ocaml/#OcamlABI#/stublibs
Deleted: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install 2005-11-02 15:08:24 UTC (rev 1900)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install 2005-11-02 15:13:59 UTC (rev 1901)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3/stublibs
Copied: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install.in (from rev 1849, trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install)
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install 2005-10-25 08:03:49 UTC (rev 1849)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install.in 2005-11-02 15:13:59 UTC (rev 1901)
@@ -0,0 +1 @@
+usr/lib/ocaml/#OcamlABI#/stublibs
Modified: trunk/packages/lablgtk/trunk/debian/rules
===================================================================
--- trunk/packages/lablgtk/trunk/debian/rules 2005-11-02 15:08:24 UTC (rev 1900)
+++ trunk/packages/lablgtk/trunk/debian/rules 2005-11-02 15:13:59 UTC (rev 1901)
@@ -5,13 +5,11 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+OCAMLABK = `ocamlc -version`
export OCAML_LIBDIR=`ocamlc -where`
DESTDIR = $(CURDIR)/debian/tmp
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
# We want to use dpatch.
include /usr/share/dpatch/dpatch.make
PACKAGE = lablgtk
@@ -35,6 +33,10 @@
configure: configure-stamp
configure-stamp:
+ for t in `find . -name \*.in`; do \
+ sed -e 's%#OcamlABI#%$(OCAMLABI)%' $$t >$${t%.in}; \
+ done
+
dh_testdir
./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
@@ -115,7 +117,7 @@
dh_makeshlibs -s
dh_installdeb -s
dh_shlibdeps -s
- dh_gencontrol -s
+ dh_gencontrol -s -- -VF:OcamlABI="$(OCAMLABI)"
dh_md5sums -s
dh_builddeb -s
More information about the Pkg-ocaml-maint-commits
mailing list