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

Samuel Mimram smimram-guest@costa.debian.org
Sun, 08 May 2005 14:22:18 +0000


Author: smimram-guest
Date: 2005-05-08 14:22:17 +0000 (Sun, 08 May 2005)
New Revision: 1361

Added:
   trunk/packages/lablgtk/trunk/debian/META.lablgtk2-gnome
   trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs
   trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.docs
   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.docs
   trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files
   trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install
   trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install
Removed:
   trunk/packages/lablgtk/trunk/debian/META.gtkgl
   trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.files
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.dirs
   trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.override
   trunk/packages/lablgtk/trunk/debian/rules
Log:
Split the gnome bindings apart.

Modified: trunk/packages/lablgtk/trunk/debian/META
===================================================================
--- trunk/packages/lablgtk/trunk/debian/META	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/META	2005-05-08 14:22:17 UTC (rev 1361)
@@ -16,24 +16,18 @@
 
 package "glade" (
   requires = "lablgtk2"
-  archive(byte)	= "lablglade.cma"
+  archive(byte) = "lablglade.cma"
   archive(native) = "lablglade.cmxa"
 )
 
-package "gnomecanvas" (
-  requires = "lablgtk2"
-  archive(byte)	= "lablgnomecanvas.cma"
-  archive(native) = "lablgnomecanvas.cmxa"
-)
-
 package "gtkgl" (
   requires = "lablgtk2 lablgl"
-  archive(byte)	= "lablgtkgl.cma"
+  archive(byte) = "lablgtkgl.cma"
   archive(native) = "lablgtkgl.cmxa"
 )
 
-package "rsvg" (
+package "gtkspell" (
   requires = "lablgtk2"
-  archive(byte)	= "lablrsvg.cma"
-  archive(native) = "labrsvg.cmxa"
+  archive(byte) = "lablgtkspell.cma"
+  archive(native) = "lablgtkspell.cmxa"
 )

Deleted: trunk/packages/lablgtk/trunk/debian/META.gtkgl
===================================================================
--- trunk/packages/lablgtk/trunk/debian/META.gtkgl	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/META.gtkgl	2005-05-08 14:22:17 UTC (rev 1361)
@@ -1,7 +0,0 @@
-requires="lablgl lablgtk2"
-version="2.2.0"
-directory="+lablgtk2"
-
-archive(native)="lablgtkgl.cmxa"
-archive(byte)="lablgtkgl.cma"
-

Added: trunk/packages/lablgtk/trunk/debian/META.lablgtk2-gnome
===================================================================
--- trunk/packages/lablgtk/trunk/debian/META.lablgtk2-gnome	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/META.lablgtk2-gnome	2005-05-08 14:22:17 UTC (rev 1361)
@@ -0,0 +1,24 @@
+version="2.40"
+directory="+lablgtk2"
+requires = "lablgtk2"
+
+package "gnomecanvas" (
+  archive(byte)	= "lablgnomecanvas.cma"
+  archive(native) = "lablgnomecanvas.cmxa"
+)
+
+package "gnomeui" (
+  archive(byte) = "lablgnomeui.cma"
+  archive(native) = "lablgnomeui.cmxa"
+)
+
+package "panel" (
+  archive(byte) = "lablpanel.cma"
+  archive(native) = "lablpanel.cmxa"
+)
+
+package "rsvg" (
+  archive(byte) = "lablrsvg.cma"
+  archive(native) = "lablrsvg.cmxa"
+)
+

Modified: trunk/packages/lablgtk/trunk/debian/changelog
===================================================================
--- trunk/packages/lablgtk/trunk/debian/changelog	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/changelog	2005-05-08 14:22:17 UTC (rev 1361)
@@ -1,3 +1,12 @@
+lablgtk2 (2.4.0+2005.02.18-2) unstable; urgency=low
+
+  * Split the gnome bindings apart to avoid heavy dependencies on gnome libs.
+  * Using chrpath to remove the rpath from dlllablgnomeui.so and
+    dlllablpanel.so.
+  * Updated Standards-Version to 3.6.1.1.
+
+ -- Samuel Mimram <smimram@debian.org>  Sun,  8 May 2005 16:09:00 +0200
+
 lablgtk2 (2.4.0+2005.02.18-1) unstable; urgency=low
 
   * Rebuilt against ocaml 3.08.3.
@@ -8,7 +17,7 @@
 lablgtk2 (2.4.0+2004.11.19-3) unstable; urgency=low
 
   * Added GnomeUI and Panel-Applet support. This should make the package build
-    again.
+    again, closes: #253712.
 
  -- Samuel Mimram <smimram@debian.org>  Fri, 14 Jan 2005 20:17:31 +0100
 

Modified: trunk/packages/lablgtk/trunk/debian/control
===================================================================
--- trunk/packages/lablgtk/trunk/debian/control	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/control	2005-05-08 14:22:17 UTC (rev 1361)
@@ -3,25 +3,49 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders: Sven Luther <luther@debian.org>, Samuel Mimram <smimram@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
-Standards-Version: 3.6.1
+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
+Standards-Version: 3.6.1.1
 
 Package: liblablgtk2-ocaml
 Section: libs
 Architecture: any
-Depends: ocaml-base-3.08.3,  ${shlibs:Depends}
-Description: runtime libraries for ocaml bindings for Gtk+ version 2
+Depends: ocaml-base-3.08.3, ${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.
 
+Package: liblablgtk2-gnome-ocaml
+Section: libs
+Architecture: any
+Depends: liblablgtk2-ocaml (= ${Source-Version}), ${shlibs:Depends}
+Replaces: liblablgtk2-ocaml (<= 2.4.0+2005.02.18-1)
+Description: runtime libraries for OCaml bindings to Gnome
+ 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-appel, gnomeui,
+ gnome-canvas, rsvg).
+
 Package: liblablgtk2-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: liblablgtk2-ocaml (= ${Source-Version}), ocaml-3.08.3, 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
+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
 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}), liblablgtk2-gnome-ocaml (= ${Source-Version}), ocaml-3.08.3, 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.
+ .
+ This package contains the development files of lablgtk for libraries using
+ gnome functionalities (panel-applet, gnomeui, gnome-canvas, rsvg).

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs	2005-05-08 14:22:17 UTC (rev 1361)
@@ -0,0 +1,3 @@
+usr/lib/ocaml/3.08.3/METAS
+usr/lib/ocaml/3.08.3/lablgtk2
+usr/share/doc/liblablgtk2-gnome-ocaml-dev/examples

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.docs
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.docs	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.docs	2005-05-08 14:22:17 UTC (rev 1361)
@@ -0,0 +1 @@
+README

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files	2005-05-08 14:22:17 UTC (rev 1361)
@@ -0,0 +1,40 @@
+usr/lib/ocaml/3.08.3/lablgtk2/rsvg.cmi
+usr/lib/ocaml/3.08.3/lablgtk2/gnomeCanvas.cmi
+usr/lib/ocaml/3.08.3/lablgtk2/gnoCanvas.cmi
+usr/lib/ocaml/3.08.3/lablgtk2/gnomeDruid.cmi
+usr/lib/ocaml/3.08.3/lablgtk2/gnoDruid.cmi
+usr/lib/ocaml/3.08.3/lablgtk2/panel.cmi
+usr/lib/ocaml/3.08.3/lablgtk2/gnoCanvas.mli
+usr/lib/ocaml/3.08.3/lablgtk2/gnoDruid.mli
+usr/lib/ocaml/3.08.3/lablgtk2/panel.mli
+usr/lib/ocaml/3.08.3/lablgtk2/rsvg.mli
+usr/lib/ocaml/3.08.3/lablgtk2/rsvg.ml
+usr/lib/ocaml/3.08.3/lablgtk2/gnomeCanvas.ml
+usr/lib/ocaml/3.08.3/lablgtk2/gnoCanvas.ml
+usr/lib/ocaml/3.08.3/lablgtk2/gnomeDruid.ml
+usr/lib/ocaml/3.08.3/lablgtk2/gnoDruid.ml
+usr/lib/ocaml/3.08.3/lablgtk2/panel.ml
+usr/lib/ocaml/3.08.3/lablgtk2/lablgnomecanvas.cma
+usr/lib/ocaml/3.08.3/lablgtk2/lablgnomeui.cma
+usr/lib/ocaml/3.08.3/lablgtk2/lablpanel.cma
+usr/lib/ocaml/3.08.3/lablgtk2/lablrsvg.cma
+usr/lib/ocaml/3.08.3/lablgtk2/liblablgnomecanvas.a
+usr/lib/ocaml/3.08.3/lablgtk2/liblablgnomeui.a
+usr/lib/ocaml/3.08.3/lablgtk2/liblablpanel.a
+usr/lib/ocaml/3.08.3/lablgtk2/liblablrsvg.a
+usr/lib/ocaml/3.08.3/lablgtk2/gnomeui_tags.h
+usr/lib/ocaml/3.08.3/lablgtk2/panel_tags.h
+usr/lib/ocaml/3.08.3/lablgtk2/lablgnomecanvas.cmxa
+usr/lib/ocaml/3.08.3/lablgtk2/lablgnomeui.cmxa
+usr/lib/ocaml/3.08.3/lablgtk2/lablpanel.cmxa
+usr/lib/ocaml/3.08.3/lablgtk2/lablrsvg.cmxa
+usr/lib/ocaml/3.08.3/lablgtk2/lablgnomecanvas.a
+usr/lib/ocaml/3.08.3/lablgtk2/lablgnomeui.a
+usr/lib/ocaml/3.08.3/lablgtk2/lablpanel.a
+usr/lib/ocaml/3.08.3/lablgtk2/lablrsvg.a
+usr/lib/ocaml/3.08.3/lablgtk2/rsvg.cmx
+usr/lib/ocaml/3.08.3/lablgtk2/gnomeCanvas.cmx
+usr/lib/ocaml/3.08.3/lablgtk2/gnoCanvas.cmx
+usr/lib/ocaml/3.08.3/lablgtk2/gnomeDruid.cmx
+usr/lib/ocaml/3.08.3/lablgtk2/gnoDruid.cmx
+usr/lib/ocaml/3.08.3/lablgtk2/panel.cmx

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs	2005-05-08 14:22:17 UTC (rev 1361)
@@ -0,0 +1 @@
+usr/lib/ocaml/3.08.3/stublibs

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.docs
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.docs	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.docs	2005-05-08 14:22:17 UTC (rev 1361)
@@ -0,0 +1 @@
+README

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files	2005-05-08 14:22:17 UTC (rev 1361)
@@ -0,0 +1,4 @@
+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

Modified: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs	2005-05-08 14:22:17 UTC (rev 1361)
@@ -1,5 +1,4 @@
 usr/bin
 usr/lib/ocaml/3.08.3/lablgtk2
 usr/lib/ocaml/3.08.3/lablgtkgl2
-usr/lib/ocaml/3.08.3/stublibs
 usr/share/lintian/overrides

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install	2005-05-08 14:22:17 UTC (rev 1361)
@@ -0,0 +1,13 @@
+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

Modified: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.override
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.override	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.override	2005-05-08 14:22:17 UTC (rev 1361)
@@ -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: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.files
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.files	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.files	2005-05-08 14:22:17 UTC (rev 1361)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3/stublibs

Added: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install
===================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install	2005-05-08 14:22:17 UTC (rev 1361)
@@ -0,0 +1 @@
+usr/lib/ocaml/3.08.3/stublibs

Modified: trunk/packages/lablgtk/trunk/debian/rules
===================================================================
--- trunk/packages/lablgtk/trunk/debian/rules	2005-05-08 13:57:21 UTC (rev 1360)
+++ trunk/packages/lablgtk/trunk/debian/rules	2005-05-08 14:22:17 UTC (rev 1361)
@@ -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
 
@@ -34,9 +36,10 @@
 configure: configure-stamp
 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
 
 
@@ -44,7 +47,6 @@
 build-stamp: patch-stamp configure-stamp 
 	dh_testdir
 
-	# Add here commands to compile the package.
 	$(MAKE) depend
 	$(MAKE)
 	if [ -x /usr/bin/ocamlopt ]; then \
@@ -58,7 +60,6 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
 
 	dh_clean config.make
@@ -69,24 +70,24 @@
 	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
+	# Remove RPATHs
+	chrpath -d $(DESTDIR)/$(OCAML_LIBDIR)/stublibs/dlllablgnomeui.so
+	chrpath -d $(DESTDIR)/$(OCAML_LIBDIR)/stublibs/dlllablpanel.so
+
+	# Install METAs
+	cp debian/META $(CURDIR)/debian/liblablgtk2-ocaml-dev$(OCAML_LIBDIR)/lablgtk2
+	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-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
+	cp src/gnomeDruid.cmi $(CURDIR)/debian/liblablgtk2-gnome-ocaml-dev$(OCAML_LIBDIR)/lablgtk2
 
-	# And now move the liblablgtk2-ocaml files into their own package
-	dh_movefiles -pliblablgtk2-ocaml --sourcedir=debian/liblablgtk2-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
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -96,18 +97,13 @@
 binary-arch: build install
 	dh_testdir -s
 	dh_testroot -s
-#	dh_movefiles -s
 
 #	dh_installdebconf -s
 	dh_installdocs -s
-	dh_installexamples -s
+	dh_installexamples -s --exclude='.cvsignore' --exclude='rsvg' --exclude='panel' --exclude='canvas'
 	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 +114,6 @@
 	dh_fixperms -s
 	dh_makeshlibs -s
 	dh_installdeb -s
-#	dh_perl -s
 	dh_shlibdeps -s
 	dh_gencontrol -s
 	dh_md5sums -s