[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.0-3-6-g803afae

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit a6bde41092847bcdc13b316a2da17d4d3f0cf9e8
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Nov 1 19:25:01 2009 +0100

    Refresh packaging

diff --git a/debian/changelog b/debian/changelog
index 30116f5..d3beafa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 mldonkey (3.0.0-4) unstable; urgency=low
 
   * Update my e-mail address and remove DMUA
+  * Refresh packaging
+    - Use new features of dh-ocaml 0.9
+    - Use debhelper's overrides
 
- -- Mehdi Dogguy <mehdi at debian.org>  Sun, 01 Nov 2009 19:11:52 +0100
+ -- Mehdi Dogguy <mehdi at debian.org>  Sun, 01 Nov 2009 19:25:13 +0100
 
 mldonkey (3.0.0-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6144ede..22fbea1 100644
--- a/debian/control
+++ b/debian/control
@@ -10,9 +10,9 @@ Homepage: http://mldonkey.sourceforge.net/
 Build-Depends: autoconf, autotools-dev,
  ocaml-nox (>= 3.11.1),
  ocaml-best-compilers | ocaml-nox,
- dh-ocaml (>= 0.4.1),
+ dh-ocaml (>= 0.9.1),
  camlp4,
- debhelper (>= 7),
+ debhelper (>= 7.0.50~),
  po-debconf,
  xsltproc,
  zlib1g-dev,
@@ -23,10 +23,10 @@ Build-Depends: autoconf, autotools-dev,
  dpatch,
  debconf,
  liblablgtk2-ocaml-dev (>= 2.12.0-3),
- libgd2-noxpm-dev,
+ libgd2-xpm-dev,
  liblablgtk2-gnome-ocaml-dev,
  libxml2-utils
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mldonkey.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mldonkey.git
 
@@ -34,8 +34,8 @@ Package: mldonkey-server
 Architecture: any
 Depends:
  ${shlibs:Depends},
+ ${ocaml:Depends},
  ${misc:Depends},
- ${interpreter:Depends},
  adduser,
  mime-support,
  debconf,
@@ -56,7 +56,7 @@ Architecture: any
 Suggests: mldonkey-server (= ${binary:Version})
 Depends:
  ${shlibs:Depends},
- ${interpreter:Depends},
+ ${ocaml:Depends},
  ${misc:Depends}
 Description: Graphical frontend for mldonkey based on GTK+
  The GTK+ interface for mldonkey provides a convenient way of managing
diff --git a/debian/rules b/debian/rules
index 843ce05..f47bb8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
 
 include /usr/share/dpatch/dpatch.make
 include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   confflags += --build $(DEB_HOST_GNU_TYPE)
@@ -20,11 +19,8 @@ else
         CFLAGS += -O2
 endif
 
-clean-doc:
-	$(MAKE) -C debian/xml-man clean
-
-clean: unpatch clean-doc
-	dh clean
+override_dh_auto_clean:
+	dpatch deapply-all
 # Update the PO, as suggested in "man 7 po-debconf"
 	debconf-updatepo
 # Add here commands to clean up after the build process.
@@ -36,20 +32,16 @@ clean: unpatch clean-doc
 	-$(RM) *.ini *.ini.old
 	-$(RM) config/confdefs.h
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
+override_dh_auto_configure:
+	dpatch apply-all
 	cd config; autoconf
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" ./configure $(confflags) \
 	  --enable-gui=newgui2 \
 	  --enable-directconnect \
           --disable-magic \
 	  --disable-fasttrack
-	touch configure-stamp
 
-build: build-stamp
-build-stamp: patch-stamp configure-stamp
-	dh_testdir
+override_dh_auto_build:
 	$(MAKE) utils.$(OCAML_BEST) $(OCAML_BEST)
 ifeq ($(OCAML_BEST),byte)
 	cp mlnet.byte mlnet
@@ -63,34 +55,18 @@ endif
 	$(MAKE) -C debian/xml-man all
 # Build utilities
 	make -C debian/utils TARGET=$(OCAML_BEST)
-	touch build-stamp
-
-install: build install-stamp
-install-stamp:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	dh_install
-
-binary-indep: build install-stamp
 
-binary-arch: build install-stamp
-	dh binary-arch --until=installdocs
+override_dh_auto_install:
 	$(RM) $(CURDIR)/debian/mldonkey-server/usr/share/doc/mldonkey-server/distrib/Copying.txt
 	$(RM) $(CURDIR)/debian/mldonkey-server/usr/share/doc/mldonkey-server/distrib/GeoIP_LICENSE.txt
-	dh binary-arch --after=installdocs --before=installinit
+
+override_dh_installinit:
 	dh_installinit -a -pmldonkey-server --error-handler=init_error -- start 98 2 3 4 5 . stop 20 0 1 6 .
-	dh binary-arch --after=installinit --before=strip
+
+override_dh_strip:
 ifeq ($(OCAML_BEST),opt)
-	echo "interpreter:Depends=" >> debian/mldonkey-server.substvars
-	echo "interpreter:Depends=" >> debian/mldonkey-gui.substvars
 	dh_strip -a
-else
-	echo "interpreter:Depends=ocaml-base-nox-$(OCAML_ABI)" >> debian/mldonkey-server.substvars
-	echo "interpreter:Depends=ocaml-base-nox-$(OCAML_ABI)" >> debian/mldonkey-gui.substvars
 endif
-	dh binary-arch --after=strip
 
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+	dh --with ocaml $@

-- 
mldonkey packaging