[Pkg-ocaml-maint-commits] [SCM] ocaml-res packaging branch, master, updated. debian/3.2.0-2-8-gaf05528

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 8af7f9c03a5e12f5ea85ff5ec76b5f465beb4f3e
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue May 7 19:52:34 2013 +0800

    New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 6fedb3f..58b0db5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-ocaml-res (3.2.0-3) UNRELEASED; urgency=low
+ocaml-res (4.0.2-1) unstable; urgency=low
 
   [ Stefano Zacchiroli ]
   * remove myself from Uploaders
 
- -- Stefano Zacchiroli <zack at debian.org>  Sat, 08 Oct 2011 19:26:09 +0200
+  [ Lifeng Sun ]
+  * New upstream release.
+  * Add myself to Uploaders.
+
+ -- Lifeng Sun <lifongsun at gmail.com>  Mon, 06 May 2013 17:36:43 +0800
 
 ocaml-res (3.2.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index fe921c7..ca42d43 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,15 @@ Source: ocaml-res
 Section: ocaml
 Priority: extra
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Stéphane Glondu <glondu at debian.org>
+Uploaders:
+ Stéphane Glondu <glondu at debian.org>,
+ Lifeng Sun <lifongsun at gmail.com>
 Build-Depends:
- cdbs,
- debhelper (>= 7),
+ debhelper (>= 7.0.50~),
  dh-ocaml (>= 0.9),
  ocaml-nox (>= 3.11.1-3~),
  ocaml-findlib (>= 1.2.5)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.4
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-res.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-res.git
 Homepage: http://www.ocaml.info/home/ocaml_sources.html
diff --git a/debian/docs b/debian/docs
index 0389f2c..4dd3757 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,2 @@
-README.txt
-TODO
+README.md
+TODO.md
diff --git a/debian/patches/0001-Fix-build-on-non-native-archs.patch b/debian/patches/0001-Fix-build-on-non-native-archs.patch
deleted file mode 100644
index ea3afd9..0000000
--- a/debian/patches/0001-Fix-build-on-non-native-archs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Wed, 1 Jul 2009 15:10:40 +0200
-Subject: [PATCH] Fix build on non-native archs
-
----
- Makefile      |    8 ++++++++
- OCamlMakefile |    2 +-
- 2 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e1a6ae3..5df91b1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -4,6 +4,10 @@ EXAMPLES = $(filter-out examples/CVS, $(wildcard examples/*))
- all:
- 	@cd lib && $(MAKE) byte-code-library native-code-library
- 
-+.PHONY: byte
-+byte:
-+	@cd lib && $(MAKE) byte-code-library
-+
- .PHONY:	examples
- examples:
- 	@for dir in $(EXAMPLES); do (cd $$dir && $(MAKE)); done
-@@ -17,6 +21,10 @@ doc:
- install:
- 	@cd lib && $(MAKE) $@
- 
-+.PHONY:	libinstall-byte-code
-+libinstall-byte-code:
-+	@cd lib && $(MAKE) $@
-+
- .PHONY:	uninstall
- uninstall:
- 	@cd lib && $(MAKE) $@
-diff --git a/OCamlMakefile b/OCamlMakefile
-index e9e0753..5fc303e 100644
---- a/OCamlMakefile
-+++ b/OCamlMakefile
-@@ -1182,7 +1182,7 @@ libinstall:	all
- 	$(QUIET)printf "\nInstallation successful.\n"
- 
- .PHONY: libinstall-byte-code
--libinstall-byte-code:	all
-+libinstall-byte-code:
- 	$(QUIET)printf "\nInstalling byte-code library with ocamlfind\n"
- 	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
- 	  $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b94aac2..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix-build-on-non-native-archs.patch
diff --git a/debian/rules b/debian/rules
index 2722412..8a62223 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,37 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
-
-LIB_NAME = res
-PKG_NAME = lib$(LIB_NAME)-ocaml-dev
-DESTDIR = $(CURDIR)/debian/$(PKG_NAME)$(OCAML_STDLIB_DIR)
-OCAML_OCAMLDOC_PACKAGES = $(PKG_NAME)
-
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET = all
-DEB_MAKE_INSTALL_TARGET = install OCAMLFIND_INSTFLAGS="-destdir $(DESTDIR)"
-else
-DEB_MAKE_BUILD_TARGET = byte
-DEB_MAKE_INSTALL_TARGET = libinstall-byte-code OCAMLFIND_INSTFLAGS="-destdir $(DESTDIR)"
-endif
-
-build/$(PKG_NAME)::
-	mkdir -p $(DESTDIR)
+
+DESTDIR=$(CURDIR)/debian/libres-ocaml-dev
+
+include /usr/share/ocaml/ocamlvars.mk
+
+export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_LDCONF=ignore
+
+%:
+	dh --with ocaml $@
+
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir '/usr/share/doc/libres-ocaml-dev'
+
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	ocaml setup.ml -build
+	ocaml setup.ml -doc
+
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
+	ocaml setup.ml -test
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	mkdir -p '$(OCAMLFIND_DESTDIR)'
+	ocaml setup.ml -install 
+
+.PHONY: override_dh_install
+override_dh_install:
+	dh_install --fail-missing
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	ocaml setup.ml -distclean

-- 
ocaml-res packaging