[Pkg-ocaml-maint-commits] r3693 - in /trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian: changelog ocaml-base-nox.install.in ocaml-compiler-libs.install.in ocaml-interp.install.in ocaml-nox.install ocaml-nox.install.in ocaml.docs ocaml.install.in rules

zack at users.alioth.debian.org zack at users.alioth.debian.org
Sat Apr 14 18:23:15 UTC 2007 

Author: zack
Date: Sat Apr 14 18:23:15 2007
New Revision: 3693

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3693
Log:
delegated more stuff to dh_install

Added:
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-base-nox.install.in
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-compiler-libs.install.in
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-interp.install.in
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-nox.install.in
      - copied, changed from r3686, trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-nox.install
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml.install.in
Removed:
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-nox.install
Modified:
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/changelog
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml.docs
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/rules

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/changelog?rev=3693&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/changelog (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/changelog Sat Apr 14 18:23:15 2007
@@ -18,19 +18,21 @@
   * Policy
     - mandate the compilation of *.cm[ao] with debugging information for
       libraries and forbid it for bytecode programs
-  
+  * debian/rules
+    - delegated more installation stuff to dh_install
+
   [Ralf Treinen]
   * debian/patches/*
     - added: install_scripts_config: use a patched config.sh since PREFIX is
       diferent at compile time and at installation time
-    - added: ocaml-interp_manpage, fixes typo in ocaml manpage 
+    - added: ocaml-interp_manpage, fixes typo in ocaml manpage
       (closes: Bug#417847).
   * debian/rules:
     - added creation of config/config.debian.install
     - Patch LIBDIR and STBLIBDIR setting in config/Makefile after invokation
       of configure
 
- -- Ralf Treinen <treinen at debian.org>  Wed, 11 Apr 2007 16:37:21 +0200
+ -- Stefano Zacchiroli <zack at debian.org>  Sat, 14 Apr 2007 20:22:15 +0200
 
 ocaml (3.09.3-1) experimental; urgency=low
 

Added: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-base-nox.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/ocaml-base-nox.install.in?rev=3693&op=file
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-base-nox.install.in (added)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-base-nox.install.in Sat Apr 14 18:23:15 2007
@@ -1,0 +1,1 @@
+debian/ld.conf		/usr/lib/ocaml/#OcamlABI#/

Added: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-compiler-libs.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/ocaml-compiler-libs.install.in?rev=3693&op=file
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-compiler-libs.install.in (added)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-compiler-libs.install.in Sat Apr 14 18:23:15 2007
@@ -1,0 +1,4 @@
+debian/ocaml-compiler-libs.override	/usr/share/lintian/overrides/ocaml-compiler-libs
+parsing/*				/usr/lib/ocaml/#OcamlABI#/compiler-libs/
+typing/*				/usr/lib/ocaml/#OcamlABI#/compiler-libs/
+utils/*					/usr/lib/ocaml/#OcamlABI#/compiler-libs/

Added: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-interp.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/ocaml-interp.install.in?rev=3693&op=file
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-interp.install.in (added)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-interp.install.in Sat Apr 14 18:23:15 2007
@@ -1,0 +1,1 @@
+debian/ocaml.xpm	/usr/share/pixmaps

Copied: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-nox.install.in (from r3686, trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-nox.install)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/ocaml-nox.install.in?rev=3693&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-nox.install (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml-nox.install.in Sat Apr 14 18:23:15 2007
@@ -1,1 +1,4 @@
 debian/cdbs/*.mk                /usr/share/cdbs/1/class/
+debian/ocaml-nox.override	/usr/share/lintian/overrides/ocaml-nox
+config/Makefile			/usr/lib/ocaml/#OcamlABI#/config/Makefile
+debian/native-archs		/usr/lib/ocaml/#OcamlABI#/

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/ocaml.docs?rev=3693&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml.docs (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml.docs Sat Apr 14 18:23:15 2007
@@ -1,2 +1,1 @@
-debian/README.labltk
 otherlibs/labltk/examples_labltk

Added: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/ocaml.install.in?rev=3693&op=file
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml.install.in (added)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/ocaml.install.in Sat Apr 14 18:23:15 2007
@@ -1,0 +1,1 @@
+otherlibs/labltk/README		/usr/share/doc/ocaml/README.labltk

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/rules?rev=3693&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/rules (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/rules Sat Apr 14 18:23:15 2007
@@ -13,6 +13,7 @@
 OCAMLABI = $(OCAMLMAJOR).$(OCAMLMINOR)
 STDLIBDIR = /usr/lib/ocaml/$(OCAMLABI)
 MD5SUMSDIR = /var/lib/ocaml/md5sums
+INSTDIR = $(CURDIR)/debian/ocaml-nox/usr
 
 NATIVE_ARCHS = $(shell cat debian/native-archs)
 
@@ -175,21 +176,8 @@
 	dh_installdirs -a
 
 	# Let's install ocaml first.
-	sed -e 's|PREFIX=\"/.*\"|PREFIX=\"$(CURDIR)/debian/usr\"|' < config/config.sh > config/config.debian.install.sh
-	$(MAKE) install PREFIX=$(CURDIR)/debian/ocaml-nox/usr
-	install -m 644 debian/ocaml.xpm \
-		$(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-compiler-libs.override \
-		$(CURDIR)/debian/ocaml-compiler-libs/usr/share/lintian/overrides/ocaml-compiler-libs
-	install -m 644 otherlibs/labltk/README \
-		$(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 -m 644 debian/native-archs $(CURDIR)/debian/ocaml-nox$(STDLIBDIR)
+	sed -e 's|PREFIX=\"/.*\"|PREFIX=\"$(INSTDIR)"|' < config/config.sh > config/config.debian.install.sh
+	$(MAKE) install PREFIX=$(INSTDIR)
 
 	# Now move the graphics files over
 	if [ -e opt-built-stamp ]; then					\
@@ -203,8 +191,6 @@
 
 	# 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.
 	dh_movefiles -pocaml-base --sourcedir=debian/ocaml-nox
@@ -219,17 +205,6 @@
 
 	# The interpreter files
 	dh_movefiles -pocaml-interp --sourcedir=debian/ocaml-nox
-
-	# Some extra stuff
-	install -m 644 utils/*.mli utils/*.cmi utils/*.cmo		\
-		typing/*.mli typing/*.cmi typing/*.cmo			\
-		parsing/*.mli parsing/*.cmi parsing/*.cmo		\
-		$(CURDIR)/debian/ocaml-compiler-libs/usr/lib/ocaml/$(OCAMLABI)/compiler-libs
-	if [ -e opt-built-stamp ]; then					\
-		install -m 644 utils/*.cmx utils/*.o typing/*.cmx	\
-			typing/*.o parsing/*.cmx parsing/*.o		\
-			$(CURDIR)/debian/ocaml-compiler-libs/usr/lib/ocaml/$(OCAMLABI)/compiler-libs; \
-	fi
 
 	# Install ocaml-md5sums
 	$(MAKE) -C debian/ocaml-md5sums install DESTDIR=$(CURDIR)/debian/ocaml-base-nox/usr/bin

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