[Pkg-ocaml-maint-commits] r3068 - in /trunk/packages/gmetadom/trunk/debian: changelog control control.in libgdome2-ocaml-dev.dirs libgdome2-ocaml-dev.install libgdome2-ocaml.dirs libgdome2-ocaml.install rules

[zack at users.alioth.debian.org]

Author: zack
Date: Wed Sep  6 08:04:24 2006
New Revision: 3068

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3068
Log:
sane debian/* setting

Removed:
    trunk/packages/gmetadom/trunk/debian/control.in
    trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.dirs
    trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.install
    trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.dirs
    trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.install
Modified:
    trunk/packages/gmetadom/trunk/debian/changelog
    trunk/packages/gmetadom/trunk/debian/control
    trunk/packages/gmetadom/trunk/debian/rules

Modified: trunk/packages/gmetadom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/gmetadom/trunk/debian/changelog?rev=3068&op=diff
==============================================================================
--- trunk/packages/gmetadom/trunk/debian/changelog (original)
+++ trunk/packages/gmetadom/trunk/debian/changelog Wed Sep  6 08:04:24 2006
@@ -1,3 +1,15 @@
+gmetadom (0.2.4-2) unstable; urgency=low
+
+  * debian/rules
+    - removed no longer needed workaround for cdbs + dpatch
+    - avoid to create debian/control from debian/control.in on ocamlinit
+    - removed from the source package files which are generated at build time
+      from the corresponding .in files
+  * debian/control.in
+    - file removed, no longer needed
+
+ -- Stefano Zacchiroli <zack at debian.org>  Wed,  6 Sep 2006 09:59:11 +0200
+
 gmetadom (0.2.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/gmetadom/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/gmetadom/trunk/debian/control?rev=3068&op=diff
==============================================================================
--- trunk/packages/gmetadom/trunk/debian/control (original)
+++ trunk/packages/gmetadom/trunk/debian/control Wed Sep  6 08:04:24 2006
@@ -34,19 +34,6 @@
  .
  This package includes the development files.
 
-Package: libgdome2-ocaml
-Section: libs
-Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
-Description: OCaml bindings for GDome2 DOM implementation
- OCaml bindings for GDome2 that is a fast, light and complete DOM level2
- implementation based on libxml2.
- .
- This particular binding is one of the bindings from the GMetaDOM
- binding collection.
- .
- This package contains only the shared runtime stub libraries.
-
 Package: libgdome2-ocaml-dev
 Section: libdevel
 Architecture: any
@@ -61,3 +48,16 @@
  This package contains the development part of the GDome2 OCaml
  bindings.
 
+Package: libgdome2-ocaml
+Section: libs
+Architecture: any
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Description: OCaml bindings for GDome2 DOM implementation
+ OCaml bindings for GDome2 that is a fast, light and complete DOM level2
+ implementation based on libxml2.
+ .
+ This particular binding is one of the bindings from the GMetaDOM
+ binding collection.
+ .
+ This package contains only the shared runtime stub libraries.
+

Modified: trunk/packages/gmetadom/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/gmetadom/trunk/debian/rules?rev=3068&op=diff
==============================================================================
--- trunk/packages/gmetadom/trunk/debian/rules (original)
+++ trunk/packages/gmetadom/trunk/debian/rules Wed Sep  6 08:04:24 2006
@@ -3,16 +3,19 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 
+PKGNAME = libgdome2-ocaml-dev
+
 OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
-DEB_CONFIGURE_EXTRA_FLAGS = --with-modules="gdome_cpp_smart gdome_caml"
+OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
+HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
 DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
 
 ocamlinit:
 	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+makebuilddir/$(PKGNAME):: ocamlinit
+
+DEB_CONFIGURE_EXTRA_FLAGS = --with-modules="gdome_cpp_smart gdome_caml"
+
 common-binary-post-install-arch::
 	-find debian/ -type f -size 0 -exec rm {} \;
 	-find debian/libgdome2-ocaml-dev -type d -name CVS -exec rm -rf {} \;
-
-# work around cdbs' bug
-unpatch: deapply-dpatches