The following commit has been merged in the master branch:
commit 75f4251a1377caa5a6b7fab3253b4513eafb381c
Author: Stephane Glondu <st...@glondu.net>
Date:   Tue Aug 16 18:05:31 2011 +0200

    Bump debhelper compat to 8, rewrite debian/rules using overrides

diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index c46b50e..45cc188 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
  Sylvain Le Gall <gil...@debian.org>,
  St├ęphane Glondu <glo...@debian.org>
 Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 8),
  dh-ocaml (>= 0.9.1),
  ocaml-nox (>= 3.11),
  libpng12-dev,
diff --git a/debian/rules b/debian/rules
index cf7323e..547b22d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,7 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# -*- makefile -*-
 
 include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -21,65 +16,27 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
 
 DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
-
 OCAMLSDL=$(CURDIR)/debian/libsdl-ocaml
 OCAMLSDLDEV=$(OCAMLSDL)-dev
 
-build: ocamlinit build-stamp
-build-stamp:
-       dh_testdir
+%:
+       dh $@ --with ocaml
 
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
        ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) 
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
-       $(MAKE)
-
-       touch build-stamp
-
-clean: ocamlinit-clean
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
        [ ! -f makefile.config.gcc ] || $(MAKE) clean
        rm -f config.log config.status
        rm -f makefile.config.gcc src/config.h
 
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_prep
-       dh_installdirs
-
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
        mkdir -p $(DESTDIR)
        $(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_install --list-missing
-       dh_installdocs
-#      dh_installinfo doc/ocamlsdl.info
-       dh_installexamples
-       dh_installman
+.PHONY: override_dh_installchangelogs
+override_dh_installchangelogs:
        dh_installchangelogs NEWS
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_ocaml
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install ocamlinit

-- 
ocamlsdl packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to