[Pkg-ocaml-maint-commits] [SCM] gmetadom packaging branch, master, updated. debian/0.2.6-4

Sat Dec 19 11:44:17 UTC 2009

The following commit has been merged in the master branch:
commit cc74761beec3316aa16e73d791abde95985c3f70
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sat Dec 19 12:42:40 2009 +0100

    dh-ocaml transition
    
    * Use dh-ocaml 0.9.1 features
    * Add myself to Uploaders
    * Upgrade Standards-Version to 3.8.3 (section ocaml, README.source)
    * Add debian/gbp.conf to use pristine-tar

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..fc98b3d
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,38 @@
+This package uses dpatch to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To get the fully patched source after unpacking the source package, cd
+to the root level of the source package and run:
+
+    debian/rules patch
+
+Removing a patch is as simple as removing its entry from the
+debian/patches/00list file, and please also remove the patch file
+itself.
+
+Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
+where you should replace XX with a new number and patchname with a
+descriptive shortname of the patch. You can then simply edit all the
+files your patch wants to edit, and then simply "exit 0" from the shell
+to actually create the patch file.
+
+To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
+and replace XX_patchname with the actual filename from debian/patches
+you want to use.
+
+To clean up afterwards again, "debian/rules unpatch" will do the
+work for you - or you can of course choose to call
+"fakeroot debian/rules clean" all together.
+
+
+--- 
+
+this documentation is part of dpatch package, and may be used by
+packages using dpatch to comply with policy on README.source. This
+documentation is meant to be useful to users who are not proficient in
+dpatch in doing work with dpatch-based packages. Please send any
+improvements to the BTS of dpatch package.
+
+original text by Gerfried Fuchs, edited by Junichi Uekawa <dancer at debian.org>
+10 Aug 2008.
diff --git a/debian/changelog b/debian/changelog
index df00a5e..0357031 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gmetadom (0.2.6-4) unstable; urgency=low
+
+  * Use dh-ocaml 0.9.1 features
+  * Add myself to Uploaders
+  * Upgrade Standards-Version to 3.8.3 (section ocaml, README.source)
+  * Add debian/gbp.conf to use pristine-tar
+
+ -- Sylvain Le Gall <gildor at debian.org>  Sat, 19 Dec 2009 12:41:28 +0100
+
 gmetadom (0.2.6-3) unstable; urgency=low
 
   [ Stefano Zacchiroli ]
diff --git a/debian/control b/debian/control
index 0b9e26f..b07e1ce 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gmetadom
 Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Stefano Zacchiroli <zack at debian.org>
+Uploaders: Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <gildor at debian.org>
 Build-Depends:
  debhelper (>= 7),
  ocaml-nox (>= 3.11),
@@ -11,8 +11,8 @@ Build-Depends:
  pkg-config,
  dpatch,
  cdbs,
- dh-ocaml (>= 0.4)
-Standards-Version: 3.8.0
+ dh-ocaml (>= 0.9.1)
+Standards-Version: 3.8.3
 Homepage: http://gmetadom.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/gmetadom.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/gmetadom.git
@@ -51,13 +51,15 @@ Description: C++ bindings for GDome2 DOM implementation
  This package includes the development files.
 
 Package: libgdome2-ocaml-dev
-Section: libdevel
+Section: ocaml
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
+ ${ocaml:Depends},
  libgdome2-dev,
  libgdome2-ocaml (= ${binary:Version}),
  ${misc:Depends}
+Provides:
+ ${ocaml:Provides}
 Description: OCaml bindings for GDome2 DOM implementation
  OCaml bindings for GDome2 that is a fast, light and complete DOM level2
  implementation based on libxml2.
@@ -69,12 +71,14 @@ Description: OCaml bindings for GDome2 DOM implementation
  bindings.
 
 Package: libgdome2-ocaml
-Section: libs
+Section: ocaml
 Architecture: any
 Depends:
- ocaml-base-nox-${F:OCamlABI},
+ ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
+Provides:
+ ${ocaml:Provides}
 Description: OCaml bindings for GDome2 DOM implementation
  OCaml bindings for GDome2 that is a fast, light and complete DOM level2
  implementation based on libxml2.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/libgdome2-ocaml-dev.ocamldoc b/debian/libgdome2-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..c01ade2
--- /dev/null
+++ b/debian/libgdome2-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+# Nothing
diff --git a/debian/rules b/debian/rules
index cc8d5e1..4b9e746 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = --with-modules="gdome_cpp_smart gdome_caml"
-OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
 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 {} \;

-- 
gmetadom packaging

