[Pkg-ocaml-maint-commits] r1735 - trunk/packages/ocaml/trunk/debian
Jerome Marant
jerome at costa.debian.org
Sat Sep 3 16:15:41 UTC 2005
Author: jerome
Date: 2005-09-03 16:15:39 +0000 (Sat, 03 Sep 2005)
New Revision: 1735
Added:
trunk/packages/ocaml/trunk/debian/ocaml-interp.menu
Removed:
trunk/packages/ocaml/trunk/debian/ocaml-nox.menu
Modified:
trunk/packages/ocaml/trunk/debian/changelog
trunk/packages/ocaml/trunk/debian/ocaml-interp.dirs
trunk/packages/ocaml/trunk/debian/ocaml-nox.dirs
trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst
trunk/packages/ocaml/trunk/debian/ocaml-nox.preinst
trunk/packages/ocaml/trunk/debian/rules
Log:
* 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
Modified: trunk/packages/ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog 2005-09-03 09:45:27 UTC (rev 1734)
+++ trunk/packages/ocaml/trunk/debian/changelog 2005-09-03 16:15:39 UTC (rev 1735)
@@ -2,6 +2,7 @@
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 @@
- 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 +67,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 at debian.org> Sat, 3 Sep 2005 12:16:52 +0200
+
ocaml (3.08.3-7) unstable; urgency=low
Changes by Sven Luther:
Modified: trunk/packages/ocaml/trunk/debian/ocaml-interp.dirs
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-interp.dirs 2005-09-03 09:45:27 UTC (rev 1734)
+++ trunk/packages/ocaml/trunk/debian/ocaml-interp.dirs 2005-09-03 16:15:39 UTC (rev 1735)
@@ -1,3 +1,4 @@
usr/bin
usr/share/man/man1
usr/lib/ocaml/3.08.3
+usr/share/pixmaps
Copied: trunk/packages/ocaml/trunk/debian/ocaml-interp.menu (from rev 1732, trunk/packages/ocaml/trunk/debian/ocaml-nox.menu)
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.menu 2005-09-02 23:05:44 UTC (rev 1732)
+++ trunk/packages/ocaml/trunk/debian/ocaml-interp.menu 2005-09-03 16:15:39 UTC (rev 1735)
@@ -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"
Modified: trunk/packages/ocaml/trunk/debian/ocaml-nox.dirs
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.dirs 2005-09-03 09:45:27 UTC (rev 1734)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.dirs 2005-09-03 16:15:39 UTC (rev 1735)
@@ -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/trunk/debian/ocaml-nox.menu
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.menu 2005-09-03 09:45:27 UTC (rev 1734)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.menu 2005-09-03 16:15:39 UTC (rev 1735)
@@ -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/trunk/debian/ocaml-nox.postinst
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst 2005-09-03 09:45:27 UTC (rev 1734)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst 2005-09-03 16:15:39 UTC (rev 1735)
@@ -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
Modified: trunk/packages/ocaml/trunk/debian/ocaml-nox.preinst
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.preinst 2005-09-03 09:45:27 UTC (rev 1734)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.preinst 2005-09-03 16:15:39 UTC (rev 1735)
@@ -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
Modified: trunk/packages/ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml/trunk/debian/rules 2005-09-03 09:45:27 UTC (rev 1734)
+++ trunk/packages/ocaml/trunk/debian/rules 2005-09-03 16:15:39 UTC (rev 1735)
@@ -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
More information about the Pkg-ocaml-maint-commits
mailing list