[Pkg-ocaml-maint-commits] [SCM] pagodacf packaging branch, master, updated. debian/0.10-3

Tue Dec 15 21:19:40 UTC 2009

The following commit has been merged in the master branch:
commit dd23388f4c57994da51b81266a7b998f2a193b8e
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Tue Dec 15 21:18:53 2009 +0000

    dh-ocaml transition
    
    * Use dh-ocaml 0.9.1 features
    * 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 4ae9059..9ca554d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pagodacf (0.10-3) unstable; urgency=low
+
+  * Use dh-ocaml 0.9.1 features
+  * Upgrade Standards-Version to 3.8.3 (section ocaml, README.source)
+
+ -- Sylvain Le Gall <gildor at debian.org>  Tue, 15 Dec 2009 21:18:24 +0000
+
 pagodacf (0.10-2) unstable; urgency=low
 
   * Rebuild with OCaml 3.11.
diff --git a/debian/control b/debian/control
index 06b2982..32c3784 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,18 @@
 Source: pagodacf
-Section: devel
+Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>= 7), dh-ocaml, ocaml-nox (>= 3.11), ocaml-findlib (>= 1.2.4), dpatch
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), dh-ocaml (>= 0.9.1), ocaml-nox (>= 3.11), ocaml-findlib (>= 1.2.4), dpatch
+Standards-Version: 3.8.3
 Homepage: http://www.sourceforge.net/projects/ocnae/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pagodacf.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/pagodacf.git
 
 Package: libcf-ocaml-dev
-Section: libdevel
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libcf-ocaml (= ${binary:Version})
+Depends: ${ocaml:Depends}, libcf-ocaml (= ${binary:Version})
+Provides: ${ocaml:Provides}
 Description: OCaml library with miscellaneous utility functions
  The pagoda core foundation OCaml library provides various modules. Some of
  the highlighted features include:
@@ -37,9 +37,9 @@ Description: OCaml library with miscellaneous utility functions
  in your programs.
 
 Package: libcf-ocaml
-Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
+Depends: ${shlibs:Depends}, ${ocaml:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml library with miscellaneous utility functions
  The pagoda core foundation OCaml library provides various modules. Some of
  the highlighted features include:
diff --git a/debian/rules b/debian/rules
index e58d2fc..87a1903 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ DESTDIR=$(TMPDIR)/$(OCAML_STDLIB_DIR)
 build: ocamlinit patch-stamp build-stamp
 build-stamp:
 	dh_testdir
-
+	if ! test -f .depend.org; then cp .depend .depend.org; fi
 	$(MAKE) depend
 	$(MAKE) DEBUG_OPT="-g" default
 ifneq ($(OCAML_OPT_ARCH),)
@@ -31,11 +31,10 @@ clean: unpatch ocamlinit-clean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-
 	$(MAKE) clean
-	rm -f .depend .DS_Store
-	rm -rf $(TMPDIR) doc html
-
+	-$(RM) -f .DS_Store
+	if test -f .depend.org; then mv .depend.org .depend; fi
+	-$(RM) -rf $(TMPDIR) doc html
 	dh_clean
 
 install: build
@@ -43,7 +42,6 @@ install: build
 	dh_testroot
 	dh_prep
 	dh_installdirs
-
 	mkdir -p $(DESTDIR)
 	$(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
 
@@ -64,7 +62,8 @@ binary-arch: build install
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
+	dh_ocaml
+	dh_gencontrol 
 	dh_md5sums
 	dh_builddeb
 

-- 
pagodacf packaging

