[Pkg-ocaml-maint-commits] [SCM] freetennis packaging branch, master, updated. debian/0.4.8-7-1-gf190943

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit f190943d162513cb405d3dce9c30d1f833938e0f
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Jun 22 16:09:00 2010 +0200

    Various updates
    
    * Use dh-ocaml to compute dependencies automatically
    * Bump standards to 3.8.4
    * Update e-mail address and drop DMUA

diff --git a/debian/changelog b/debian/changelog
index 17d62bd..33ace33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+freetennis (0.4.8-8) unstable; urgency=low
+
+  * Use dh-ocaml to compute dependencies automatically
+  * Bump standards to 3.8.4
+  * Update e-mail address and drop DMUA
+  * Use 3.0 (quilt) format
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 22 Jun 2010 16:08:01 +0200
+
 freetennis (0.4.8-7) unstable; urgency=low
 
   * Using .install files instead of copying by hand.
@@ -75,4 +84,3 @@ freetennis (0.4.8-1) unstable; urgency=low
   * Initial release.  Closes: #373957.
 
  -- Bart Martens <bartm at knars.be>  Fri, 16 Jun 2006 23:12:04 +0200
-
diff --git a/debian/control b/debian/control
index 6c1ae46..6cc09b2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: freetennis
 Section: games
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Mehdi Dogguy <dogguy at pps.jussieu.fr>
+Uploaders: Mehdi Dogguy <mehdi at debian.org>
 Build-Depends: debhelper (>= 7.0.52),
- ocaml (>= 3.11.0),
- dh-ocaml (>= 0.4.1),
+ ocaml-nox (>= 3.11.1-3~),
+ dh-ocaml (>= 0.9~),
  quilt (>= 0.46-7),
  libsdl-ocaml-dev,
  libsdl-gfx1.2-dev,
@@ -14,15 +14,16 @@ Build-Depends: debhelper (>= 7.0.52),
  libsdl-ttf2.0-dev,
  liblablgl-ocaml-dev,
  liblablgtk2-ocaml-dev
-Standards-Version: 3.8.2
-DM-Upload-Allowed: yes
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/freetennis
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/freetennis.git
 Homepage: http://freetennis.sourceforge.net/
 
 Package: freetennis-common
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
 Description: Free Tennis - simulation game
  Free Tennis is a free software tennis simulation game.  The game can be played
  against an A.I. or human-vs-human via LAN or internet.
@@ -31,7 +32,11 @@ Description: Free Tennis - simulation game
 
 Package: freetennis
 Architecture: any
-Depends: ${F:FreetennisRuntime}, ${shlibs:Depends}, ${misc:Depends}, freetennis-common (= ${source:Version})
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends},
+ freetennis-common (= ${source:Version})
 Description: Free Tennis - simulation game
  Free Tennis is a free software tennis simulation game.  The game can be played
  against an A.I. or human-vs-human via LAN or internet.
diff --git a/debian/rules b/debian/rules
index 32e545a..7c295f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
 export DH_VERBOSE=1
 
 include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
 
 override_dh_auto_build:
 	$(MAKE) -f debian/Makefile freetennis.$(OCAML_BEST)
@@ -12,10 +11,5 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	$(MAKE) -f debian/Makefile clean
 
-override_dh_auto_install:
-ifeq ($(OCAML_OPT_ARCH),)
-	echo 'F:FreetennisRuntime=liblablgl-ocaml,liblablgtk2-ocaml,libsdl-ocaml,$(OCAML_RUNTIME)' >> debian/laby.substvars
-endif
-
 %:
-	dh --with quilt $@
+	dh --with quilt,ocaml $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
freetennis packaging