[Pkg-ocaml-maint-commits] r2836 - in /trunk/packages/ocaml/trunk/debian: ./ policy/

smimram at users.alioth.debian.org smimram at users.alioth.debian.org
Fri Jun 16 11:11:25 UTC 2006 

Author: smimram
Date: Fri Jun 16 11:11:23 2006
New Revision: 2836

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2836
Log:
Put symlinks in packages.

Added:
    trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst
      - copied, changed from r2831, trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst.in
Removed:
    trunk/packages/ocaml/trunk/debian/ocaml-base.postinst
    trunk/packages/ocaml/trunk/debian/ocaml-base.prerm
    trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.postinst
    trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.prerm
    trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst.in
    trunk/packages/ocaml/trunk/debian/ocaml-nox.prerm
    trunk/packages/ocaml/trunk/debian/ocaml.prerm
Modified:
    trunk/packages/ocaml/trunk/debian/changelog
    trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs
    trunk/packages/ocaml/trunk/debian/ocaml-base.dirs.in
    trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.files
    trunk/packages/ocaml/trunk/debian/ocaml-nox.dirs.in
    trunk/packages/ocaml/trunk/debian/ocaml.dirs.in
    trunk/packages/ocaml/trunk/debian/ocaml.postinst
    trunk/packages/ocaml/trunk/debian/policy/Makefile
    trunk/packages/ocaml/trunk/debian/rules

Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=2836&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Fri Jun 16 11:11:23 2006
@@ -7,9 +7,11 @@
   [ Samuel Mimram ]
   * Integrate the ocaml policy in the package. Added a build dependency on
     docbook-utils to build it.
+  * Put the symbolic links directly in the packages instead of using postinst.
+  * Put forgotten ocamldep.opt in ocaml-native-compilers.
   * We don't need to remove rpaths anymore.
 
- -- Samuel Mimram <smimram at debian.org>  Thu, 15 Jun 2006 12:26:19 +0000
+ -- Samuel Mimram <smimram at debian.org>  Fri, 16 Jun 2006 09:11:02 +0000
 
 ocaml (3.09.2-3) unstable; urgency=low
 

Modified: trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs?rev=2836&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs Fri Jun 16 11:11:23 2006
@@ -1,4 +1,4 @@
 Changes
 README
-debian/policy/ocaml_packaging_policy.txt
-debian/policy/packaging-policy-html
+debian/policy/ocaml_packaging_policy
+debian/policy/ocaml_packaging_policy-html

Modified: trunk/packages/ocaml/trunk/debian/ocaml-base.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-base.dirs.in?rev=2836&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base.dirs.in (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-base.dirs.in Fri Jun 16 11:11:23 2006
@@ -1,1 +1,2 @@
 usr/lib/ocaml/#OcamlABI#/stublibs
+usr/share/doc/ocaml-base

Modified: trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.files
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.files?rev=2836&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.files (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-native-compilers.files Fri Jun 16 11:11:23 2006
@@ -4,3 +4,4 @@
 /usr/bin/camlp4o.opt
 /usr/bin/camlp4r.opt
 /usr/bin/ocamldoc.opt
+/usr/bin/ocamldep.opt

Modified: trunk/packages/ocaml/trunk/debian/ocaml-nox.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-nox.dirs.in?rev=2836&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.dirs.in (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.dirs.in Fri Jun 16 11:11:23 2006
@@ -1,7 +1,9 @@
 usr/bin
 usr/lib/ocaml/#OcamlABI#
 usr/lib/ocaml/#OcamlABI#/config
+usr/include
 usr/include/ocaml/#OcamlABI#
+usr/share/doc/ocaml-nox
 usr/share/man/man1
 usr/share/man/man3
 usr/share/texmf/tex/latex/misc

Copied: trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst (from r2831, trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst.in)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst?rev=2836&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst.in (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst Fri Jun 16 11:11:23 2006
@@ -1,11 +1,4 @@
 #!/bin/sh -e
-
-ln -sf /usr/lib/ocaml/#OcamlABI#/caml /usr/include/caml
-
-ln -sf ../ocaml-base-nox/Changes.gz /usr/share/doc/ocaml-nox
-ln -sf ../ocaml-base-nox/README.gz /usr/share/doc/ocaml-nox
-ln -sf ../ocaml-base-nox/ocaml_packaging_policy.txt.gz /usr/share/doc/ocaml-nox
-ln -sf ../ocaml-base-nox/packaging-policy-html /usr/share/doc/ocaml-nox
 
 if [ "$1" = "configure" ]; then
   ocaml-md5sums update

Modified: trunk/packages/ocaml/trunk/debian/ocaml.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml.dirs.in?rev=2836&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml.dirs.in (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml.dirs.in Fri Jun 16 11:11:23 2006
@@ -1,2 +1,3 @@
 usr/bin
 usr/lib/ocaml/#OcamlABI#
+usr/share/doc/ocaml

Modified: trunk/packages/ocaml/trunk/debian/ocaml.postinst
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml.postinst?rev=2836&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml.postinst (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml.postinst Fri Jun 16 11:11:23 2006
@@ -1,10 +1,4 @@
 #!/bin/sh -e
-
-ln -sf ../ocaml-base-nox/Changes.gz /usr/share/doc/ocaml
-ln -sf ../ocaml-base-nox/README.gz /usr/share/doc/ocaml
-ln -sf ../ocaml-base-nox/README.Debian /usr/share/doc/ocaml
-ln -sf ../ocaml-base-nox/ocaml_packaging_policy.txt.gz /usr/share/doc/ocaml
-ln -sf ../ocaml-base-nox/packaging-policy-html /usr/share/doc/ocaml
 
 if [ "$1" = "configure" ]; then
   ocaml-md5sums update

Modified: trunk/packages/ocaml/trunk/debian/policy/Makefile
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/policy/Makefile?rev=2836&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/policy/Makefile (original)
+++ trunk/packages/ocaml/trunk/debian/policy/Makefile Fri Jun 16 11:11:23 2006
@@ -1,12 +1,13 @@
 all: html text
 
 html:
-	docbook2html ocaml_packaging_policy.xml -o packaging-policy-html
+	docbook2html ocaml_packaging_policy.xml -o ocaml_packaging_policy-html
 
 text:
 	docbook2txt ocaml_packaging_policy.xml
+	mv ocaml_packaging_policy.txt ocaml_packaging_policy
 
 clean:
-	$(RM) -rf packaging-policy-html ocaml_packaging_policy.txt
+	$(RM) -rf ocaml_packaging_policy-html ocaml_packaging_policy
 
 .PHONY: html text

Modified: trunk/packages/ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/rules?rev=2836&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/rules (original)
+++ trunk/packages/ocaml/trunk/debian/rules Fri Jun 16 11:11:23 2006
@@ -153,8 +153,7 @@
 	fi
 	$(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-mode/usr/bin install-ocamltags
 
-	# Add here commands to install the indep part of the package into
-	# debian/<package>-doc.
+	# Build the archive for ocaml-source
 	for i in `cat debian/ocaml-source.files`; do			\
 		install -m 644 -D $$i					\
 		debian/ocaml-source/usr/src/ocaml-$(OCAMLABI)/$$i;	\
@@ -170,10 +169,6 @@
 	dh_testroot
 	dh_clean -k -a
 	dh_installdirs -a
-
-	# Add here commands to install the arch part of the package into
-	# debian/tmp.
-	#$(MAKE) install prefix=$(CURDIR)/debian/ocaml/usr
 
 	# Let's install ocaml first.
 	$(MAKE) install PREFIX=$(CURDIR)/debian/ocaml-nox/usr
@@ -187,10 +182,11 @@
 		$(CURDIR)/debian/README.labltk
 	install -m 644 config/Makefile \
 		$(CURDIR)/debian/ocaml-nox/usr/lib/ocaml/$(OCAMLABI)/config/Makefile
-	# install the list of archs with ocamlopt
+
+	# Install the list of archs with ocamlopt
 	install -m 644 debian/native-archs $(CURDIR)/debian/ocaml-nox$(STDLIBDIR)
 
-	# now move the graphics files over
+	# Now move the graphics files over
 	if [ -e opt-built-stamp ]; then					\
 		dh_movefiles -pocaml					\
 			--sourcedir=debian/ocaml-nox			\
@@ -200,13 +196,12 @@
 			--sourcedir=debian/ocaml-nox;			\
 	fi
 
-
 	# Then move the ocaml-base-nox package.
 	dh_movefiles -pocaml-base-nox --sourcedir=debian/ocaml-nox
 	install -m 644 debian/ld.conf \
 		$(CURDIR)/debian/ocaml-base-nox/usr/lib/ocaml/$(OCAMLABI)
 
-	# and base's corresponding graphics stuff.
+	# And base's corresponding graphics stuff.
 	dh_movefiles -pocaml-base --sourcedir=debian/ocaml-nox
 
 	# The ocaml-native-compilers, if available.
@@ -218,8 +213,7 @@
 	fi
 
 	# The interpreter files
-	dh_movefiles -pocaml-interp					\
-			--sourcedir=debian/ocaml-nox
+	dh_movefiles -pocaml-interp --sourcedir=debian/ocaml-nox
 
 	# Some extra stuff
 	install -m 644 utils/*.mli utils/*.cmi utils/*.cmo		\
@@ -243,6 +237,38 @@
 		./feeding.sh $$pkg $(STDLIBDIR) $(OCAMLABI) ../$$pkg$(STDLIBDIR) >	\
 			../$$pkg$(MD5SUMSDIR)/$$pkg.md5sums;				\
 	 done)
+
+	# Remove .opt manpages from ocaml-nox
+	rm -f $(wildcard debian/ocaml-nox/usr/share/man/man1/*.opt.1) $(wildcard debian/ocaml-nox/usr/share/man/man1/*.opt.1.gz)
+
+	# make some symbolic links
+	cd debian/ocaml-nox/usr/include; ln -sf /usr/lib/ocaml/$(ocamlabi)/caml .
+	cd debian/ocaml-native-compilers/usr/share/man/man1; \
+		ln -sf /usr/share/man/man1/ocamlc.1.gz ocamlc.opt.1.gz; \
+		ln -sf /usr/share/man/man1/ocamlopt.1.gz ocamlopt.opt.1.gz; \
+		ln -sf /usr/share/man/man1/ocamllex.1.gz ocamllex.opt.1.gz; \
+		ln -sf /usr/share/man/man1/ocamldoc.1.gz ocamldoc.opt.1.gz; \
+		ln -sf /usr/share/man/man1/ocamldep.1.gz ocamldep.opt.1.gz; \
+		ln -sf /usr/share/man/man1/camlp4r.1.gz camlp4r.opt.1.gz; \
+		ln -sf /usr/share/man/man1/camlp4o.1.gz camlp4o.opt.1.gz
+	cd debian/ocaml/usr/share/doc/ocaml; \
+		ln -sf ../ocaml-base-nox/changes.gz .; \
+		ln -sf ../ocaml-base-nox/readme.gz .; \
+		ln -sf ../ocaml-base-nox/readme.debian .; \
+		ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz .; \
+		ln -sf ../ocaml-base-nox/ocaml_packaging_policy-html .
+	cd debian/ocaml-nox/usr/share/doc/ocaml-nox; \
+		ln -sf ../ocaml-base-nox/changes.gz .; \
+		ln -sf ../ocaml-base-nox/readme.gz .; \
+		ln -sf ../ocaml-base-nox/readme.debian .; \
+		ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz .; \
+		ln -sf ../ocaml-base-nox/ocaml_packaging_policy-html .
+	cd debian/ocaml-base/usr/share/doc/ocaml-base; \
+		ln -sf ../ocaml-base-nox/changes.gz .; \
+		ln -sf ../ocaml-base-nox/readme.gz .; \
+		ln -sf ../ocaml-base-nox/readme.debian .; \
+		ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz .; \
+		ln -sf ../ocaml-base-nox/ocaml_packaging_policy-html .
 
 	dh_install -a

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