New changes
Hi,
Here are my last changes. If noone objects, I'll commit them.
Cheers,
Index: ocaml-nox.preinst
===================================================================
--- ocaml-nox.preinst (révision 1732)
+++ ocaml-nox.preinst (copie de travail)
@@ -1,6 +1,6 @@
#!/bin/sh -e
-if [ ! -h /usr/include/caml -a -e /usr/include/caml ]; then
+if [ ! -h /usr/include/caml ] && [ -e /usr/include/caml ]; then
echo "WARNING, /usr/include/caml is not a symlink !!!!"
fi
Index: ocaml-interp.menu
===================================================================
--- ocaml-interp.menu (révision 1732)
+++ ocaml-interp.menu (copie de travail)
@@ -1,5 +1,5 @@
-?package(ocaml):needs="text" section="Apps/Programming" \
+?package(ocaml-interp):needs="text" section="Apps/Programming" \
title="Ocaml" longtitle="Ocaml Toplevel" \
hints="ocaml" \
command="/usr/bin/ocaml" \
- icon="/usr/X11R6/include/X11/pixmaps/JoeCaml.xpm"
+ icon="/usr/share/pixmaps/JoeCaml.xpm"
Index: ocaml-nox.menu
===================================================================
--- ocaml-nox.menu (révision 1732)
+++ ocaml-nox.menu (copie de travail)
@@ -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"
Index: changelog
===================================================================
--- changelog (révision 1734)
+++ changelog (copie de travail)
@@ -38,6 +38,26 @@
- New files
* 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
+
Changes by Stefano Zacchiroli:
* debian/rules
- remove spurious CVS directories from labltk examples
@@ -46,9 +66,9 @@
- gets installed under /usr/share/ocaml-findlib/ so that, if
ocamlfind is available, compiling with findlib will use the
native compilers
-
- --
+ -- Jerome Marant <jerome@debian.org> Sat, 3 Sep 2005 12:16:52 +0200
+
ocaml (3.08.3-7) unstable; urgency=low
Changes by Sven Luther:
Index: ocaml-interp.dirs
===================================================================
--- ocaml-interp.dirs (révision 1732)
+++ ocaml-interp.dirs (copie de travail)
@@ -1,3 +1,4 @@
usr/bin
usr/share/man/man1
usr/lib/ocaml/3.08.3
+usr/share/pixmaps
Index: rules
===================================================================
--- rules (révision 1732)
+++ rules (copie de travail)
@@ -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 \
@@ -217,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
Index: ocaml-nox.dirs
===================================================================
--- ocaml-nox.dirs (révision 1732)
+++ ocaml-nox.dirs (copie de travail)
@@ -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
--
Jérôme Marant
Reply to: