--- confluence-0.10.6.orig/src/cfeval/cfParserUtil.ml +++ confluence-0.10.6/src/cfeval/cfParserUtil.ml @@ -26,7 +26,7 @@ let top_files = ref [];; let (files : string list ref) = ref [];; -let base_env = ref "/usr/lib/confluence/base.cf";; +let base_env = ref "/usr/share/confluence/base.cf";; let set_base_env file = base_env := file --- confluence-0.10.6.orig/src/cfeval/cf.ml +++ confluence-0.10.6/src/cfeval/cf.ml @@ -40,7 +40,7 @@ -b filename OR -base_env filename Sets the base environment for the compilation. Overrides the CF_ENV environment variable. If CF_ENV not defined and -base_env option not - set, the base environment defaults to /usr/lib/confluence/base.cf. + set, the base environment defaults to /usr/share/confluence/base.cf. -e integer OR -error_limit integer Sets the maximum number of reported errors. A negative number @@ -131,7 +131,7 @@ done; incr i; CfPrims.set_argv_position !i; - if !base_env = "" then base_env := (try Sys.getenv "CF_ENV" with Not_found -> "/usr/lib/confluence/base.cf"); + if !base_env = "" then base_env := (try Sys.getenv "CF_ENV" with Not_found -> "/usr/share/confluence/base.cf"); CfParserUtil.set_base_env !base_env; !program, !compile_only, !output ;; --- confluence-0.10.6.orig/src/Makefile +++ confluence-0.10.6/src/Makefile @@ -29,18 +29,21 @@ cf -test .PHONY : install -install : all +install : cf fnf install -D cf $(PREFIX)/bin/cf install -D fnf $(PREFIX)/bin/fnf +.PHONY: install-byte +install-byte: cf.byte fnf.byte + install -D cf.byte $(PREFIX)/bin/cf + install -D fnf.byte $(PREFIX)/bin/fnf + .PHONY : uninstall uninstall : -rm $(PREFIX)/bin/cf -rm $(PREFIX)/bin/fnf CF_CMX=\ - $(OCAMLLIB)/unix.cmxa \ - $(OCAMLLIB)/nums.cmxa \ misc/ut.cmx \ misc/list2.cmx \ misc/string2.cmx \ @@ -81,11 +84,19 @@ fnflib/psl_lexer.cmx \ fnflib/fnf.cmx +CF_CMO = $(CF_CMX:%.cmx=%.cmo) +FNF_CMO = $(FNF_CMX:%.cmx=%.cmo) + cf : $(CF_CMX) - $(OCAMLOPT) -o cf $(OCAMLOPTFLAGS) $(CF_CMX) + $(OCAMLOPT) -o cf $(OCAMLOPTFLAGS) nums.cmxa unix.cmxa $(CF_CMX) +cf.byte: $(CF_CMO) + $(OCAMLC) -o $@ $(OCAMLCFLAGS) nums.cma unix.cma $(CF_CMO) + fnf : $(FNF_CMX) $(OCAMLOPT) -o fnf $(OCAMLOPTFLAGS) $(FNF_CMX) +fnf.byte: $(FNF_CMO) + $(OCAMLC) -o $@ $(OCAMLCFLAGS) $(FNF_CMO) .ml.cmo: $(OCAMLC) $(OCAMLFLAGS) -c $< @@ -98,8 +109,8 @@ clean: -rm depend - -rm cf - -rm fnf + -rm cf cf.byte + -rm fnf fnf.byte -rm cfeval/cfParser.ml -rm cfeval/cfParser.mli -rm cfeval/cfParser.output --- confluence-0.10.6.orig/debian/svn-deblayout +++ confluence-0.10.6/debian/svn-deblayout @@ -0,0 +1,4 @@ +origDir=../tarballs +tagsUrl=svn://tonberry/debian/confluence/tag +upsCurrentUrl=svn://tonberry/debian/confluence/branch/upstream/current +upsTagUrl=svn://tonberry/debian/confluence/branch/upstream --- confluence-0.10.6.orig/debian/changelog +++ confluence-0.10.6/debian/changelog @@ -0,0 +1,47 @@ +confluence (0.10.6-4) unstable; urgency=low + + * Orphaning; this package is superceded by HDCaml upstream, + and I no longer use that or this package. + + -- Wesley J. Landaker Thu, 12 Apr 2007 20:57:40 -0600 + +confluence (0.10.6-3) unstable; urgency=low + + * Allow building on archs without ocamlopt (closes: #345887) + - Thanks to Julien Cristau for the patch. + + -- Wesley J. Landaker Wed, 4 Jan 2006 11:31:17 -0700 + +confluence (0.10.6-2) unstable; urgency=low + + * Standards-Version to 3.6.2 + * Updated FSF address in debian/copyright + + -- Wesley J. Landaker Wed, 9 Nov 2005 11:12:48 -0700 + +confluence (0.10.6-1) unstable; urgency=low + + * New upstream release + + -- Wesley J. Landaker Wed, 28 Sep 2005 17:57:15 -0600 + +confluence (0.10.5-1) unstable; urgency=low + + * New upstream release + * Updated watch file + * Fixed confluence.vim install location (closes: #306777) + + -- Wesley J. Landaker Thu, 28 Apr 2005 17:24:52 -0600 + +confluence (0.10.4-2) unstable; urgency=low + + * Fix up debian/watch for uscan version=3 + + -- Wesley J. Landaker Sat, 26 Mar 2005 23:14:28 -0700 + +confluence (0.10.4-1) unstable; urgency=low + + * Initial Release (closes: #301410) + + -- Wesley J. Landaker Fri, 25 Mar 2005 09:22:39 -0700 + --- confluence-0.10.6.orig/debian/control +++ confluence-0.10.6/debian/control @@ -0,0 +1,24 @@ +Source: confluence +Section: electronics +Priority: optional +Maintainer: Debian QA Group +Build-Depends: debhelper (>= 4.0.0), txt2man, ocaml-nox +Standards-Version: 3.6.2 + +Package: confluence +Architecture: any +Depends: ${shlibs:Depends}, ${ocaml:Depends} +Description: language for synchronous reactive hardware system design + From the upstream website : + . + A Confluence program can generate digital logic for an FPGA or ASIC + platform, or C code for hard real-time software. + . + Confluence combines the component-based methodologies of Verilog and + VHDL with the expressiveness of higher order functional programming. + . + In comparison to Verilog, VHDL, and C, systems designed in Confluence + result in 2X to 10X code reduction, making the source easier to manage + and reuse. And because Confluence relies on a correct-by-construction + compiler, bugs are reduced--some are prevented altogether--thus + reducing the overall verification effort. --- confluence-0.10.6.orig/debian/compat +++ confluence-0.10.6/debian/compat @@ -0,0 +1 @@ +4 --- confluence-0.10.6.orig/debian/watch +++ confluence-0.10.6/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://confluent.org/download/confluence-(.*)\.tar\.gz --- confluence-0.10.6.orig/debian/dirs +++ confluence-0.10.6/debian/dirs @@ -0,0 +1 @@ +/usr/share/vim/addons/syntax --- confluence-0.10.6.orig/debian/rules +++ confluence-0.10.6/debian/rules @@ -0,0 +1,95 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +ifeq ($(wildcard /usr/bin/ocamlopt),) +OCAML_DEP = ocaml-base-nox-$(shell ocamlc -version) +endif + +build: build-stamp + +build-stamp: + dh_testdir + + # Add here commands to compile the package. + if [ -x /usr/bin/ocamlopt ]; then \ + $(MAKE) PREFIX=$(CURDIR)/debian/confluence/usr OCAMLC=ocamlc OCAMLOPT=ocamlopt; \ + else \ + $(MAKE) -C src PREFIX=$(CURDIR)/debian/confluence/usr OCAMLC=ocamlc fnf.byte cf.byte doc; \ + fi + #docbook-to-man debian/confluence.sgml > confluence.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + + dh_clean cf.1 fnf.1 + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/confluence. + if [ -x /usr/bin/ocamlopt ]; then \ + $(MAKE) install PREFIX=$(CURDIR)/debian/confluence/usr OCAMLC=ocamlc OCAMLOPT=ocamlopt; \ + else \ + $(MAKE) -C src install-byte PREFIX=$(CURDIR)/debian/confluence/usr && \ + $(MAKE) install-cf PREFIX=$(CURDIR)/debian/confluence/usr; \ + fi + find $(CURDIR)/debian/confluence/usr/share/confluence/ -name "*.cf" -exec chmod 644 {} \; + install -m644 misc/confluence.vim $(CURDIR)/debian/confluence/usr/share/vim/addons/syntax + $(CURDIR)/debian/confluence/usr/bin/cf | txt2man -s 1 -t cf > cf.1 + $(CURDIR)/debian/confluence/usr/bin/fnf | txt2man -s 1 -t fnf > fnf.1 + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman cf.1 fnf.1 + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol -- -Vocaml:Depends=$(OCAML_DEP) + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- confluence-0.10.6.orig/debian/docs +++ confluence-0.10.6/debian/docs @@ -0,0 +1,2 @@ +NEWS +src/doc/ --- confluence-0.10.6.orig/debian/copyright +++ confluence-0.10.6/debian/copyright @@ -0,0 +1,28 @@ +Package Maintainers: + Wesley J. Landaker from Fri, 25 Mar 2005 09:41:23 -0700 + +Upstream Author: Tom Hawkins +Upstream Homepage: + +Copyright: + + Confluence System Design Language Compiler + Copyright (C) 2003-2005 Tom Hawkins (tomahawkins@yahoo.com) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the full text of the GNU General Public License can be found +in the file /usr/share/common-licenses/GPL --- confluence-0.10.6.orig/Makefile +++ confluence-0.10.6/Makefile @@ -7,20 +7,23 @@ cd src && $(MAKE) PREFIX=$(PREFIX) .PHONY : install -install : +install: install-cf cd src && $(MAKE) PREFIX=$(PREFIX) install - install -D lib/base.cf $(PREFIX)/lib/confluence/base.cf - install -D lib/list.cf $(PREFIX)/lib/confluence/list.cf - install -D lib/base_test/base_test.cf $(PREFIX)/lib/confluence/base_test/base_test.cf - install -D lib/base_test/run_test $(PREFIX)/lib/confluence/base_test/run_test - install -D lib/common/common.cf $(PREFIX)/lib/confluence/common/common.cf - install -D lib/common/sync.cf $(PREFIX)/lib/confluence/common/sync.cf - install -D lib/common/unit_test.cf $(PREFIX)/lib/confluence/common/unit_test.cf + +.PHONY : install-cf +install-cf: + install -D lib/base.cf $(PREFIX)/share/confluence/base.cf + install -D lib/list.cf $(PREFIX)/share/confluence/list.cf + install -D lib/base_test/base_test.cf $(PREFIX)/share/confluence/base_test/base_test.cf + install -D lib/base_test/run_test $(PREFIX)/share/confluence/base_test/run_test + install -D lib/common/common.cf $(PREFIX)/share/confluence/common/common.cf + install -D lib/common/sync.cf $(PREFIX)/share/confluence/common/sync.cf + install -D lib/common/unit_test.cf $(PREFIX)/share/confluence/common/unit_test.cf .PHONY : uninstall uninstall : cd src && $(MAKE) PREFIX=$(PREFIX) uninstall - -rm -r $(PREFIX)/lib/confluence + -rm -r $(PREFIX)/share/confluence .PHONY : clean clean : --- confluence-0.10.6.orig/lib/base_test/base_test.cf +++ confluence-0.10.6/lib/base_test/base_test.cf @@ -39,7 +39,7 @@ is -ut <- import "$CF_LIB/common/unit_test.cf" +ut <- import "/usr/share/confluence/common/unit_test.cf" {ut.run_test "" "all" suite}