From: Jerome Marant Date: Sat, 3 Sep 2005 16:15:39 +0000 (+0000) Subject: * Change pixmaps location to /usr/share/pixmaps X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~731 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f717817d3cb91a573415c7724b63382b06c93dbc;p=ocaml.git * Change pixmaps location to /usr/share/pixmaps * Move menu entry to ocaml-interp package * Remove bashism from ocaml-nox preint script * Fix previous changes to ocaml-nox postinst * Close bug for emacs-related changes --- diff --git a/debian/changelog b/debian/changelog index 17ad7022..c38ca0ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ocaml (3.08.3-8) UNRELEASED; 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] @@ -38,6 +39,26 @@ ocaml (3.08.3-8) UNRELEASED; urgency=low - 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,8 +67,8 @@ ocaml (3.08.3-8) UNRELEASED; urgency=low - gets installed under /usr/share/ocaml-findlib/ so that, if ocamlfind is available, compiling with findlib will use the native compilers - - -- + + -- Jerome Marant Sat, 3 Sep 2005 12:16:52 +0200 ocaml (3.08.3-7) unstable; urgency=low diff --git a/debian/ocaml-interp.dirs b/debian/ocaml-interp.dirs index 3e8d2161..fc9aa3d5 100644 --- a/debian/ocaml-interp.dirs +++ b/debian/ocaml-interp.dirs @@ -1,3 +1,4 @@ usr/bin usr/share/man/man1 usr/lib/ocaml/3.08.3 +usr/share/pixmaps diff --git a/debian/ocaml-interp.menu b/debian/ocaml-interp.menu new file mode 100644 index 00000000..86d6d3fc --- /dev/null +++ b/debian/ocaml-interp.menu @@ -0,0 +1,5 @@ +?package(ocaml-interp):needs="text" section="Apps/Programming" \ + title="Ocaml" longtitle="Ocaml Toplevel" \ + hints="ocaml" \ + command="/usr/bin/ocaml" \ + icon="/usr/share/pixmaps/JoeCaml.xpm" diff --git a/debian/ocaml-nox.dirs b/debian/ocaml-nox.dirs index 18bef22a..c9b390ed 100644 --- a/debian/ocaml-nox.dirs +++ b/debian/ocaml-nox.dirs @@ -5,5 +5,4 @@ usr/include/ocaml/3.08.3 usr/share/man/man1 usr/share/man/man3 usr/share/texmf/tex/latex/misc -usr/X11R6/include/X11/pixmaps usr/share/lintian/overrides diff --git a/debian/ocaml-nox.menu b/debian/ocaml-nox.menu deleted file mode 100644 index c0ced931..00000000 --- a/debian/ocaml-nox.menu +++ /dev/null @@ -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" diff --git a/debian/ocaml-nox.postinst b/debian/ocaml-nox.postinst index 56bef73b..b3ef12b7 100644 --- a/debian/ocaml-nox.postinst +++ b/debian/ocaml-nox.postinst @@ -12,7 +12,9 @@ if [ "$1" = "configure" ]; then # 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 diff --git a/debian/ocaml-nox.preinst b/debian/ocaml-nox.preinst index b6c08688..49819b32 100644 --- a/debian/ocaml-nox.preinst +++ b/debian/ocaml-nox.preinst @@ -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 diff --git a/debian/rules b/debian/rules index ad6e676b..c219e574 100755 --- a/debian/rules +++ b/debian/rules @@ -143,7 +143,7 @@ install-arch: # 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 @@ binary-common: 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