[Pkg-ocaml-maint-commits] r907 - packages/lablgtk/branches/split-gnome/debian
Samuel Mimram
smimram-guest@costa.debian.org
Mon, 17 Jan 2005 23:29:18 +0100
Author: smimram-guest
Date: 2005-01-17 23:29:17 +0100 (Mon, 17 Jan 2005)
New Revision: 907
Added:
packages/lablgtk/branches/split-gnome/debian/META.gnome
packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml-dev.dirs
packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml-dev.docs
packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml-dev.files
packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml.dirs
packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml.docs
packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml.files
packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.install
packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml.install
Removed:
packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml.files
Modified:
packages/lablgtk/branches/split-gnome/debian/META
packages/lablgtk/branches/split-gnome/debian/changelog
packages/lablgtk/branches/split-gnome/debian/control
packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.dirs
packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.override
packages/lablgtk/branches/split-gnome/debian/rules
Log:
First version of the gnome split packages.
Modified: packages/lablgtk/branches/split-gnome/debian/META
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/META 2005-01-17 21:27:30 UTC (rev 906)
+++ packages/lablgtk/branches/split-gnome/debian/META 2005-01-17 22:29:17 UTC (rev 907)
@@ -31,9 +31,3 @@
archive(byte) = "lablgtkgl.cma"
archive(native) = "lablgtkgl.cmxa"
)
-
-package "rsvg" (
- requires = "lablgtk2"
- archive(byte) = "lablrsvg.cma"
- archive(native) = "labrsvg.cmxa"
-)
Copied: packages/lablgtk/branches/split-gnome/debian/META.gnome (from rev 906, packages/lablgtk/branches/split-gnome/debian/META)
Modified: packages/lablgtk/branches/split-gnome/debian/changelog
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/changelog 2005-01-17 21:27:30 UTC (rev 906)
+++ packages/lablgtk/branches/split-gnome/debian/changelog 2005-01-17 22:29:17 UTC (rev 907)
@@ -1,3 +1,10 @@
+lablgtk2 (2.4.0+2004.11.19-4) unstable; urgency=low
+
+ * Split the gnome packages apart to avoid heavy dependencies on gnome libs,
+ closes: #290936.
+
+ -- Samuel Mimram <smimram@debian.org> Mon, 17 Jan 2005 23:02:04 +0100
+
lablgtk2 (2.4.0+2004.11.19-3) unstable; urgency=low
* Added GnomeUI and Panel-Applet support. This should make the package build
Modified: packages/lablgtk/branches/split-gnome/debian/control
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/control 2005-01-17 21:27:30 UTC (rev 906)
+++ packages/lablgtk/branches/split-gnome/debian/control 2005-01-17 22:29:17 UTC (rev 907)
@@ -16,12 +16,33 @@
This package include only the dynamic libraries needed for running dynamic
bytecode executables.
+Package: liblablgtk2-gnome-ocaml
+Section: libs
+Architecture: any
+Depends: liblablgtk2-ocaml (= ${Source-Version}), ${shlibs:Depends}
+Description: runtime libraries for ocaml bindings for Gtk+ version 2
+ 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.
+
Package: liblablgtk2-ocaml-dev
Section: libdevel
Architecture: any
-Depends: liblablgtk2-ocaml (= ${Source-Version}), ocaml-3.08, 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
+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
lablgtk2 contains bindings for gtk+ 2.x and OCaml.
.
This package contains the development files of lablgtk.
+
+Package: liblablgtk2-gnome-ocaml-dev
+Section: libdevel
+Architecture: any
+Depends: liblablgtk2-ocaml-dev (= ${Source-Version}), ocaml-3.08, librsvg2-dev, libgnomecanvas2-dev, libgnomeui-dev, libpanel-applet2-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 for libraries using
+ gnome functionalities.
Copied: packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml-dev.dirs (from rev 906, packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.dirs)
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.dirs 2005-01-17 21:27:30 UTC (rev 906)
+++ packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml-dev.dirs 2005-01-17 22:29:17 UTC (rev 907)
@@ -0,0 +1 @@
+usr/lib/ocaml/3.08/lablgtk2
Copied: packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml-dev.docs (from rev 906, packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.docs)
Added: packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml-dev.files
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml-dev.files 2005-01-17 21:27:30 UTC (rev 906)
+++ packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml-dev.files 2005-01-17 22:29:17 UTC (rev 907)
@@ -0,0 +1,40 @@
+usr/lib/ocaml/3.08/lablgtk2/rsvg.cmi
+usr/lib/ocaml/3.08/lablgtk2/gnomeCanvas.cmi
+usr/lib/ocaml/3.08/lablgtk2/gnoCanvas.cmi
+usr/lib/ocaml/3.08/lablgtk2/gnomeDruid.cmi
+usr/lib/ocaml/3.08/lablgtk2/gnoDruid.cmi
+usr/lib/ocaml/3.08/lablgtk2/panel.cmi
+usr/lib/ocaml/3.08/lablgtk2/gnoCanvas.mli
+usr/lib/ocaml/3.08/lablgtk2/gnoDruid.mli
+usr/lib/ocaml/3.08/lablgtk2/panel.mli
+usr/lib/ocaml/3.08/lablgtk2/rsvg.mli
+usr/lib/ocaml/3.08/lablgtk2/rsvg.ml
+usr/lib/ocaml/3.08/lablgtk2/gnomeCanvas.ml
+usr/lib/ocaml/3.08/lablgtk2/gnoCanvas.ml
+usr/lib/ocaml/3.08/lablgtk2/gnomeDruid.ml
+usr/lib/ocaml/3.08/lablgtk2/gnoDruid.ml
+usr/lib/ocaml/3.08/lablgtk2/panel.ml
+usr/lib/ocaml/3.08/lablgtk2/lablgnomecanvas.cma
+usr/lib/ocaml/3.08/lablgtk2/lablgnomeui.cma
+usr/lib/ocaml/3.08/lablgtk2/lablpanel.cma
+usr/lib/ocaml/3.08/lablgtk2/lablrsvg.cma
+usr/lib/ocaml/3.08/lablgtk2/liblablgnomecanvas.a
+usr/lib/ocaml/3.08/lablgtk2/liblablgnomeui.a
+usr/lib/ocaml/3.08/lablgtk2/liblablpanel.a
+usr/lib/ocaml/3.08/lablgtk2/liblablrsvg.a
+usr/lib/ocaml/3.08/lablgtk2/gnomeui_tags.h
+usr/lib/ocaml/3.08/lablgtk2/panel_tags.h
+usr/lib/ocaml/3.08/lablgtk2/lablgnomecanvas.cmxa
+usr/lib/ocaml/3.08/lablgtk2/lablgnomeui.cmxa
+usr/lib/ocaml/3.08/lablgtk2/lablpanel.cmxa
+usr/lib/ocaml/3.08/lablgtk2/lablrsvg.cmxa
+usr/lib/ocaml/3.08/lablgtk2/lablgnomecanvas.a
+usr/lib/ocaml/3.08/lablgtk2/lablgnomeui.a
+usr/lib/ocaml/3.08/lablgtk2/lablpanel.a
+usr/lib/ocaml/3.08/lablgtk2/lablrsvg.a
+usr/lib/ocaml/3.08/lablgtk2/rsvg.cmx
+usr/lib/ocaml/3.08/lablgtk2/gnomeCanvas.cmx
+usr/lib/ocaml/3.08/lablgtk2/gnoCanvas.cmx
+usr/lib/ocaml/3.08/lablgtk2/gnomeDruid.cmx
+usr/lib/ocaml/3.08/lablgtk2/gnoDruid.cmx
+usr/lib/ocaml/3.08/lablgtk2/panel.cmx
Copied: packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml.dirs (from rev 906, packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml.dirs)
Copied: packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml.docs (from rev 906, packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml.docs)
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml.docs 2005-01-17 21:27:30 UTC (rev 906)
+++ packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml.docs 2005-01-17 22:29:17 UTC (rev 907)
@@ -0,0 +1 @@
+README
Copied: packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml.files (from rev 906, packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml.files)
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml.files 2005-01-17 21:27:30 UTC (rev 906)
+++ packages/lablgtk/branches/split-gnome/debian/liblablgtk2-gnome-ocaml.files 2005-01-17 22:29:17 UTC (rev 907)
@@ -0,0 +1,4 @@
+usr/lib/ocaml/3.08/stublibs/dlllablgnomecanvas.so
+usr/lib/ocaml/3.08/stublibs/dlllablgnomeui.so
+usr/lib/ocaml/3.08/stublibs/dlllablpanel.so
+usr/lib/ocaml/3.08/stublibs/dlllablrsvg.so
Modified: packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.dirs
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.dirs 2005-01-17 21:27:30 UTC (rev 906)
+++ packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.dirs 2005-01-17 22:29:17 UTC (rev 907)
@@ -1,5 +1,4 @@
usr/bin
usr/lib/ocaml/3.08/lablgtk2
usr/lib/ocaml/3.08/lablgtkgl2
-usr/lib/ocaml/3.08/stublibs
usr/share/lintian/overrides
Added: packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.install
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.install 2005-01-17 21:27:30 UTC (rev 906)
+++ packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.install 2005-01-17 22:29:17 UTC (rev 907)
@@ -0,0 +1,13 @@
+usr/bin/*
+usr/lib/ocaml/3.08/lablgtk2/*.mli
+usr/lib/ocaml/3.08/lablgtk2/*.ml
+usr/lib/ocaml/3.08/lablgtk2/*.cmi
+usr/lib/ocaml/3.08/lablgtk2/*.cma
+usr/lib/ocaml/3.08/lablgtk2/*.cmo
+usr/lib/ocaml/3.08/lablgtk2/*.cmx
+usr/lib/ocaml/3.08/lablgtk2/*.cmxa
+usr/lib/ocaml/3.08/lablgtk2/*.a
+usr/lib/ocaml/3.08/lablgtk2/*.h
+usr/lib/ocaml/3.08/lablgtk2/*.o
+usr/lib/ocaml/3.08/lablgtk2/varcc
+usr/lib/ocaml/3.08/lablgtk2/propcc
Modified: packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.override
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.override 2005-01-17 21:27:30 UTC (rev 906)
+++ packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml-dev.override 2005-01-17 22:29:17 UTC (rev 907)
@@ -1,5 +1,2 @@
liblablgtk2-ocaml-dev: binary-without-manpage lablgladecc2
liblablgtk2-ocaml-dev: binary-without-manpage lablgtk2
-liblablgtk2-ocaml-dev: cvsignore-file-in-package usr/share/doc/liblablgtk2-ocaml-dev/examples/glade/.cvsignore
-liblablgtk2-ocaml-dev: cvsignore-file-in-package usr/share/doc/liblablgtk2-ocaml-dev/examples/text/.cvsignore
-
Deleted: packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml.files
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml.files 2005-01-17 21:27:30 UTC (rev 906)
+++ packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml.files 2005-01-17 22:29:17 UTC (rev 907)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08/stublibs
Copied: packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml.install (from rev 906, packages/lablgtk/branches/split-gnome/debian/liblablgtk2-ocaml.files)
Modified: packages/lablgtk/branches/split-gnome/debian/rules
===================================================================
--- packages/lablgtk/branches/split-gnome/debian/rules 2005-01-17 21:27:30 UTC (rev 906)
+++ packages/lablgtk/branches/split-gnome/debian/rules 2005-01-17 22:29:17 UTC (rev 907)
@@ -7,6 +7,8 @@
export OCAML_LIBDIR=`ocamlc -where`
+DESTDIR = $(CURDIR)/debian/tmp
+
# This is the debhelper compatibility version to use.
export DH_COMPAT=3
@@ -35,7 +37,8 @@
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- ./configure --with-gl --with-glade --with-rsvg --with-gnomecanvas --with-gtkspell --with-gnomeui --with-panel
+ ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+ --with-gl --with-glade --with-rsvg --with-gnomecanvas --with-gtkspell --with-gnomeui --with-panel
touch configure-stamp
@@ -69,25 +72,19 @@
dh_clean -k
dh_installdirs
- # Add here commands to install the package into debian/tmp
- #$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) install DESTDIR=$(DESTDIR)
- # Add here commands to install the package into
- # debian/liblablgtk2-ocaml-dev
- $(MAKE) install DESTDIR=$(CURDIR)/debian/liblablgtk2-ocaml-dev/ \
- BINDIR=$(CURDIR)/debian/liblablgtk2-ocaml-dev/usr/bin
- cp debian/META \
- $(CURDIR)/debian/liblablgtk2-ocaml-dev$(OCAML_LIBDIR)/lablgtk2
+ 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
+
# This file is needed by lablgtk2-doc
- cp src/gnomeDruid.cmi $(CURDIR)/debian/liblablgtk2-ocaml-dev$(OCAML_LIBDIR)/lablgtk2
+ 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
- # And now move the liblablgtk2-ocaml files into their own package
- dh_movefiles -pliblablgtk2-ocaml --sourcedir=debian/liblablgtk2-ocaml-dev
-
-
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
@@ -96,18 +93,13 @@
binary-arch: build install
dh_testdir -s
dh_testroot -s
-# dh_movefiles -s
# dh_installdebconf -s
dh_installdocs -s
dh_installexamples -s
dh_installmenu -s
-# dh_installlogrotate -s
-# dh_installemacsen -s
-# dh_installpam -s
-# dh_installmime -s
-# dh_installinit -s
- dh_installcron -s
+ dh_movefiles -s
+ dh_install -s --sourcedir=$(DESTDIR) --list-missing
dh_installman -s
dh_installinfo -s
# dh_undocumented -s
@@ -118,7 +110,6 @@
dh_fixperms -s
dh_makeshlibs -s
dh_installdeb -s
-# dh_perl -s
dh_shlibdeps -s
dh_gencontrol -s
dh_md5sums -s