[Pkg-ocaml-maint-commits] r1792 - trunk/packages/ocaml/branches/3.08.4/debian

Tue Sep 27 16:51:27 UTC 2005

Author: jcristau-guest
Date: 2005-09-27 16:51:26 +0000 (Tue, 27 Sep 2005)
New Revision: 1792

Added:
   trunk/packages/ocaml/branches/3.08.4/debian/ocaml-interp.menu
   trunk/packages/ocaml/branches/3.08.4/debian/ocaml-mode.README.Debian
   trunk/packages/ocaml/branches/3.08.4/debian/ocamlfind/
Removed:
   trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.menu
Modified:
   trunk/packages/ocaml/branches/3.08.4/debian/changelog
   trunk/packages/ocaml/branches/3.08.4/debian/control
   trunk/packages/ocaml/branches/3.08.4/debian/ocaml-interp.dirs
   trunk/packages/ocaml/branches/3.08.4/debian/ocaml-native-compilers.dirs
   trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.dirs
   trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.postinst
   trunk/packages/ocaml/branches/3.08.4/debian/rules
Log:
Merge changes from trunk between r1725 and HEAD (r1791).


Modified: trunk/packages/ocaml/branches/3.08.4/debian/changelog
===================================================================

--- trunk/packages/ocaml/branches/3.08.4/debian/changelog	2005-09-22 20:13:07 UTC (rev 1791)
+++ trunk/packages/ocaml/branches/3.08.4/debian/changelog	2005-09-27 16:51:26 UTC (rev 1792)
@@ -1,6 +1,6 @@
 ocaml (3.08.4-1) UNRELEASED; urgency=low
 
-  [Julien Cristau]
+  [ Julien Cristau ]
   * New upstream release.
     + Better escaping in ocamldoc-generated manpages (Closes: #301046).
     + Fixed ocamldoc.1 (Closes: #304360).
@@ -9,15 +9,19 @@
 
  -- Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>  Wed, 31 Aug 2005 22:45:57 +0200
 
-ocaml (3.08.3-8) UNRELEASED; urgency=low
+ocaml (3.08.3-9) unstable; urgency=low
 
-  Changes by Stefano Zacchiroli:
-  * debian/rules
-    - remove spurious CVS directories from labltk examples
-      (Closes: Bug#322712)
-  
+  [ Changes by Samuel Mimram ]
+  * debian/patches/map_fold_order.dpatch: added a patch to make Map.fold order
+    conform to the specification (Closes: #327211)
+
+ -- Samuel Mimram <smimram at debian.org>  Thu,  8 Sep 2005 20:45:08 +0200
+
+ocaml (3.08.3-8) unstable; urgency=low
+
   Changes by Jérôme Marant:
   * Create a new `ocaml-mode' package dedicated at Emacs-related files
+    (Closes: Bug#312618, Bug#322210)
   * debian/control:
     - Add new ocaml-mode package section
     - [ocaml-nox]
@@ -40,18 +44,57 @@
       package
     - Mention that all previous emacs conffiles are renamed in order
       not to mess with the new ocaml-mode
+  * debian/ocaml-mode.README.Debian:
+    - New file
+    - Explain how to override tuareg-mode in case both modes are
+      installed
 
   * debian/changelog: Remove spurious changelog entry
 
-  * Move ocaml-md5sum from a dpatch to a debian subdirectory
+  * Move ocaml-md5sums from a dpatch to a debian subdirectory
   * debian/patches/ocaml-md5sums.dpatch: Remove file
   * debian/patches/00list: Remove ocaml-md5sums entry
   * debian/ocaml-md5sums/{configure,feeding.sh,Makefile,ocaml-md5sums.ml.in}:
     - New files
-  * debian/rules: Update ocaml-md5sum files location accordingly
-  
- -- Jerome Marant <jerome at debian.org>  Sat, 20 Aug 2005 13:34:52 +0200
+  * debian/rules: Update ocaml-md5sums files location accordingly
 
+  * Move ocaml-nox menu file to ocaml-interp since the toplevel
+    is provided by ocaml-interp
+  * debian/ocaml-interp.menu:
+    - New file renamed from ocaml-nox.menu
+    - Change 'ocaml' to 'ocaml-interp' in the required package for
+      the menu to be displayed 
+  * debian/ocaml-interp.dirs: Add pixmaps directory
+  * debian/ocaml-nox.dirs: Remove pixmaps directory
+
+  * Move xpm files away from the /usr/X11R6 deprecated directory
+    hierarchy to /usr/share/pixmaps, as per Policy (11.8.7)
+  * debian/rules: install JoeCaml.xpm in /usr/share/pixmaps within the
+    ocaml-interp package
+  * debian/ocaml-interp.menu: Change pixmap location
+
+  * Really install menu files
+  * debian/rules: uncomment dh_installmenu in the build-common target
+
+  * debian/ocaml-nox.preinst: Remove bashism
+
+  * Add dependencies on gcc and binutils for all interpreters since
+    OCaml compilers may use of them (Closes: Bug#322722)
+  * debian/control:
+    - [ocaml-nox]: Add dependency on both gcc and binutils
+    - [ocaml-native-compilers]: Likewise
+
+  Changes by Stefano Zacchiroli:
+  * debian/rules
+    - remove spurious CVS directories from labltk examples
+      (Closes: Bug#322712)
+  * debian/ocamlfind/ocaml-native-compilers.conf
+    - gets installed under /usr/share/ocaml-findlib/ so that, if
+      ocamlfind is available, compiling with findlib will use the
+      native compilers
+
+ -- Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>  Thu, 08 Sep 2005 12:46:36 +0200
+
 ocaml (3.08.3-7) unstable; urgency=low
 
   Changes by Sven Luther:

Modified: trunk/packages/ocaml/branches/3.08.4/debian/control
===================================================================
--- trunk/packages/ocaml/branches/3.08.4/debian/control	2005-09-22 20:13:07 UTC (rev 1791)
+++ trunk/packages/ocaml/branches/3.08.4/debian/control	2005-09-27 16:51:26 UTC (rev 1792)
@@ -8,7 +8,7 @@
 
 Package: ocaml-nox
 Architecture: any
-Depends: libncurses5-dev, ocaml-base-nox (=${Source-Version}), ocaml-base-nox-3.08.4, ocaml-interp-3.08.4
+Depends: libncurses5-dev, ocaml-base-nox (=${Source-Version}), ocaml-base-nox-3.08.4, ocaml-interp-3.08.4, gcc, binutils
 Suggests: ocaml-doc, libgdbm-dev, tuareg-mode | ocaml-mode
 Recommends: ledit, file
 Provides: ocaml-nox-3.08.4 ${F:BestProvides}, libnums-ocaml-dev
@@ -96,7 +96,7 @@
 
 Package: ocaml-native-compilers
 Architecture: alpha amd64 arm hppa i386 ia64 powerpc sparc
-Depends: ocaml-nox (= ${Source-Version}), ocaml-nox-3.08.4, ${shlibs:Depends}
+Depends: ocaml-nox (= ${Source-Version}), ocaml-nox-3.08.4, gcc, binutils, ${shlibs:Depends}
 Provides: ocaml-best-compilers
 Description: Native code compilers of the ocaml suite (the .opt ones)
  Objective Caml is an implementation of the ML language, based on

Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-interp.dirs
===================================================================
--- trunk/packages/ocaml/branches/3.08.4/debian/ocaml-interp.dirs	2005-09-22 20:13:07 UTC (rev 1791)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-interp.dirs	2005-09-27 16:51:26 UTC (rev 1792)
@@ -1,3 +1,4 @@
 usr/bin
 usr/share/man/man1
 usr/lib/ocaml/3.08.4
+usr/share/pixmaps

Copied: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-interp.menu (from rev 1791, trunk/packages/ocaml/trunk/debian/ocaml-interp.menu)

Copied: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-mode.README.Debian (from rev 1791, trunk/packages/ocaml/trunk/debian/ocaml-mode.README.Debian)

Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-native-compilers.dirs
===================================================================
--- trunk/packages/ocaml/branches/3.08.4/debian/ocaml-native-compilers.dirs	2005-09-22 20:13:07 UTC (rev 1791)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-native-compilers.dirs	2005-09-27 16:51:26 UTC (rev 1792)
@@ -1,2 +1,3 @@
 usr/bin
 usr/share/man/man1
+usr/share/ocaml-findlib

Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.dirs
===================================================================
--- trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.dirs	2005-09-22 20:13:07 UTC (rev 1791)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.dirs	2005-09-27 16:51:26 UTC (rev 1792)
@@ -5,5 +5,4 @@
 usr/share/man/man1
 usr/share/man/man3
 usr/share/texmf/tex/latex/misc
-usr/X11R6/include/X11/pixmaps
 usr/share/lintian/overrides

Deleted: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.menu
===================================================================
--- trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.menu	2005-09-22 20:13:07 UTC (rev 1791)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.menu	2005-09-27 16:51:26 UTC (rev 1792)
@@ -1,5 +0,0 @@
-?package(ocaml):needs="text" section="Apps/Programming" \
-	title="Ocaml" longtitle="Ocaml Toplevel" \
-	hints="ocaml" \
-	command="/usr/bin/ocaml" \
-	icon="/usr/X11R6/include/X11/pixmaps/JoeCaml.xpm"

Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.postinst
===================================================================
--- trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.postinst	2005-09-22 20:13:07 UTC (rev 1791)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.postinst	2005-09-27 16:51:26 UTC (rev 1792)
@@ -12,7 +12,9 @@
   # Save Emacs conffiles from previous ocaml versions
   for f in ocaml ocaml-nox ; do
     file="/etc/emacs/site-start.d/50$f.el"
-    [ -e "$file" ] && mv "$file" "$file.save"
+    if [ -e "$file" ]; then
+      mv "$file" "$file.save"
+    fi
   done
 fi
 

Copied: trunk/packages/ocaml/branches/3.08.4/debian/ocamlfind (from rev 1791, trunk/packages/ocaml/trunk/debian/ocamlfind)

Modified: trunk/packages/ocaml/branches/3.08.4/debian/rules
===================================================================
--- trunk/packages/ocaml/branches/3.08.4/debian/rules	2005-09-22 20:13:07 UTC (rev 1791)
+++ trunk/packages/ocaml/branches/3.08.4/debian/rules	2005-09-27 16:51:26 UTC (rev 1792)
@@ -143,7 +143,7 @@
 	# Let's install ocaml first.
 	$(MAKE) install PREFIX=$(CURDIR)/debian/ocaml-nox/usr
 	install -m 644 debian/JoeCaml.xpm \
-		$(CURDIR)/debian/ocaml-nox/usr/X11R6/include/X11/pixmaps
+		$(CURDIR)/debian/ocaml-interp/usr/share/pixmaps
 	install -m 644 debian/ocaml-nox.override \
 		$(CURDIR)/debian/ocaml-nox/usr/share/lintian/overrides/ocaml-nox
 	install -m 644 debian/ocaml-base.override \
@@ -176,6 +176,8 @@
 	if [ -e opt-built-stamp ]; then					\
 		dh_movefiles -pocaml-native-compilers			\
 			--sourcedir=debian/ocaml-nox;			\
+		cp debian/ocamlfind/ocaml-native-compilers.conf		\
+			debian/ocaml-native-compilers/usr/share/ocaml-findlib/;	\
 	fi
 
 	# The interpreter files
@@ -215,9 +217,10 @@
 	dh_testroot
 	dh_installchangelogs Changes
 	dh_installdocs
-	-find debian/ocaml/ -type d -name CVS -exec rm -rf {} \;
+	-find debian/ocaml -type d -name CVS -exec rm -rf {} \;
+	-find debian/ocaml -type f -name .cvsignore -exec rm -rf {} \;
 	dh_installexamples
-#	dh_installmenu
+	dh_installmenu
 #	dh_installdebconf	
 #	dh_installlogrotate	
 	dh_installemacsen


