[Pkg-ocaml-maint-commits] r2894 - in /trunk/packages/mldonkey/trunk/debian: changelog control mldonkey-server.menu rules

[smimram at users.alioth.debian.org]

Author: smimram
Date: Mon Jul 10 07:46:20 2006
New Revision: 2894

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2894
Log:
  * Removed obsolete configure options, closes: #375921. Also removed Soulseek
    and Opennap from the description.
  * Depend on ocaml-base-nox instead of ocaml-base on non native archs.


Modified:
    trunk/packages/mldonkey/trunk/debian/changelog
    trunk/packages/mldonkey/trunk/debian/control
    trunk/packages/mldonkey/trunk/debian/mldonkey-server.menu
    trunk/packages/mldonkey/trunk/debian/rules

Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=2894&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Mon Jul 10 07:46:20 2006
@@ -1,3 +1,12 @@
+mldonkey (2.7.7-3) UNRELEASED; urgency=low
+
+  * Removed obsolete configure options, closes: #375921. Also removed Soulseek
+    and Opennap from the description.
+  * Updated french debconf templates translation, closes: #377574.
+  * Depend on ocaml-base-nox instead of ocaml-base on non native archs.
+
+ -- Samuel Mimram <smimram at debian.org>  Fri, 23 Jun 2006 15:18:15 +0000
+
 mldonkey (2.7.7-2) unstable; urgency=low
 
   * mldonkey_options now correctly handles \" in strings, closes: #354433.

Modified: trunk/packages/mldonkey/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/control?rev=2894&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/control (original)
+++ trunk/packages/mldonkey/trunk/debian/control Mon Jul 10 07:46:20 2006
@@ -19,9 +19,7 @@
   - 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

Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.menu
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.menu?rev=2894&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.menu (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.menu Mon Jul 10 07:46:20 2006
@@ -1,10 +1,10 @@
 ?package(mldonkey-server):needs="text" section="Apps/Net"\
    hints="P2P"\
-   title="MLDonkey Server ( Start )"\
+   title="MLDonkey Server (start)"\
    command="/usr/bin/mldonkey_server --start"\
    icon="/usr/share/pixmaps/mlnet.xpm"
 ?package(mldonkey-server):needs="text" section="Apps/Net"\
    hints="P2P"\
-   title="MLDonkey Server ( Stop )"\
+   title="MLDonkey Server (stop)"\
    command="/usr/bin/mldonkey_server --stop"\
    icon="/usr/share/pixmaps/mlnet.xpm"

Modified: trunk/packages/mldonkey/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/rules?rev=2894&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/rules (original)
+++ trunk/packages/mldonkey/trunk/debian/rules Mon Jul 10 07:46:20 2006
@@ -42,17 +42,14 @@
 	  --host=$(DEB_HOST_GNU_TYPE)   \
 	  --build=$(DEB_BUILD_GNU_TYPE) \
 	  --enable-gui                  \
-	  --disable-fasttrack           \
-	  --disable-directconnect       \
-	  --enable-soulseek             \
-	  --enable-opennap              
+	  --disable-fasttrack
 	touch configure-stamp
 
 build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp 
 	dh_testdir
 
-	@if ([ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]) && $(MAKE) utils opt; then\
+	if ([ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]) && $(MAKE) utils opt; then\
 		/usr/bin/chrpath -d mlgui;\
 		/usr/bin/chrpath -d mlguistarter;\
 		touch build-arch-opt;\
@@ -69,8 +66,8 @@
 	chrpath -d mlgui
 	chrpath -d mlguistarter
 
-	# Compile utilities
-	@if [ -e build-arch-opt ]; then\
+	# Build utilities
+	if [ -e build-arch-opt ]; then\
 		cd debian/utils && $(MAKE) opt;\
 	else\
 		cd debian/utils && $(MAKE) byte;\
@@ -163,13 +160,13 @@
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a
-	@if [ -e build-arch-opt ]; then\
+	if [ -e build-arch-opt ]; then\
 		echo "interpreter:Depends=" >> debian/mldonkey-server.substvars;\
 		echo "interpreter:Depends=" >> debian/mldonkey-gui.substvars;\
 		dh_strip -a;\
 	else\
-		echo "interpreter:Depends=ocaml-base-$(OCAMLABI)" >> debian/mldonkey-server.substvars;\
-		echo "interpreter:Depends=ocaml-base-$(OCAMLABI)" >> debian/mldonkey-gui.substvars;\
+		echo "interpreter:Depends=ocaml-base-nox-$(OCAMLABI)" >> debian/mldonkey-server.substvars;\
+		echo "interpreter:Depends=ocaml-base-nox-$(OCAMLABI)" >> debian/mldonkey-gui.substvars;\
 	fi
 	dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums -a