On Wed, Jan 4, 2006 at 04:18:23 +0000, Julien Cristau wrote:
> Package: confluence
> Severity: important
> Tags: patch
>
Sorry, forgot to attach the patch...
Cheers,
Julien Cristau
diff -u confluence-0.10.6/Makefile confluence-0.10.6/Makefile
--- confluence-0.10.6/Makefile
+++ confluence-0.10.6/Makefile
@@ -7,8 +7,11 @@
cd src && $(MAKE) PREFIX=$(PREFIX)
.PHONY : install
-install :
+install: install-cf
cd src && $(MAKE) PREFIX=$(PREFIX) install
+
+.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
diff -u confluence-0.10.6/debian/control confluence-0.10.6/debian/control
--- confluence-0.10.6/debian/control
+++ confluence-0.10.6/debian/control
@@ -2,12 +2,12 @@
Section: electronics
Priority: optional
Maintainer: Wesley J. Landaker <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), txt2man, ocaml-native-compilers
+Build-Depends: debhelper (>= 4.0.0), txt2man, ocaml-nox
Standards-Version: 3.6.2
Package: confluence
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${ocaml:Depends}
Description: language for synchronous reactive hardware system design
From the upstream website <http://www.confluent.org>:
.
diff -u confluence-0.10.6/debian/rules confluence-0.10.6/debian/rules
--- confluence-0.10.6/debian/rules
+++ confluence-0.10.6/debian/rules
@@ -9,13 +9,21 @@
# 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.
- $(MAKE) PREFIX=$(CURDIR)/debian/confluence/usr
+ 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
@@ -28,7 +36,7 @@
# Add here commands to clean up after the build process.
-$(MAKE) clean
- dh_clean
+ dh_clean cf.1 fnf.1
install: build
dh_testdir
@@ -37,7 +45,12 @@
dh_installdirs
# Add here commands to install the package into debian/confluence.
- $(MAKE) install PREFIX=$(CURDIR)/debian/confluence/usr
+ 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
@@ -74,7 +87,7 @@
# dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_gencontrol
+ dh_gencontrol -- -Vocaml:Depends=$(OCAML_DEP)
dh_md5sums
dh_builddeb
diff -u confluence-0.10.6/debian/changelog confluence-0.10.6/debian/changelog
--- confluence-0.10.6/debian/changelog
+++ confluence-0.10.6/debian/changelog
@@ -1,3 +1,10 @@
+confluence (0.10.6-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Allow building on all arches.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Wed, 4 Jan 2006 03:17:58 +0100
+
confluence (0.10.6-2) unstable; urgency=low
* Standards-Version to 3.6.2
only in patch2:
unchanged:
--- 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
