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

Sylvain LE GALL gildor-guest at costa.debian.org
Tue Oct 18 00:41:26 UTC 2005 

Author: gildor-guest
Date: 2005-10-18 00:39:42 +0000 (Tue, 18 Oct 2005)
New Revision: 1839

Added:
   trunk/packages/mldonkey/trunk/debian/patches/21_svg_converter.dpatch
   trunk/packages/mldonkey/trunk/debian/patches/22_mld_hash.dpatch
   trunk/packages/mldonkey/trunk/debian/patches/23_use_svg_converter_byte.dpatch
   trunk/packages/mldonkey/upstream/mldonkey_2.6.5.orig.tar.gz
Removed:
   trunk/packages/mldonkey/upstream/mldonkey_2.6.4.orig.tar.gz
Modified:
   trunk/packages/mldonkey/trunk/debian/changelog
   trunk/packages/mldonkey/trunk/debian/patches/00list
   trunk/packages/mldonkey/trunk/debian/rules
   trunk/packages/mldonkey/trunk/debian/utils/Makefile.users
Log:
New upstream release -- SLG


Modified: trunk/packages/mldonkey/trunk/debian/changelog
===================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog	2005-10-13 10:09:25 UTC (rev 1838)
+++ trunk/packages/mldonkey/trunk/debian/changelog	2005-10-18 00:39:42 UTC (rev 1839)
@@ -1,3 +1,15 @@
+mldonkey (2.6.5-1) unstable; urgency=low
+
+  * New upstream release
+  * Fix compilation problem due to the use g++ instead of gcc
+  * Apply patches :
+    * 21_svg_converter: fix missing objects during the link
+    * 22_mld_hash: fix partial application of Unix32.ftruncate64
+    * 23_use_svg_converter_byte: always use svg_converter.byte, it could
+      always build and speed is not important
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Mon, 17 Oct 2005 23:53:03 +0200
+
 mldonkey (2.6.4-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/mldonkey/trunk/debian/patches/00list
===================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/00list	2005-10-13 10:09:25 UTC (rev 1838)
+++ trunk/packages/mldonkey/trunk/debian/patches/00list	2005-10-18 00:39:42 UTC (rev 1839)
@@ -1,3 +1,5 @@
 01_see
 02_usr_bin
-20_wrong_comments
+21_svg_converter
+22_mld_hash
+23_use_svg_converter_byte

Added: trunk/packages/mldonkey/trunk/debian/patches/21_svg_converter.dpatch
===================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/21_svg_converter.dpatch	2005-10-13 10:09:25 UTC (rev 1838)
+++ trunk/packages/mldonkey/trunk/debian/patches/21_svg_converter.dpatch	2005-10-18 00:39:42 UTC (rev 1839)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 21_svg_converter.dpatch by Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mldonkey-2.6.5~/Makefile mldonkey-2.6.5/Makefile
+--- mldonkey-2.6.5~/Makefile	2005-10-12 00:46:40.000000000 +0200
++++ mldonkey-2.6.5/Makefile	2005-10-18 01:32:42.000000000 +0200
+@@ -811,7 +811,7 @@
+   endif
+ 
+ SVG_CONVERTER_SRCS = \
+-  $(CDK_SRCS) tools/svg_converter.ml
++  $(CDK_SRCS) $(LIB_SRCS) tools/svg_converter.ml
+ 
+ CURSES_LIBS_byte=-cclib -lncurses
+ CURSES_LIBS_opt=-cclib -lncurses


Property changes on: trunk/packages/mldonkey/trunk/debian/patches/21_svg_converter.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/mldonkey/trunk/debian/patches/22_mld_hash.dpatch
===================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/22_mld_hash.dpatch	2005-10-13 10:09:25 UTC (rev 1838)
+++ trunk/packages/mldonkey/trunk/debian/patches/22_mld_hash.dpatch	2005-10-18 00:39:42 UTC (rev 1839)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 22_mld_hash.dpatch by Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mldonkey-2.6.5~/tools/mld_hash.ml mldonkey-2.6.5/tools/mld_hash.ml
+--- mldonkey-2.6.5~/tools/mld_hash.ml	2005-09-13 11:54:48.000000000 +0200
++++ mldonkey-2.6.5/tools/mld_hash.ml	2005-10-18 01:50:22.000000000 +0200
+@@ -298,7 +298,7 @@
+       try
+         lprintf "Creating file %s\n" filename;
+         let file = f filename file_size in
+-        Unix32.ftruncate64 file file_size;
++        Unix32.ftruncate64 file file_size false;
+ 
+ (*
+             lprintf "Computing ed2k hash of zeroed file\n";
+@@ -436,4 +436,4 @@
+           sig2dat_hash_filename filename partial;
+           bitprint_filename filename partial
+   ) (_s " <filenames> : compute hashes of filenames");
+-  exit 0
+\ Pas de fin de ligne à la fin du fichier.
++  exit 0


Property changes on: trunk/packages/mldonkey/trunk/debian/patches/22_mld_hash.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/mldonkey/trunk/debian/patches/23_use_svg_converter_byte.dpatch
===================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/23_use_svg_converter_byte.dpatch	2005-10-13 10:09:25 UTC (rev 1838)
+++ trunk/packages/mldonkey/trunk/debian/patches/23_use_svg_converter_byte.dpatch	2005-10-18 00:39:42 UTC (rev 1839)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 23_use_svg_converter_byte.dpatch by Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mldonkey-2.6.5~/Makefile mldonkey-2.6.5/Makefile
+--- mldonkey-2.6.5~/Makefile	2005-10-18 02:26:54.000000000 +0200
++++ mldonkey-2.6.5/Makefile	2005-10-18 02:27:25.000000000 +0200
+@@ -3495,7 +3495,7 @@
+ 		$(OCAMLPP) $$i/*.mlt  >> .depend; \
+ 	done)
+ 	if test "$(GUI)" = "newgui2"; then \
+-		$(MAKE) svg_converter; \
++		$(MAKE) svg_converter.byte; \
+ 	fi
+ 
+ $(LOCAL)/ocamlopt-$(REQUIRED_OCAML)/Makefile: patches/ocamlopt-$(REQUIRED_OCAML).tar.gz
+@@ -3752,7 +3752,7 @@
+ 
+ .svg.ml_icons :
+ 	cp $< $@
+-	./svg_converter $@
++	./svg_converter.byte $@
+ 
+ .ml.cmx :
+ 	$(OCAMLOPT) $(PLUGIN_FLAG) $(OFLAGS) $(INCLUDES) -c $<


Property changes on: trunk/packages/mldonkey/trunk/debian/patches/23_use_svg_converter_byte.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/mldonkey/trunk/debian/rules
===================================================================
--- trunk/packages/mldonkey/trunk/debian/rules	2005-10-13 10:09:25 UTC (rev 1838)
+++ trunk/packages/mldonkey/trunk/debian/rules	2005-10-18 00:39:42 UTC (rev 1839)
@@ -33,11 +33,9 @@
 	-cd debian/xml-man && $(RM) *.new *.diff
 	-$(RM) doc-check-stamp
 
-build-arch: build-arch-stamp
-build-arch-stamp: 
+configure: configure-stamp
+configure-stamp:
 	dh_testdir
-	# Prevent the rebuild of configure
-	#touch config/configure
 	./configure                     \
 	  --host=$(DEB_HOST_GNU_TYPE)   \
 	  --build=$(DEB_BUILD_GNU_TYPE) \
@@ -45,14 +43,19 @@
 	  --disable-fasttrack           \
 	  --enable-soulseek             \
 	  --enable-opennap
+	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 ]; then\
-		$(MAKE) mlnet mlgui mlguistarter;\
+		$(MAKE) utils opt;\
 		/usr/bin/chrpath -d mlgui;\
 		/usr/bin/chrpath -d mlguistarter;\
 		cd debian/utils && $(MAKE) opt;\
 	else\
-		$(MAKE) mlnet.byte mlgui.byte mlguistarter.byte;\
+		$(MAKE) utils.byte byte;\
 		cp mlnet.byte mlnet;\
 		cp mlgui.byte mlgui;\
 		cp mlguistarter.byte mlguistarter;\
@@ -61,7 +64,7 @@
 	touch build-arch-stamp
 
 build-indep: build-indep-stamp
-build-indep-stamp:
+build-indep-stamp: 
 	dh_testdir
 	cd debian/xml-man && $(MAKE) all
 	touch build-indep-stamp
@@ -86,7 +89,7 @@
 	-$(RM) config/trying
 	-$(RM) packages/rpm/Makefile
 	-$(RM) *.ini *.ini.old
-	-$(RM) build-arch-stamp build-indep-stamp 
+	-$(RM) configure-stamp build-arch-stamp build-indep-stamp 
 	dh_clean
 
 install: DH_OPTIONS=

Modified: trunk/packages/mldonkey/trunk/debian/utils/Makefile.users
===================================================================
--- trunk/packages/mldonkey/trunk/debian/utils/Makefile.users	2005-10-13 10:09:25 UTC (rev 1838)
+++ trunk/packages/mldonkey/trunk/debian/utils/Makefile.users	2005-10-18 00:39:42 UTC (rev 1839)
@@ -135,11 +135,11 @@
 
 opt: $(EXEC).opt
 $(EXEC).opt: $(OPTOBJS)
-	cd $(TOP) && $(CAMLOPT)           -linkall -o $(HERE)/$(EXEC) -I $(HERE) -I build $(patsubst %.cmo,%.cmx,$(LIBS:.cma=.cmxa)) $(OPTOBJS)
+	cd $(TOP) && $(CAMLOPT) -cc $(CXX) -linkall -o $(HERE)/$(EXEC) -I $(HERE) -I build $(patsubst %.cmo,%.cmx,$(LIBS:.cma=.cmxa)) $(OPTOBJS)
 
 byte: $(EXEC).byte
 $(EXEC).byte: $(OBJS)
-	cd $(TOP) && $(CAMLC)   $(CUSTOM)  -linkall -o $(HERE)/$(EXEC) -I $(HERE) -I build $(LIBS) $(OBJS)
+	cd $(TOP) && $(CAMLC) -cc $(CXX) $(CUSTOM)  -linkall -o $(HERE)/$(EXEC) -I $(HERE) -I build $(LIBS) $(OBJS)
 
 .SUFFIXES:
 .SUFFIXES: .ml .mli .cmo .cmi .cmx .mll .mly

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

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


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

More information about the Pkg-ocaml-maint-commits mailing list