[Pkg-ocaml-maint-commits] r2571 - in trunk/packages/mldonkey: trunk/debian trunk/debian/patches upstream

Mon Feb 13 22:11:56 UTC 2006

Author: gildor
Date: 2006-02-13 22:10:11 +0000 (Mon, 13 Feb 2006)
New Revision: 2571

Added:
   trunk/packages/mldonkey/trunk/debian/patches/26_ocaml3.09.1_min.dpatch
   trunk/packages/mldonkey/upstream/mldonkey_2.7.3.orig.tar.gz
Removed:
   trunk/packages/mldonkey/upstream/mldonkey_2.7.1.orig.tar.gz
Modified:
   trunk/packages/mldonkey/trunk/debian/changelog
   trunk/packages/mldonkey/trunk/debian/copyright
   trunk/packages/mldonkey/trunk/debian/patches/00list
   trunk/packages/mldonkey/trunk/debian/rules
Log:
Prepare release -- SLG


Modified: trunk/packages/mldonkey/trunk/debian/changelog
===================================================================

--- trunk/packages/mldonkey/trunk/debian/changelog	2006-02-09 19:26:45 UTC (rev 2570)
+++ trunk/packages/mldonkey/trunk/debian/changelog	2006-02-13 22:10:11 UTC (rev 2571)
@@ -1,3 +1,13 @@
+mldonkey (2.7.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Test the presence of mlnet and mlgui, to fail ASAP if the compilation of
+    one of these has failed.
+  * Disable the use of --enable-ocamlver in debian/rules
+  * Compile with ocaml 3.09.1 (Closes: #352638)
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Tue,  7 Feb 2006 23:09:50 +0100
+
 mldonkey (2.7.1-2) unstable; urgency=low
 
   * Replace libgd2-dev by libgd2-noxpm-dev in the build dependency

Modified: trunk/packages/mldonkey/trunk/debian/copyright
===================================================================
--- trunk/packages/mldonkey/trunk/debian/copyright	2006-02-09 19:26:45 UTC (rev 2570)
+++ trunk/packages/mldonkey/trunk/debian/copyright	2006-02-13 22:10:11 UTC (rev 2571)
@@ -53,3 +53,78 @@
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
+
+GeoIP copyright:
+
+  There are two licenses, one for the C library software, and one for the
+  database.
+  
+  SOFTWARE LICENSE (C library)
+  
+  The GeoIP C Library is licensed under the GPL.  For details see the COPYING
+  file.
+  
+  OPEN DATA LICENSE (GeoLite Free Country Database)
+  
+  Copyright (c) 2005 MaxMind LLC.  All Rights Reserved.
+  
+  All advertising materials and documentation mentioning features or use of
+  this database must display the following acknowledgment: "This product
+  includes GeoLite data created by MaxMind, available from http://maxmind.com/"
+  
+  Redistribution and use with or without modification, are permitted provided
+  that the following conditions are met: 1. Redistributions must retain the
+  above copyright notice, this list of conditions and the following disclaimer
+  in the documentation and/or other materials provided with the distribution.
+  2. All advertising materials and documentation mentioning features or use of
+  this database must display the following acknowledgement: "This product
+  includes GeoLite data created by MaxMind, available from http://maxmind.com/"
+  3. "MaxMind" may not be used to endorse or promote products derived from this
+  database without specific prior written permission.
+  
+  THIS DATABASE IS PROVIDED BY MAXMIND.COM ``AS IS'' AND ANY EXPRESS OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+  EVENT SHALL MAXMIND.COM BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS DATABASE, EVEN IF
+  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  
+  Some parts of this software distribution are derived from the APNIC, ARIN and
+  RIPE databases (copyright details below). The author of this module makes no
+  claims of ownership on those parts.
+  
+  APNIC conditions of use:
+  
+  The files are freely available for download and use on the condition that
+  APNIC will not be held responsible for any loss or damage arising from the
+  application of the information contained in these reports.
+  
+  APNIC endeavours to the best of its ability to ensure the accuracy of these
+  reports; however, APNIC makes no guarantee in this regard.
+  
+  In particular, it should be noted that these reports seek to indicate the
+  country where resources were first allocated or assigned. It is not intended
+  that these reports be considered as an authoritative statement of the
+  location in which any specific resource may currently be in use.
+  
+  ARIN database copyright:
+  
+  Copyright (c) American Registry for Internet Numbers. All rights reserved.
+  
+  RIPE database copyright:
+  
+  The information in the RIPE Database is available to the public for agreed
+  Internet operation purposes, but is under copyright. The copyright statement
+  is:
+  
+  "Except for agreed Internet operational purposes, no part of this publication
+  may be reproduced, stored in a retrieval system, or transmitted, in any form
+  or by any means, electronic, mechanical, recording, or otherwise, without
+  prior permission of the RIPE NCC on behalf of the copyright holders. Any use
+  of this material to target advertising or similar activities is explicitly
+  forbidden and may be prosecuted. The RIPE NCC requests to be notified of any
+  such activities or suspicions thereof."

Modified: trunk/packages/mldonkey/trunk/debian/patches/00list
===================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/00list	2006-02-09 19:26:45 UTC (rev 2570)
+++ trunk/packages/mldonkey/trunk/debian/patches/00list	2006-02-13 22:10:11 UTC (rev 2571)
@@ -1,3 +1,2 @@
 01_see
 02_usr_bin
-24_ocaml3.09.0_min

Copied: trunk/packages/mldonkey/trunk/debian/patches/26_ocaml3.09.1_min.dpatch (from rev 2490, trunk/packages/mldonkey/trunk/debian/patches/24_ocaml3.09.0_min.dpatch)

Modified: trunk/packages/mldonkey/trunk/debian/rules
===================================================================
--- trunk/packages/mldonkey/trunk/debian/rules	2006-02-09 19:26:45 UTC (rev 2570)
+++ trunk/packages/mldonkey/trunk/debian/rules	2006-02-13 22:10:11 UTC (rev 2571)
@@ -46,8 +46,7 @@
 	  --enable-gui                  \
 	  --disable-fasttrack           \
 	  --enable-soulseek             \
-	  --enable-opennap              \
-	  --enable-ocamlver=3.09.0
+	  --enable-opennap              
 	touch configure-stamp
 
 build-arch: build-arch-stamp
@@ -58,12 +57,20 @@
 		$(MAKE) utils opt;\
 		/usr/bin/chrpath -d mlgui;\
 		/usr/bin/chrpath -d mlguistarter;\
-		cd debian/utils && $(MAKE) opt;\
 	else\
 		$(MAKE) utils.byte byte;\
 		cp mlnet.byte mlnet;\
 		cp mlgui.byte mlgui;\
 		cp mlguistarter.byte mlguistarter;\
+	fi
+	# Check that the compilation has succeeded
+	test -x mlnet
+	test -x mlgui
+
+	# Compile utilities
+	@if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then\
+		cd debian/utils && $(MAKE) opt;\
+	else\
 		cd debian/utils && $(MAKE) byte;\
 	fi
 	touch build-arch-stamp
@@ -139,7 +146,8 @@
 	dh_testroot -a
 	dh_installdebconf -a
 	dh_installdocs -a
-	rm -r $(CURDIR)/debian/mldonkey-server/usr/share/doc/mldonkey-server/distrib/Copying.txt
+	$(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_installexamples -a
 	dh_installmenu -a
 	dh_installinit -a -- start 98 2 3 4 5 . stop 20 0 1 6 .

Deleted: trunk/packages/mldonkey/upstream/mldonkey_2.7.1.orig.tar.gz
===================================================================
(Binary files differ)

Added: trunk/packages/mldonkey/upstream/mldonkey_2.7.3.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: trunk/packages/mldonkey/upstream/mldonkey_2.7.3.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


