[Pkg-ocaml-maint-commits] [SCM] lablgtk2 packaging branch, master, updated. debian/2.12.0-3-1-g14c00c5

Stephane Glondu steph at glondu.net
Mon Jul 27 13:12:10 UTC 2009 

The following commit has been merged in the master branch:
commit 14c00c514322778afd984388723ef0bdd062bcc8
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Jul 27 01:31:03 2009 +0200

    Big packaging update
    
     - use new dh-ocaml
     - switch debian/rules to dh
     - remove Lintian overrides
     - move all generated documentation to a new binary package
       liblablgtk2-ocaml-doc

diff --git a/debian/changelog b/debian/changelog
index ff08226..f219b27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+lablgtk2 (2.12.0-4) UNRELEASED; urgency=low
+
+  * Big packaging update:
+    - use new dh-ocaml
+    - switch debian/rules to dh
+    - remove Lintian overrides
+    - move all generated documentation to a new binary package
+      liblablgtk2-ocaml-doc
+
+ -- Stephane Glondu <steph at glondu.net>  Mon, 27 Jul 2009 14:40:42 +0200
+
 lablgtk2 (2.12.0-3) unstable; urgency=low
 
   [ Samuel Mimram ]
diff --git a/debian/clean b/debian/clean
new file mode 100755
index 0000000..d150605
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+config.log
+config.make
+config.status
diff --git a/debian/control b/debian/control
index 619157d..d31dae9 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Uploaders:
  Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
 Build-Depends:
- debhelper (>> 7.0.0),
- dh-ocaml (>= 0.3),
+ debhelper (>= 7.0.52),
+ dh-ocaml (>= 0.9),
  ocaml (>= 3.11),
  camlp4 (>= 3.11),
  liblablgl-ocaml-dev (>> 1.04-2),
@@ -26,7 +26,7 @@ Build-Depends:
  libgnomeui-dev,
  libpanel-applet2-dev,
  libgtksourceview-dev,
- quilt
+ quilt (>= 0.46-7)
 Standards-Version: 3.8.2
 Homepage: http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git
@@ -34,7 +34,12 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/lablgtk2.git
 
 Package: liblablgtk2-ocaml
 Architecture: any
-Depends: ocaml-base-${F:OCamlABI}, ${shlibs:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends: liblablgtk2-ocaml-doc
 Description: runtime libraries for OCaml bindings for GTK+ version 2
  lablgtk2 contains bindings for GTK+ 2.x and OCaml.
  .
@@ -43,8 +48,12 @@ Description: runtime libraries for OCaml bindings for GTK+ version 2
 
 Package: liblablgtk2-gl-ocaml
 Architecture: any
-Depends: liblablgtk2-ocaml (= ${binary:Version}), ${shlibs:Depends}
-Replaces: liblablgtk2-ocaml (<= 2.6.0-5)
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends: liblablgtk2-ocaml-doc
 Description: runtime libraries for OCaml bindings to GtkGL
  lablgtk2 contains bindings for GTK+ 2.x and Objective Caml.
  .
@@ -53,8 +62,12 @@ Description: runtime libraries for OCaml bindings to GtkGL
 
 Package: liblablgtk2-gnome-ocaml
 Architecture: any
-Depends: liblablgtk2-ocaml (= ${binary:Version}), ${shlibs:Depends}
-Replaces: liblablgtk2-ocaml (<= 2.4.0+2005.02.18-1)
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends: liblablgtk2-ocaml-doc
 Description: runtime libraries for OCaml bindings to GNOME
  lablgtk2 contains bindings for GTK+ 2.x and Objective Caml.
  .
@@ -64,8 +77,13 @@ Description: runtime libraries for OCaml bindings to GNOME
 
 Package: liblablgtksourceview-ocaml
 Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, liblablgtk2-ocaml (= ${binary:Version}), ${shlibs:Depends}
-Description: OCaml bindings for libgtksourceview, a source editor GTK+ widget
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends: liblablgtk2-ocaml-doc
+Description: OCaml bindings for libgtksourceview (runtime)
  This is the OCaml binding for the GtkSourceView widget, a text widget that
  extends the standard GTK+ 2.x text widget with syntax highlighting and other
  features typical of a source editor.
@@ -75,8 +93,15 @@ Description: OCaml bindings for libgtksourceview, a source editor GTK+ widget
 Package: liblablgtk2-ocaml-dev
 Architecture: any
 Suggests: liblablgtk2-gl-ocaml-dev, liblablgtk2-gnome-ocaml-dev
-Depends: liblablgtk2-ocaml (= ${binary:Version}), ocaml-${F:OCamlABI}, libgtk2.0-dev, libglade2-dev, libgtkspell-dev
-Conflicts: findlib (<< 1.0.2)
+Depends:
+ libgtk2.0-dev,
+ libglade2-dev,
+ libgtkspell-dev,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends: liblablgtk2-ocaml-doc
 Description: OCaml bindings to Gtk+ version 2
  lablgtk2 contains bindings for GTK+ 2.x and OCaml.
  .
@@ -85,8 +110,13 @@ Description: OCaml bindings to Gtk+ version 2
 Package: liblablgtk2-gl-ocaml-dev
 Architecture: any
 Suggests: liblablgtk2-gnome-ocaml-dev
-Depends: liblablgtk2-ocaml-dev (= ${binary:Version}), liblablgtk2-gl-ocaml (= ${binary:Version}), ocaml-${F:OCamlABI}, libgtkgl2.0-dev, liblablgl-ocaml-dev (>= 1.02-1)
-Replaces: liblablgtk2-ocaml-dev (<= 2.6.0-5)
+Depends:
+ libgtkgl2.0-dev,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends: liblablgtk2-ocaml-doc
 Description: OCaml bindings to GtkGL
  lablgtk2 contains bindings for GTK+ 2.x and OCaml.
  .
@@ -95,8 +125,16 @@ Description: OCaml bindings to GtkGL
 
 Package: liblablgtk2-gnome-ocaml-dev
 Architecture: any
-Depends: liblablgtk2-ocaml-dev (= ${binary:Version}), liblablgtk2-gnome-ocaml (= ${binary:Version}), ocaml-${F:OCamlABI}, librsvg2-dev, libgnomecanvas2-dev, libgnomeui-dev, libpanel-applet2-dev
-Replaces: liblablgtk2-ocaml-dev (<= 2.4.0+2005.02.18-1)
+Depends:
+ librsvg2-dev,
+ libgnomecanvas2-dev,
+ libgnomeui-dev,
+ libpanel-applet2-dev,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends: liblablgtk2-ocaml-doc
 Description: OCaml bindings to GNOME
  lablgtk2 contains bindings for GTK+ 2.x and Objective Caml.
  .
@@ -105,7 +143,13 @@ Description: OCaml bindings to GNOME
 
 Package: liblablgtksourceview-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, liblablgtksourceview-ocaml (= ${binary:Version}), liblablgtk2-ocaml-dev (= ${binary:Version}), libgtksourceview-dev (>= 1.2.0)
+Depends:
+ libgtksourceview-dev,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends: liblablgtk2-ocaml-doc
 Replaces: liblablgtk2-ocaml-dev (<= 2.10.0-2)
 Description: OCaml bindings for libgtksourceview, a source editor GTK+ widget
  This is the OCaml binding for the GtkSourceView widget, a text widget that
@@ -113,3 +157,18 @@ Description: OCaml bindings for libgtksourceview, a source editor GTK+ widget
  features typical of a source editor.
  .
  This package contains the development part of the lablgtksourceview package.
+
+Package: liblablgtk2-ocaml-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests:
+ liblablgtk2-ocaml-dev,
+ liblablgtk2-gl-ocaml-dev,
+ liblablgtk2-gnome-ocaml-dev,
+ liblablgtksourceview-ocaml-dev
+Description: OCaml bindings to Gtk+ version 2 (documentation)
+ LablGTK2 contains bindings for GTK+ 2.x and OCaml.
+ .
+ This package contains the API reference of all libraries provided by
+ LablGTK2.
diff --git a/debian/liblablgtk2-gl-ocaml-dev.dirs.in b/debian/liblablgtk2-gl-ocaml-dev.dirs.in
deleted file mode 100644
index b6ebae6..0000000
--- a/debian/liblablgtk2-gl-ocaml-dev.dirs.in
+++ /dev/null
@@ -1,3 +0,0 @@
- at OCamlStdlibDir@/METAS
- at OCamlStdlibDir@/lablgtk2
-usr/share/doc/liblablgtk2-gl-ocaml-dev/examples
diff --git a/debian/liblablgtk2-gl-ocaml-dev.files.in b/debian/liblablgtk2-gl-ocaml-dev.files.in
deleted file mode 100644
index cac6cee..0000000
--- a/debian/liblablgtk2-gl-ocaml-dev.files.in
+++ /dev/null
@@ -1,3 +0,0 @@
- at OCamlStdlibDir@/lablgtk2/glGtk.*
- at OCamlStdlibDir@/lablgtk2/lablgtkgl.*
- at OCamlStdlibDir@/lablgtk2/liblablgtkgl2*
diff --git a/debian/liblablgtk2-gl-ocaml-dev.install.in b/debian/liblablgtk2-gl-ocaml-dev.install.in
new file mode 100644
index 0000000..340920c
--- /dev/null
+++ b/debian/liblablgtk2-gl-ocaml-dev.install.in
@@ -0,0 +1,4 @@
+debian/META.lablgtk2-gl                    @OCamlStdlibDir@/METAS
+ at OCamlStdlibDir@/lablgtk2/glGtk.*
+ at OCamlStdlibDir@/lablgtk2/lablgtkgl.*
+ at OCamlStdlibDir@/lablgtk2/liblablgtkgl2*
diff --git a/debian/liblablgtk2-gl-ocaml.dirs.in b/debian/liblablgtk2-gl-ocaml.dirs.in
deleted file mode 100644
index a8131b4..0000000
--- a/debian/liblablgtk2-gl-ocaml.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
- at OCamlDllDir@
diff --git a/debian/liblablgtk2-gl-ocaml.files.in b/debian/liblablgtk2-gl-ocaml.install.in
similarity index 100%
rename from debian/liblablgtk2-gl-ocaml.files.in
rename to debian/liblablgtk2-gl-ocaml.install.in
diff --git a/debian/liblablgtk2-gnome-ocaml-dev.dirs.in b/debian/liblablgtk2-gnome-ocaml-dev.dirs.in
deleted file mode 100644
index d39fe42..0000000
--- a/debian/liblablgtk2-gnome-ocaml-dev.dirs.in
+++ /dev/null
@@ -1,3 +0,0 @@
- at OCamlStdlibDir@/METAS
- at OCamlStdlibDir@/lablgtk2
-usr/share/doc/liblablgtk2-gnome-ocaml-dev/examples
diff --git a/debian/liblablgtk2-gnome-ocaml-dev.docs b/debian/liblablgtk2-gnome-ocaml-dev.docs
deleted file mode 100644
index e845566..0000000
--- a/debian/liblablgtk2-gnome-ocaml-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/liblablgtk2-gnome-ocaml-dev.files.in b/debian/liblablgtk2-gnome-ocaml-dev.install.in
similarity index 89%
rename from debian/liblablgtk2-gnome-ocaml-dev.files.in
rename to debian/liblablgtk2-gnome-ocaml-dev.install.in
index 5829927..77f8ca9 100644
--- a/debian/liblablgtk2-gnome-ocaml-dev.files.in
+++ b/debian/liblablgtk2-gnome-ocaml-dev.install.in
@@ -1,3 +1,4 @@
+debian/META.lablgtk2-gnome                        @OCamlStdlibDir@/METAS
 @OCamlStdlibDir@/lablgtk2/rsvg.*
 @OCamlStdlibDir@/lablgtk2/gnomeCanvas.*
 @OCamlStdlibDir@/lablgtk2/gnoCanvas.*
diff --git a/debian/liblablgtk2-gnome-ocaml.dirs.in b/debian/liblablgtk2-gnome-ocaml.dirs.in
deleted file mode 100644
index a8131b4..0000000
--- a/debian/liblablgtk2-gnome-ocaml.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
- at OCamlDllDir@
diff --git a/debian/liblablgtk2-gnome-ocaml.files.in b/debian/liblablgtk2-gnome-ocaml.install.in
similarity index 100%
rename from debian/liblablgtk2-gnome-ocaml.files.in
rename to debian/liblablgtk2-gnome-ocaml.install.in
diff --git a/debian/liblablgtk2-ocaml-dev.dirs.in b/debian/liblablgtk2-ocaml-dev.dirs.in
deleted file mode 100644
index dedc3d4..0000000
--- a/debian/liblablgtk2-ocaml-dev.dirs.in
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
- at OCamlStdlibDir@/lablgtk2
-usr/share/lintian/overrides
diff --git a/debian/liblablgtk2-ocaml-dev.install.in b/debian/liblablgtk2-ocaml-dev.install.in
index ca30414..cc324c4 100644
--- a/debian/liblablgtk2-ocaml-dev.install.in
+++ b/debian/liblablgtk2-ocaml-dev.install.in
@@ -1,10 +1,96 @@
-usr/bin/*
- at OCamlStdlibDir@/lablgtk2/*.mli
- at OCamlStdlibDir@/lablgtk2/*.ml
- at OCamlStdlibDir@/lablgtk2/*.cmi
- at OCamlStdlibDir@/lablgtk2/*.cma
- at OCamlStdlibDir@/lablgtk2/*.cmo
- at OCamlStdlibDir@/lablgtk2/*.a
- at OCamlStdlibDir@/lablgtk2/*.h
- at OCamlStdlibDir@/lablgtk2/varcc
+debian/META               @OCamlStdlibDir@/lablgtk2
+usr/bin/gdk_pixbuf_mlsource
+usr/bin/lablgladecc2
+usr/bin/lablgtk2
+ at OCamlStdlibDir@/lablgtk2/gAction.*
+ at OCamlStdlibDir@/lablgtk2/gAssistant.*
+ at OCamlStdlibDir@/lablgtk2/gaux.*
+ at OCamlStdlibDir@/lablgtk2/gBin.*
+ at OCamlStdlibDir@/lablgtk2/gBroken.*
+ at OCamlStdlibDir@/lablgtk2/gButton.*
+ at OCamlStdlibDir@/lablgtk2/gContainer.*
+ at OCamlStdlibDir@/lablgtk2/gData.*
+ at OCamlStdlibDir@/lablgtk2/gdk.*
+ at OCamlStdlibDir@/lablgtk2/gdkEnums.*
+ at OCamlStdlibDir@/lablgtk2/gdkEvent.*
+ at OCamlStdlibDir@/lablgtk2/gdkKeysyms.*
+ at OCamlStdlibDir@/lablgtk2/gdkPixbuf.*
+ at OCamlStdlibDir@/lablgtk2/gdkpixbuf_tags.h
+ at OCamlStdlibDir@/lablgtk2/gdkprivate-win32.h
+ at OCamlStdlibDir@/lablgtk2/gdk_tags.h
+ at OCamlStdlibDir@/lablgtk2/gDraw.*
+ at OCamlStdlibDir@/lablgtk2/gEdit.*
+ at OCamlStdlibDir@/lablgtk2/gFile.*
+ at OCamlStdlibDir@/lablgtk2/glade.*
+ at OCamlStdlibDir@/lablgtk2/glib.*
+ at OCamlStdlibDir@/lablgtk2/glib_tags.h
+ at OCamlStdlibDir@/lablgtk2/gList.*
+ at OCamlStdlibDir@/lablgtk2/gMain.*
+ at OCamlStdlibDir@/lablgtk2/gMenu.*
+ at OCamlStdlibDir@/lablgtk2/gMisc.*
+ at OCamlStdlibDir@/lablgtk2/gObj.*
+ at OCamlStdlibDir@/lablgtk2/gobject.*
+ at OCamlStdlibDir@/lablgtk2/gobject_tags.h
+ at OCamlStdlibDir@/lablgtk2/gPack.*
+ at OCamlStdlibDir@/lablgtk2/gPango.*
+ at OCamlStdlibDir@/lablgtk2/gpointer.*
+ at OCamlStdlibDir@/lablgtk2/gRange.*
+ at OCamlStdlibDir@/lablgtk2/gText.*
+ at OCamlStdlibDir@/lablgtk2/gtkAssistant.*
+ at OCamlStdlibDir@/lablgtk2/gtkBase.*
+ at OCamlStdlibDir@/lablgtk2/gtkBin.*
+ at OCamlStdlibDir@/lablgtk2/gtkBroken.*
+ at OCamlStdlibDir@/lablgtk2/gtkButton.*
+ at OCamlStdlibDir@/lablgtk2/gtk.*
+ at OCamlStdlibDir@/lablgtk2/gtkData.*
+ at OCamlStdlibDir@/lablgtk2/gtkEdit.*
+ at OCamlStdlibDir@/lablgtk2/gtkEnums.*
+ at OCamlStdlibDir@/lablgtk2/gtkFile.*
+ at OCamlStdlibDir@/lablgtk2/gtkgl_tags.h
+ at OCamlStdlibDir@/lablgtk2/gtkInit.*
+ at OCamlStdlibDir@/lablgtk2/gtkList.*
+ at OCamlStdlibDir@/lablgtk2/gtkMain.*
+ at OCamlStdlibDir@/lablgtk2/gtkMenu.*
+ at OCamlStdlibDir@/lablgtk2/gtkMisc.*
+ at OCamlStdlibDir@/lablgtk2/gtkObject.*
+ at OCamlStdlibDir@/lablgtk2/gtkPack.*
+ at OCamlStdlibDir@/lablgtk2/gtkRange.*
+ at OCamlStdlibDir@/lablgtk2/gtkSignal.*
+ at OCamlStdlibDir@/lablgtk2/gtkSpell.*
+ at OCamlStdlibDir@/lablgtk2/gtkStock.*
+ at OCamlStdlibDir@/lablgtk2/gtk_tags.h
+ at OCamlStdlibDir@/lablgtk2/gtkText.*
+ at OCamlStdlibDir@/lablgtk2/gtkThInit.*
+ at OCamlStdlibDir@/lablgtk2/gtkThread.*
+ at OCamlStdlibDir@/lablgtk2/gtkTree.*
+ at OCamlStdlibDir@/lablgtk2/gtkWindow.*
+ at OCamlStdlibDir@/lablgtk2/gToolbox.*
+ at OCamlStdlibDir@/lablgtk2/gTree.*
+ at OCamlStdlibDir@/lablgtk2/gUtil.*
+ at OCamlStdlibDir@/lablgtk2/gWindow.*
+ at OCamlStdlibDir@/lablgtk2/lablglade.*
+ at OCamlStdlibDir@/lablgtk2/lablgtk.*
+ at OCamlStdlibDir@/lablgtk2/lablgtkspell.*
+ at OCamlStdlibDir@/lablgtk2/liblablglade2.a
+ at OCamlStdlibDir@/lablgtk2/liblablgtk2.a
+ at OCamlStdlibDir@/lablgtk2/liblablgtkspell.a
+ at OCamlStdlibDir@/lablgtk2/ml_domain.h
+ at OCamlStdlibDir@/lablgtk2/ml_gdk.h
+ at OCamlStdlibDir@/lablgtk2/ml_gdkpixbuf.h
+ at OCamlStdlibDir@/lablgtk2/ml_glib.h
+ at OCamlStdlibDir@/lablgtk2/ml_gobject.h
+ at OCamlStdlibDir@/lablgtk2/ml_gpointer.h
+ at OCamlStdlibDir@/lablgtk2/ml_gtk.h
+ at OCamlStdlibDir@/lablgtk2/ml_gtktext.h
+ at OCamlStdlibDir@/lablgtk2/ml_gtktree.h
+ at OCamlStdlibDir@/lablgtk2/ml_gvaluecaml.h
+ at OCamlStdlibDir@/lablgtk2/ml_pango.h
+ at OCamlStdlibDir@/lablgtk2/pango.*
+ at OCamlStdlibDir@/lablgtk2/pangoEnums.*
+ at OCamlStdlibDir@/lablgtk2/pango.*
+ at OCamlStdlibDir@/lablgtk2/pango_tags.h
 @OCamlStdlibDir@/lablgtk2/propcc
+ at OCamlStdlibDir@/lablgtk2/varcc
+ at OCamlStdlibDir@/lablgtk2/win32.h
+ at OCamlStdlibDir@/lablgtk2/wrappers.h
+ at OCamlStdlibDir@/lablgtk2/xml_lexer.*
diff --git a/debian/liblablgtk2-ocaml-dev.override b/debian/liblablgtk2-ocaml-dev.override
deleted file mode 100644
index d04ba64..0000000
--- a/debian/liblablgtk2-ocaml-dev.override
+++ /dev/null
@@ -1,3 +0,0 @@
-liblablgtk2-ocaml-dev: binary-without-manpage usr/bin/lablgladecc2
-liblablgtk2-ocaml-dev: binary-without-manpage usr/bin/lablgtk2
-liblablgtk2-ocaml-dev: binary-without-manpage usr/bin/gdk_pixbuf_mlsource
diff --git a/debian/liblablgtk2-ocaml-dev.examples b/debian/liblablgtk2-ocaml-doc.examples
similarity index 100%
rename from debian/liblablgtk2-ocaml-dev.examples
rename to debian/liblablgtk2-ocaml-doc.examples
diff --git a/debian/liblablgtk2-ocaml-doc.ocamldoc.in b/debian/liblablgtk2-ocaml-doc.ocamldoc.in
new file mode 100644
index 0000000..287bb02
--- /dev/null
+++ b/debian/liblablgtk2-ocaml-doc.ocamldoc.in
@@ -0,0 +1,9 @@
+-I src
+-I @OCamlStdlibDir@/lablgl
+-I @OCamlStdlibDir@/threads
+-pp "sed 's/@gtkdoc *\([A-Za-z-]* *[A-Za-z-]*\)/\(gtkdoc: \1\)/g'"
+-no-custom-tags
+--include debian/liblablgtk2-ocaml-dev at OCamlStdlibDir@/lablgtk2
+--include debian/liblablgtk2-gl-ocaml-dev at OCamlStdlibDir@/lablgtk2
+--include debian/liblablgtk2-gnome-ocaml-dev at OCamlStdlibDir@/lablgtk2
+--include debian/liblablgtksourceview-ocaml-dev at OCamlStdlibDir@/lablgtk2
diff --git a/debian/liblablgtk2-ocaml.dirs.in b/debian/liblablgtk2-ocaml.dirs.in
deleted file mode 100644
index a8131b4..0000000
--- a/debian/liblablgtk2-ocaml.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
- at OCamlDllDir@
diff --git a/debian/liblablgtk2-ocaml.install.in b/debian/liblablgtk2-ocaml.install.in
index a8131b4..5df5aa5 100644
--- a/debian/liblablgtk2-ocaml.install.in
+++ b/debian/liblablgtk2-ocaml.install.in
@@ -1 +1,3 @@
- at OCamlDllDir@
+ at OCamlDllDir@/dlllablgtkspell.so
+ at OCamlDllDir@/dlllablglade2.so
+ at OCamlDllDir@/dlllablgtk2.so
diff --git a/debian/liblablgtksourceview-ocaml-dev.dirs.in b/debian/liblablgtksourceview-ocaml-dev.dirs.in
deleted file mode 100644
index 36e9ec2..0000000
--- a/debian/liblablgtksourceview-ocaml-dev.dirs.in
+++ /dev/null
@@ -1,3 +0,0 @@
- at OCamlStdlibDir@/METAS
- at OCamlStdlibDir@/lablgtk2
-usr/share/doc/liblablgtksourceview-ocaml-dev/examples
diff --git a/debian/liblablgtksourceview-ocaml-dev.files.in b/debian/liblablgtksourceview-ocaml-dev.install.in
similarity index 74%
rename from debian/liblablgtksourceview-ocaml-dev.files.in
rename to debian/liblablgtksourceview-ocaml-dev.install.in
index eb161c3..3a0464a 100644
--- a/debian/liblablgtksourceview-ocaml-dev.files.in
+++ b/debian/liblablgtksourceview-ocaml-dev.install.in
@@ -1,3 +1,4 @@
+debian/META.lablgtksourceview                      @OCamlStdlibDir@/METAS
 @OCamlStdlibDir@/lablgtk2/sourceView*
 @OCamlStdlibDir@/lablgtk2/gSourceView*
 @OCamlStdlibDir@/lablgtk2/gtkSourceView*
diff --git a/debian/liblablgtksourceview-ocaml.dirs.in b/debian/liblablgtksourceview-ocaml.dirs.in
deleted file mode 100644
index a8131b4..0000000
--- a/debian/liblablgtksourceview-ocaml.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
- at OCamlDllDir@
diff --git a/debian/liblablgtksourceview-ocaml.files.in b/debian/liblablgtksourceview-ocaml.install.in
similarity index 100%
rename from debian/liblablgtksourceview-ocaml.files.in
rename to debian/liblablgtksourceview-ocaml.install.in
diff --git a/debian/rules b/debian/rules
index 785d9cd..9849d2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,135 +1,45 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
+DESTDIR := $(CURDIR)/debian/tmp
 
-DESTDIR = $(CURDIR)/debian/tmp
+%:
+	dh --with quilt,ocaml $@
 
-# We want to use quilt.
-include /usr/share/quilt/quilt.make
-PACKAGE = lablgtk
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp: ocamlinit
-	dh_testdir
-
-	./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 --with-gtksourceview
-
-	touch configure-stamp
-
-
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN) configure-stamp
-	dh_testdir
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	cp  src/.depend debian/src.depend.backup
+	dh_auto_configure -- --with-gl --with-glade --with-rsvg		\
+	--with-gnomecanvas --with-gtkspell --with-gnomeui --with-panel	\
+	--with-gtksourceview
 
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
 	$(MAKE) depend
 	$(MAKE)
 ifneq ($(OCAML_OPT_ARCH),)
 	$(MAKE) opt
 endif
 
-	touch build-stamp
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
 	[ ! -f config.make ] || $(MAKE) clean
-	-$(RM) config.status
-	-$(RM) config.log
-	-$(RM) $(OCAML_IN_FILES)
-	-$(RM) $(wildcard debian/*.ocamldoc-apiref)
-
-	dh_clean config.make
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+	if [ -f debian/src.depend.backup ]; then \
+	  mv debian/src.depend.backup src/.depend; \
+	fi
 
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(DESTDIR)
 
-	# These files are needed by lablgtk2-doc
-	cp src/gnomeDruid.cmi $(CURDIR)/debian/liblablgtk2-gnome-ocaml-dev/$(OCAML_STDLIB_DIR)/lablgtk2
-	cp src/gtkSourceView_types.cmi $(CURDIR)/debian/liblablgtksourceview-ocaml-dev/$(OCAML_STDLIB_DIR)/lablgtk2
-
-	# Install METAs
-	cp debian/META $(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_STDLIB_DIR)/lablgtk2
-	cp debian/META.lablgtk2-gl $(CURDIR)/debian/liblablgtk2-gl-ocaml-dev/$(OCAML_STDLIB_DIR)/METAS
-	cp debian/META.lablgtk2-gnome $(CURDIR)/debian/liblablgtk2-gnome-ocaml-dev/$(OCAML_STDLIB_DIR)/METAS
-	cp debian/META.lablgtksourceview $(CURDIR)/debian/liblablgtksourceview-ocaml-dev/$(OCAML_STDLIB_DIR)/METAS
-
-	# 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/
-	cp -r examples/sourceview $(CURDIR)/debian/liblablgtksourceview-ocaml-dev/usr/share/doc/liblablgtksourceview-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
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -s
-	dh_testroot -s
-
-	dh_installexamples -s --exclude='.cvsignore' --exclude='rsvg' --exclude='panel' --exclude='canvas' --exclude='GL' --exclude='sourceview'
-	dh_installmenu -s
-	dh_movefiles -s
-	dh_install -s --list-missing -X ".cmx" -X ".cmxa" -X "*.o"
-ifneq ($(OCAML_OPT_ARCH),)
-	mv $(DESTDIR)/$(OCAML_STDLIB_DIR)/lablgtk2/*.cmx  '$(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_STDLIB_DIR)/lablgtk2/'
-	mv $(DESTDIR)/$(OCAML_STDLIB_DIR)/lablgtk2/*.cmxa '$(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_STDLIB_DIR)/lablgtk2/'
-	mv $(DESTDIR)/$(OCAML_STDLIB_DIR)/lablgtk2/*.o    '$(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_STDLIB_DIR)/lablgtk2/'
-endif
-	# Doc generation (TODO: use CDBS)
-	OCAMLDOC_PKG="liblablgtk2-ocaml-dev liblablgtk2-gl-ocaml-dev liblablgtk2-gnome-ocaml-dev liblablgtksourceview-ocaml-dev"; \
-	OCAMLDOC_INCLUDE=`for i in $$OCAMLDOC_PKG; do find debian/$$i/$(OCAML_STDLIB_DIR)/ -type d -exec echo -I \{} \; ; done`; \
-	for i in $$OCAMLDOC_PKG; do \
-	  mkdir -p debian/$$i/usr/share/doc/$$i/html/api; \
-	  find debian/$$i/$(OCAML_STDLIB_DIR)/ \
-  	    -type f -name '*.mli' \
-	    | xargs $(OCAML_OCAMLDOC) -I $(OCAML_STDLIB_DIR)/lablgl -I $(OCAML_STDLIB_DIR)/threads \
-	     -pp "sed 's/@gtkdoc *\([A-Za-z-]* *[A-Za-z-]*\)/\(gtkdoc: \1\)/g'" \
-	     -stars -m A -no-custom-tags $$OCAMLDOC_INCLUDE -html \
-	     -d debian/$$i/usr/share/doc/$$i/html/api \
-            || true; \
-	    sed -e "s/@PACKAGE@/$$i/g" \
-	     /usr/share/cdbs/1/class/ocaml-docbase-template.txt \
-	     > debian/$$i.doc-base.ocamldoc-apiref ; \
-	done
-	dh_installdocs -s
-	dh_installman -s
-	dh_installinfo -s
-	dh_installchangelogs CHANGES -s
-	dh_link -s
-	dh_strip -s
-	dh_compress -s
-	dh_fixperms -s
-	dh_makeshlibs -s
-	dh_installdeb -s
-	dh_shlibdeps -s
-	dh_gencontrol -s -- -VF:OCamlABI="$(OCAML_ABI)"
-	dh_md5sums -s
-	dh_builddeb -s
+.PHONY: override_dh_installexamples
+override_dh_installexamples:
+	dh_installexamples --exclude='.cvsignore'
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: override_dh_install
+override_dh_install:
+	dh_install --list-missing

-- 
lablgtk2 packaging

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