[Pkg-ocaml-maint-commits] r3031 - in
/trunk/packages/felix/trunk/debian: INSTALL.debian
binary.lintian-overrides control dirs felix.doc-base.lib
felix.doc-base.tools felix.doc-base.tut felix.docs felix.examples
felix.install felix.links rules
skaller-guest at users.alioth.debian.org
skaller-guest at users.alioth.debian.org
Sun Aug 27 11:53:23 UTC 2006
Author: skaller-guest
Date: Sun Aug 27 11:53:22 2006
New Revision: 3031
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3031
Log:
Version 1.1.2, uses new monolithic install root
Added:
trunk/packages/felix/trunk/debian/INSTALL.debian
trunk/packages/felix/trunk/debian/binary.lintian-overrides
Removed:
trunk/packages/felix/trunk/debian/felix.doc-base.lib
trunk/packages/felix/trunk/debian/felix.doc-base.tools
trunk/packages/felix/trunk/debian/felix.doc-base.tut
trunk/packages/felix/trunk/debian/felix.docs
trunk/packages/felix/trunk/debian/felix.examples
trunk/packages/felix/trunk/debian/felix.links
Modified:
trunk/packages/felix/trunk/debian/control
trunk/packages/felix/trunk/debian/dirs
trunk/packages/felix/trunk/debian/felix.install
trunk/packages/felix/trunk/debian/rules
Added: trunk/packages/felix/trunk/debian/INSTALL.debian
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/debian/INSTALL.debian?rev=3031&op=file
==============================================================================
--- trunk/packages/felix/trunk/debian/INSTALL.debian (added)
+++ trunk/packages/felix/trunk/debian/INSTALL.debian Sun Aug 27 11:53:22 2006
@@ -1,0 +1,33 @@
+#
+# FELIX INSTALLATION NOTES
+# ------------------------
+#
+# Felix installs EVERYTHING in
+#
+# /usr/lib/felix/felix-1.1.2
+#
+# This is the 'INSTALL_ROOT'. Every version uses a distinct root.
+# The install roots never conflict, any number of
+# simultaneous installations are possible.
+#
+# The following are installed in TWO places:
+#
+# 1. The 'flx' script also goes in /usr/bin
+# 2. The 'man' pages also go in /usr/share/man/*
+#
+# In addition the following data is installed by Debian:
+#
+# 3. The debian 'doc base' entry goes wherever debian puts it
+# It is just a link to the real documentation in the install root
+#
+# 4. The usual changelog, copyright, etc, goes in
+#
+# /usr/share/doc/felix/
+#
+# where Debian requires it.
+#
+# The files 1-4 are conflicting between versions and clobber
+# each other in the indicated locations. However 1,2 are duplicates
+# of data in the install root, whilst 3,4 are Debian specific metadata
+# managed by the Debian package management system.
+#
Added: trunk/packages/felix/trunk/debian/binary.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/debian/binary.lintian-overrides?rev=3031&op=file
==============================================================================
--- trunk/packages/felix/trunk/debian/binary.lintian-overrides (added)
+++ trunk/packages/felix/trunk/debian/binary.lintian-overrides Sun Aug 27 11:53:22 2006
@@ -1,0 +1,2 @@
+felix: image-file-in-usr-lib
+felix: extra-license-file
Modified: trunk/packages/felix/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/debian/control?rev=3031&op=diff
==============================================================================
--- trunk/packages/felix/trunk/debian/control (original)
+++ trunk/packages/felix/trunk/debian/control Sun Aug 27 11:53:22 2006
@@ -2,14 +2,15 @@
Section: devel
Priority: optional
Maintainer: Mike Furr <mfurr at debian.org>
+Uploaders: John Skaller <skaller at users.sf.net>
Build-Depends: debhelper (>= 4.0.0), python (>=2.0), ocaml-nox (>= 3.09), ocaml-best-compilers, gnuplot (>=4.0), man2html (>=1.5), sed (>=4.1), dpatch
-Standards-Version: 3.6.1
+Standards-Version: 3.7.2
Package: felix
Section: devel
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, g++, ocaml-nox-${F:OCamlABI}
+Depends: ${shlibs:Depends}, g++, ${F:OCAMLRUN}
Description: high performance programming language translator and tools
A new high performance language with
support for functional programming, ultra-lightweight
Modified: trunk/packages/felix/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/debian/dirs?rev=3031&op=diff
==============================================================================
--- trunk/packages/felix/trunk/debian/dirs (original)
+++ trunk/packages/felix/trunk/debian/dirs Sun Aug 27 11:53:22 2006
@@ -1,8 +1,4 @@
-usr/bin
-usr/lib
+usr/share/lintian
+usr/share/lintian/overrides
usr/lib/felix
-usr/lib/felix/lib
-usr/lib/felix/rtl
-usr/include
-usr/share/man/man1
Modified: trunk/packages/felix/trunk/debian/felix.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/debian/felix.install?rev=3031&op=diff
==============================================================================
--- trunk/packages/felix/trunk/debian/felix.install (original)
+++ trunk/packages/felix/trunk/debian/felix.install Sun Aug 27 11:53:22 2006
@@ -1,21 +1,15 @@
-config/*.py usr/lib/felix/config
bin/flx usr/bin
-bin/flxg usr/bin
-bin/flxl usr/bin
-bin/flxp usr/bin
-bin/flxd usr/bin
-bin/flxm usr/bin
-bin/flxb usr/bin
-bin/flx_run usr/bin
-bin/flxcc usr/bin
-bin/flx_elkhound usr/bin
-lib/*.flx usr/lib/felix/lib
-rtl/libflx_dynamic.so usr/lib/
-rtl/*.a usr/lib
-rtl/*.h usr/include
-rtl/*.hpp usr/include
-rtl/*.c usr/lib/felix/rtl
-rtl/*.cpp usr/lib/felix/rtl
-rtl/flx_run_static.o usr/lib/felix/rtl
-rtl/flx_run_dynamic.o usr/lib/felix/rtl
-
+lpsrc/*.pak usr/lib/felix/felix-1.1.2/
+lpsrc/*.ipk usr/lib/felix/felix-1.1.2/
+config/ usr/lib/felix/felix-1.1.2/
+bin/ usr/lib/felix/felix-1.1.2/
+rtl/ usr/lib/felix/felix-1.1.2/
+lib/ usr/lib/felix/felix-1.1.2/
+licences/ usr/lib/felix/felix-1.1.2/
+test/*.flx usr/lib/felix/felix-1.1.2/test/
+test/*.expect usr/lib/felix/felix-1.1.2/test/
+tut/examples/*.flx usr/lib/felix/felix-1.1.2/tut/examples/
+tut/examples/*.expect usr/lib/felix/felix-1.1.2/tut/examples/
+doc/ usr/lib/felix/felix-1.1.2/doc/
+man/ usr/lib/felix/felix-1.1.2/
+debian/binary.lintian-overrides usr/share/lintian/overrides/felix
Modified: trunk/packages/felix/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/debian/rules?rev=3031&op=diff
==============================================================================
--- trunk/packages/felix/trunk/debian/rules (original)
+++ trunk/packages/felix/trunk/debian/rules Sun Aug 27 11:53:22 2006
@@ -18,20 +18,22 @@
PACKAGE=felix
include /usr/share/dpatch/dpatch.make
OCAMLABI = $(shell ocamlc -version)
+BYTECODE = $(shell [ -x /usr/bin/ocamlopt ] || echo yes)
+OCAMLRUN = $(if $(BYTECODE),ocaml-base-nox-$(OCAMLABI))
-ABI_FILES = $(wildcard debian/*.in)
+.PHONY: get-orig-source
-.PHONY: transition
-
-transition: $(ABI_FILES)
- for t in $^; do \
- sed -e 's%#OCamlABI#%$(OCAMLABI)%' $$t >$${t%.in}; \
- done
+get-orig-source:
+# to get the upstream tarball and move where svn-* tools like it for debian-ocaml-maint
+ wget http://felix.sf.net/flx_1.1.2_src.tgz
+ mv flx_1.1.2_src.tgz ../upstream/felix_1.1.2.orig.tar.gz
config-stamp: patch-stamp
dh_testdir
-
- ./configure --prefix=debian/felix/usr
+# prefix is necessary to bind the install root into the 'flx' driver script
+# this has no effect on installation, because Debian doesn't use any of
+# Felix's native installation script
+ ./configure --prefix=/usr/lib/felix/felix-1.1.2
touch config-stamp
build: build-stamp
@@ -50,15 +52,9 @@
dh_testdir
dh_testroot
rm -f build-stamp config-stamp
-
- -$(MAKE) distclean
- rm -f interscript/*.pyo
- rm -f interscript/*/*.pyo
- rm -f interscript/*/*/*.pyo
- rm -f a.out
- rm -rf speed
- rm -rf script
- rm -rf config flxbuild
+# there is no point cleaning up, nor any way to do it
+# other than removing everything and re-extracting from
+# the tarball
dh_clean
install: build
@@ -75,8 +71,14 @@
binary-arch: build install
dh_testdir
dh_testroot
+# patch cant change permissions
+# besides .. here is easier
+ chmod u=rw,g=r,a=r lpsrc/flx_win32.pak
+# has wrong permissions, isn't used anyhow
+ rm -f bin/fishcc
+#
dh_installchangelogs ChangeLog
- dh_installdocs
+ dh_installdocs INSTALL.debian
dh_installexamples
dh_install
dh_installman man/man1/*
@@ -87,7 +89,9 @@
dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+# for bytecode builds, we have to depend on ocamlrun, as per
+# debian-ocaml-maint policy. For native code, no dependency on ocaml.
+ dh_gencontrol -- -VF:OCamlRun="$(OCAMLRUN)"
dh_md5sums
dh_builddeb
More information about the Pkg-ocaml-maint-commits
mailing list