[Pkg-ocaml-maint-commits] [SCM] xstr packaging branch, master, updated. debian/0.2.1-21

[Sylvain Le Gall]

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

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

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 ddea665..01c461e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-xstr (0.2.1-21) UNRELEASED; urgency=low
+xstr (0.2.1-21) unstable; urgency=low
 
   * Remove ./depend through debian/clean
+  * Use dh-ocaml 0.9.1 features
+  * Add debian/gbp.conf to use pristine-tar
+  * Upgrade Standards-Version to 3.8.3 (section ocaml, README.source)
 
- -- Sylvain Le Gall <gildor at debian.org>  Sat, 25 Jul 2009 15:46:50 +0000
+ -- Sylvain Le Gall <gildor at debian.org>  Sat, 19 Dec 2009 12:49:49 +0100
 
 xstr (0.2.1-20) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 307e34a..4bfe246 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,16 @@
 Source: xstr
-Section: libdevel
+Section: ocaml
 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),
  ocaml-findlib (>= 1.2.4),
  cdbs,
- dh-ocaml (>= 0.4),
+ dh-ocaml (>= 0.9.1),
  dpatch
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/xstr.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/xstr.git
 Homepage: http://projects.camlcity.org/projects/xstr.html
@@ -18,10 +18,12 @@ Homepage: http://projects.camlcity.org/projects/xstr.html
 Package: libxstr-ocaml-dev
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
+ ${ocaml:Depends},
  ocaml-findlib,
  ${shlibs:Depends},
  ${misc:Depends}
+Provides:
+ ${ocaml:Provides}
 Description: OCaml library for frequent string operations
  xstr is an OCaml library for string operations.
  .
diff --git a/debian/expand_stars.sh b/debian/expand_stars.sh
old mode 100644
new mode 100755
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/ocamldoc b/debian/ocamldoc
new file mode 100644
index 0000000..28b2181
--- /dev/null
+++ b/debian/ocamldoc
@@ -0,0 +1 @@
+-pp ./debian/expand_stars.sh
diff --git a/debian/rules b/debian/rules
index 75e06b5..5592a8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,10 @@
 #!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/class/makefile.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
 
 PKGNAME = libxstr-ocaml-dev
-OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
-OCAML_OCAMLDOC_FLAGS += -pp $(CURDIR)/debian/expand_stars.sh
 DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/$(PKGNAME)/$(OCAML_STDLIB_DIR)
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)

-- 
xstr packaging