Author: zack Date: Wed Jun 13 15:19:00 2007 New Revision: 3824 URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3824 Log: - re-enabled building of the ocaml-source package - as a side effect noticed that some changes were done on debian/control insted of debian/control.in, fixed those
Added: trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.dirs.in trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.exclude trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.install.in Modified: trunk/packages/ocaml/branches/ocaml-3.10.0/debian/changelog trunk/packages/ocaml/branches/ocaml-3.10.0/debian/control trunk/packages/ocaml/branches/ocaml-3.10.0/debian/control.in trunk/packages/ocaml/branches/ocaml-3.10.0/debian/rules Modified: trunk/packages/ocaml/branches/ocaml-3.10.0/debian/changelog URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0/debian/changelog?rev=3824&op=diff ============================================================================== --- trunk/packages/ocaml/branches/ocaml-3.10.0/debian/changelog (original) +++ trunk/packages/ocaml/branches/ocaml-3.10.0/debian/changelog Wed Jun 13 15:19:00 2007 @@ -2,13 +2,20 @@ [ Stefano Zacchiroli ] * New upstream (stable) release - * ship ocaml-compiler-libs objects as STDLIB/ocaml-compiler-libs/{parsing/, - typing/, utils/} rather than as a flat dir tree * debian/patches/* - removed: ocaml-interp_manpage, build_wo_debug_info (integrated upstream) - updated: install_ocamlbuild - - -- Stefano Zacchiroli <[EMAIL PROTECTED]> Wed, 13 Jun 2007 16:15:14 +0200 + * ship ocaml-compiler-libs objects as STDLIB/ocaml-compiler-libs/{parsing/, + typing/, utils/} rather than as a flat dir tree + * re-enabled ocaml-source package (which ships + /usr/src/ocaml-3.10.0.tar.bz2), now with a better way to generate it: + everything in the build dir except debian/ will be copied in the resulting + tarball + * debian/ocaml-source.exclude + - new file: list of tar exclude patterns, matching file won't be shipped + in the ocaml source tarball + + -- Stefano Zacchiroli <[EMAIL PROTECTED]> Wed, 13 Jun 2007 17:15:06 +0200 ocaml (3.10.0~beta-1) experimental; urgency=low Modified: trunk/packages/ocaml/branches/ocaml-3.10.0/debian/control URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0/debian/control?rev=3824&op=diff ============================================================================== --- trunk/packages/ocaml/branches/ocaml-3.10.0/debian/control (original) +++ trunk/packages/ocaml/branches/ocaml-3.10.0/debian/control Wed Jun 13 15:19:00 2007 @@ -112,6 +112,18 @@ For big source codes, these packages can be two to three times faster, but for most normal sized sources, the difference won't be noticeable. +Package: ocaml-source +Architecture: all +Provides: ocaml-source-${F:OCamlABI} +Description: Sources for Objective Caml + Objective Caml is an implementation of the ML language, based on + the Caml Light dialect extended with a complete class-based object system + and a powerful module system in the style of Standard ML. + . + This package contains the sources needed to build some packages which build + depend on the ocaml source. Notice that if you want to rebuild ocaml, these + will not work, consider using the source package instead. + Package: ocaml-interp Architecture: any Provides: ocaml-interp-${F:OCamlABI} Modified: trunk/packages/ocaml/branches/ocaml-3.10.0/debian/control.in URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0/debian/control.in?rev=3824&op=diff ============================================================================== --- trunk/packages/ocaml/branches/ocaml-3.10.0/debian/control.in (original) +++ trunk/packages/ocaml/branches/ocaml-3.10.0/debian/control.in Wed Jun 13 15:19:00 2007 @@ -94,7 +94,7 @@ This package contains only the runtime system needed to run bytecode executables. The `ocaml' package contains the full development suite of Objective Caml. You may wish to install the 'ocaml-base-nox' package if - you do not require any graphical capilities for your runtime. + you do not require any graphical capabilities for your runtime. Package: ocaml-native-compilers Architecture: #OcamlNativeArchs# Added: trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.dirs.in URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.dirs.in?rev=3824&op=file ============================================================================== --- trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.dirs.in (added) +++ trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.dirs.in Wed Jun 13 15:19:00 2007 @@ -1,0 +1,1 @@ +usr/src Added: trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.exclude URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.exclude?rev=3824&op=file ============================================================================== --- trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.exclude (added) +++ trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.exclude Wed Jun 13 15:19:00 2007 @@ -1,0 +1,2 @@ +*/debian +*/*-stamp Added: trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.install.in URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.install.in?rev=3824&op=file ============================================================================== --- trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.install.in (added) +++ trunk/packages/ocaml/branches/ocaml-3.10.0/debian/ocaml-source.install.in Wed Jun 13 15:19:00 2007 @@ -1,0 +1,1 @@ +debian/ocaml-#OcamlABI#.tar.bz2 /usr/src/ Modified: trunk/packages/ocaml/branches/ocaml-3.10.0/debian/rules URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0/debian/rules?rev=3824&op=diff ============================================================================== --- trunk/packages/ocaml/branches/ocaml-3.10.0/debian/rules (original) +++ trunk/packages/ocaml/branches/ocaml-3.10.0/debian/rules Wed Jun 13 15:19:00 2007 @@ -1,12 +1,6 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 - -# We want to use dpatch. include /usr/share/dpatch/dpatch.make + PACKAGE = ocaml OCAMLMAJOR = 3.10 OCAMLMINOR = 0 @@ -16,6 +10,7 @@ INSTDIR = $(CURDIR)/debian/ocaml-nox/usr NATIVE_ARCHS = $(shell cat debian/native-archs) +DISTDIR = $(PACKAGE)-$(OCAMLMAJOR).$(OCAMLMINOR) # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -106,10 +101,14 @@ $(MAKE) -C debian/policy touch build-arch-stamp -build-indep: build-indep-stamp -build-indep-stamp: patch-stamp config-stamp - # Add here commands to compile the indep part of the package. - #$(MAKE) doc +build-indep: build-indep-stamp config-stamp +build-indep-stamp: patch-stamp + # create ocaml source tarball + ln -fs . $(DISTDIR) # beware of the symlink recursion! + tar --anchored -chjf debian/$(DISTDIR).tar.bz2 \ + --exclude=$(DISTDIR)/$(DISTDIR) \ + --exclude-from=debian/ocaml-source.exclude \ + $(DISTDIR)/ touch $@ clean: abi-sed unpatch @@ -136,6 +135,7 @@ dh_clean debian/README.labltk camlp4/config/Makefile.cnf camlp4/config/Makefile config/m.h config/s.h config/Makefile emacs/ocamltags driver/ocamlcomp.sh debian/rules abi-sed-clean + rm -f debian/$(DISTDIR).tar.bz2 install: install-indep install-arch install-indep: build-indep _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits