[Pkg-ocaml-maint-commits] r2223 - trunk/packages/mldonkey/trunk/debian

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-12-02 22:54:56 +0000 (Fri, 02 Dec 2005)
New Revision: 2223

Added:
   trunk/packages/mldonkey/trunk/debian/control.in
Modified:
   trunk/packages/mldonkey/trunk/debian/changelog
   trunk/packages/mldonkey/trunk/debian/control
   trunk/packages/mldonkey/trunk/debian/rules
Log:
Remove hardcoded OCaml ABI

Modified: trunk/packages/mldonkey/trunk/debian/changelog
===================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog	2005-12-02 22:39:10 UTC (rev 2222)
+++ trunk/packages/mldonkey/trunk/debian/changelog	2005-12-02 22:54:56 UTC (rev 2223)
@@ -1,9 +1,10 @@
 mldonkey (2.7.0-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release (Closes: #333708, #337856, #328131, #337313)
   * Fix weirdness in manpages (change xml-man/*.xml)
+  * Remove hardcoded OCaml ABI
 
- -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Tue, 29 Nov 2005 23:16:22 +0100
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Fri,  2 Dec 2005 23:45:10 +0100
 
 mldonkey (2.6.5-1) unstable; urgency=low
 

Modified: trunk/packages/mldonkey/trunk/debian/control
===================================================================
--- trunk/packages/mldonkey/trunk/debian/control	2005-12-02 22:39:10 UTC (rev 2222)
+++ trunk/packages/mldonkey/trunk/debian/control	2005-12-02 22:54:56 UTC (rev 2223)
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org> 
-Build-Depends: ocaml-nox-3.08.3, debhelper (>= 4.1.16), po-debconf, xsltproc, zlib1g-dev, docbook-xsl (>= 1.64.1), docbook-xml (>= 4.2-12), chrpath, m4, dpatch (>= 1.11), debconf (>= 0.2.26), liblablgtk2-ocaml-dev, libgd2-dev, liblablgtk2-gnome-ocaml-dev
+Build-Depends: ocaml-nox (>= 3.09.0), debhelper (>= 4.1.16), po-debconf, xsltproc, zlib1g-dev, docbook-xsl (>= 1.64.1), docbook-xml (>= 4.2-12), chrpath, m4, dpatch (>= 1.11), debconf (>= 0.2.26), liblablgtk2-ocaml-dev, libgd2-dev, liblablgtk2-gnome-ocaml-dev
 Standards-Version: 3.6.2.0
 
 Package: mldonkey-server

Copied: trunk/packages/mldonkey/trunk/debian/control.in (from rev 2188, trunk/packages/mldonkey/trunk/debian/control)
===================================================================
--- trunk/packages/mldonkey/trunk/debian/control	2005-11-29 22:29:10 UTC (rev 2188)
+++ trunk/packages/mldonkey/trunk/debian/control.in	2005-12-02 22:54:56 UTC (rev 2223)
@@ -0,0 +1,34 @@
+Source: mldonkey
+Section: net
+Priority: optional
+Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org> 
+Build-Depends: ocaml-nox (>= #OCamlABI#), debhelper (>= 4.1.16), po-debconf, xsltproc, zlib1g-dev, docbook-xsl (>= 1.64.1), docbook-xml (>= 4.2-12), chrpath, m4, dpatch (>= 1.11), debconf (>= 0.2.26), liblablgtk2-ocaml-dev, libgd2-dev, liblablgtk2-gnome-ocaml-dev
+Standards-Version: 3.6.2.0
+
+Package: mldonkey-server
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${interpreter:Depends}, adduser, mime-support, debconf (>= 0.2.26), ucf (>= 1.17), dpkg (>= 1.10.27)
+Suggests: makejail
+Description: Door to the 'donkey' network
+ MLDonkey is a door to the 'donkey' network, a decentralized network used to
+ exchange big files on the Internet. It is written in a wonderful language,
+ called Objective-Caml, and present most features of the basic Windows donkey
+ client, plus some more:
+  - works on UNIX-compatible platforms.
+  - remote control by telnet, WEB browser or GTK interface. 
+  - access to EDonkey ( edonkey2000, overnet, emule )
+  - access to Gnutella1/2
+  - access to Soulseek
+  - access to Bittorrent
+  - access to Opennap
+
+Package: mldonkey-gui
+Architecture: any
+Suggests: mldonkey-server (=${Source-Version})
+Depends: ${shlibs:Depends}, ${interpreter:Depends}
+Description: Graphical frontend for mldonkey based on GTK
+ The GTK interface for mldonkey provides a convenient way of managing
+ all mldonkey operations. It gives details about connected servers,
+ downloaded files, friends and lets one search for files in a pleasing
+ way.
+

Modified: trunk/packages/mldonkey/trunk/debian/rules
===================================================================
--- trunk/packages/mldonkey/trunk/debian/rules	2005-12-02 22:39:10 UTC (rev 2222)
+++ trunk/packages/mldonkey/trunk/debian/rules	2005-12-02 22:54:56 UTC (rev 2223)
@@ -13,7 +13,11 @@
 include /usr/share/dpatch/dpatch.make
 
 MANCHECK=mlnet mlgui mlguistarter
+OCAMLABI=$(shell ocamlc -version)
 
+debian/control: debian/control.in
+	 sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
+
 doc-check: doc-check-stamp
 doc-check-stamp: build
 	@for i in $(MANCHECK); do \
@@ -151,10 +155,10 @@
 		echo "interpreter:Depends=" >> debian/mldonkey-gui.substvars;\
 		dh_strip -a;\
 	else\
-		echo "interpreter:Depends=ocaml-base-3.08.3" >> debian/mldonkey-server.substvars;\
-		echo "interpreter:Depends=ocaml-base-3.08.3" >> debian/mldonkey-gui.substvars;\
+		echo "interpreter:Depends=ocaml-base-$(OCAMLABI)" >> debian/mldonkey-server.substvars;\
+		echo "interpreter:Depends=ocaml-base-$(OCAMLABI)" >> debian/mldonkey-gui.substvars;\
 	fi
-	dh_gencontrol -a
+	dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums -a
 	dh_builddeb -a